bpf, tls: add tls header to tools infrastructure
Andrey reported a build error for the BPF kselftest suite when compiled on
a machine which does not have tls related header bits installed natively:
test_sockmap.c:120:23: fatal error: linux/tls.h: No such file or directory
#include <linux/tls.h>
^
compilation terminated.
Fix it by adding the header to the tools include infrastructure and add
definitions such as SOL_TLS that could potentially be missing.
Fixes: e9dd904708
("bpf: add tls support for testing in test_sockmap")
Reported-by: Andrey Ignatov <rdna@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:

committed by
Alexei Starovoitov

parent
2c59f06cc0
commit
421f4292f4
78
tools/include/uapi/linux/tls.h
Normal file
78
tools/include/uapi/linux/tls.h
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */
|
||||||
|
/*
|
||||||
|
* 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
|
||||||
|
#define TLS_GET_RECORD_TYPE 2
|
||||||
|
|
||||||
|
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];
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* _UAPI_LINUX_TLS_H */
|
@@ -28,6 +28,7 @@
|
|||||||
#include <linux/sock_diag.h>
|
#include <linux/sock_diag.h>
|
||||||
#include <linux/bpf.h>
|
#include <linux/bpf.h>
|
||||||
#include <linux/if_link.h>
|
#include <linux/if_link.h>
|
||||||
|
#include <linux/tls.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
|
|
||||||
@@ -43,6 +44,13 @@
|
|||||||
int running;
|
int running;
|
||||||
static void running_handler(int a);
|
static void running_handler(int a);
|
||||||
|
|
||||||
|
#ifndef TCP_ULP
|
||||||
|
# define TCP_ULP 31
|
||||||
|
#endif
|
||||||
|
#ifndef SOL_TLS
|
||||||
|
# define SOL_TLS 282
|
||||||
|
#endif
|
||||||
|
|
||||||
/* randomly selected ports for testing on lo */
|
/* randomly selected ports for testing on lo */
|
||||||
#define S1_PORT 10000
|
#define S1_PORT 10000
|
||||||
#define S2_PORT 10001
|
#define S2_PORT 10001
|
||||||
@@ -114,11 +122,6 @@ static void usage(char *argv[])
|
|||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
#define TCP_ULP 31
|
|
||||||
#define TLS_TX 1
|
|
||||||
#define TLS_RX 2
|
|
||||||
#include <linux/tls.h>
|
|
||||||
|
|
||||||
char *sock_to_string(int s)
|
char *sock_to_string(int s)
|
||||||
{
|
{
|
||||||
if (s == c1)
|
if (s == c1)
|
||||||
|
Reference in New Issue
Block a user