Use <linux/tls.h>, which now is included in glibc, for kTLS.

diff --git a/tlse/README b/tlse/README
index 3fa5ca5db148ef57bf6ca9fdbca856d559764229..8e91f403f4f9bf6bc8567cc45c6e3c7f19ef26fb 100644 (file)
--- a/tlse/README
+++ b/tlse/README
@@ -2,7 +2,6 @@ This is a copy of the core files of TLSe, checked out from
 
   https://github.com/eduardsui/tlse
 
-It is patched to add and include ktls.h, since glibc does not include
-kTLS definitions yet, and then irrelevant files removed. It is embedded
-(as opposed to a regular link) since TLSe does not provide a static or
-shared library.
+It has had irrelevant files removed, and a dummy ktls.h is added to
+forward to glibc's implementation. It is embedded (as opposed to
+a regular link) since TLSe does not provide a static or shared library.

diff --git a/tlse/ktls.h b/tlse/ktls.h
index 7ed59c49f09ef38751899e6fe7daddd8b3001861..4693d2c47cad3fd3ec80ddc5a61ba5be08752065 100644 (file)
--- a/tlse/ktls.h
+++ b/tlse/ktls.h
@@ -1,80 +1 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
-/*
- * Copyright (c) 2016-2017, Mellanox Technologies. All rights reserved.
- *
- * This software is available to you under a choice of one of two
- * licenses.  You may choose to be licensed under the terms of the GNU
- * General Public License (GPL) Version 2, available from the file
- * COPYING in the main directory of this source tree, or the
- * OpenIB.org BSD license below:
- *
- *     Redistribution and use in source and binary forms, with or
- *     without modification, are permitted provided that the following
- *     conditions are met:
- *
- *      - Redistributions of source code must retain the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer.
- *
- *      - Redistributions in binary form must reproduce the above
- *        copyright notice, this list of conditions and the following
- *        disclaimer in the documentation and/or other materials
- *        provided with the distribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef _UAPI_LINUX_TLS_H
-#define _UAPI_LINUX_TLS_H
-
-#include <linux/types.h>
-
-/* TLS socket options */
-#define TLS_TX                 1       /* Set transmit parameters */
-#define TLS_RX                 2       /* Set receive parameters */
-
-/* Supported versions */
-#define TLS_VERSION_MINOR(ver) ((ver) & 0xFF)
-#define TLS_VERSION_MAJOR(ver) (((ver) >> 8) & 0xFF)
-
-#define TLS_VERSION_NUMBER(id) ((((id##_VERSION_MAJOR) & 0xFF) << 8) | \
-                                ((id##_VERSION_MINOR) & 0xFF))
-
-#define TLS_1_2_VERSION_MAJOR  0x3
-#define TLS_1_2_VERSION_MINOR  0x3
-#define TLS_1_2_VERSION                TLS_VERSION_NUMBER(TLS_1_2)
-
-/* Supported ciphers */
-#define TLS_CIPHER_AES_GCM_128                         51
-#define TLS_CIPHER_AES_GCM_128_IV_SIZE                 8
-#define TLS_CIPHER_AES_GCM_128_KEY_SIZE                16
-#define TLS_CIPHER_AES_GCM_128_SALT_SIZE               4
-#define TLS_CIPHER_AES_GCM_128_TAG_SIZE                16
-#define TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE            8
-
-#define TLS_SET_RECORD_TYPE    1
-
-struct tls_crypto_info {
-       __u16 version;
-       __u16 cipher_type;
-};
-
-struct tls12_crypto_info_aes_gcm_128 {
-       struct tls_crypto_info info;
-       unsigned char iv[TLS_CIPHER_AES_GCM_128_IV_SIZE];
-       unsigned char key[TLS_CIPHER_AES_GCM_128_KEY_SIZE];
-       unsigned char salt[TLS_CIPHER_AES_GCM_128_SALT_SIZE];
-       unsigned char rec_seq[TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE];
-};
-
-#define SOL_TLS                282
-#define TCP_ULP        31
-
-#endif /* _UAPI_LINUX_TLS_H */
+#include <linux/tls.h>