Commit 6a7eccef authored by Chuck Lever's avatar Chuck Lever Committed by Jakub Kicinski
Browse files

net/tls: Move TLS protocol elements to a separate header 



Kernel TLS consumers will need definitions of various parts of the
TLS protocol, but often do not need the function declarations and
other infrastructure provided in <net/tls.h>.

Break out existing standardized protocol elements into a separate
header, and make room for a few more elements in subsequent patches.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Link: https://lore.kernel.org/r/169047931374.5241.7713175865185969309.stgit@oracle-102.nfsv4bat.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6eaae198

drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <crypto/internal/hash.h>

#include <linux/tls.h>

#include <net/tls.h>

#include <net/tls_prot.h>

#include <net/tls_toe.h>



#include "t4fw_api.h"

include/net/tls.h

+0 −4
Original line number Diff line number Diff line
@@ -69,10 +69,6 @@ extern const struct tls_cipher_size_desc tls_cipher_size_desc[]; 


#define TLS_CRYPTO_INFO_READY(info)	((info)->cipher_type)



#define TLS_RECORD_TYPE_ALERT		0x15

#define TLS_RECORD_TYPE_HANDSHAKE	0x16

#define TLS_RECORD_TYPE_DATA		0x17



#define TLS_AAD_SPACE_SIZE		13



#define MAX_IV_SIZE			16

include/net/tls_prot.h

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */

/*

 * Copyright (c) 2023, Oracle and/or its affiliates.

 *

 * TLS Protocol definitions

 *

 * From https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml

 */



#ifndef _TLS_PROT_H

#define _TLS_PROT_H



/*

 * TLS Record protocol: ContentType

 */

enum {

	TLS_RECORD_TYPE_CHANGE_CIPHER_SPEC = 20,

	TLS_RECORD_TYPE_ALERT = 21,

	TLS_RECORD_TYPE_HANDSHAKE = 22,

	TLS_RECORD_TYPE_DATA = 23,

	TLS_RECORD_TYPE_HEARTBEAT = 24,

	TLS_RECORD_TYPE_TLS12_CID = 25,

	TLS_RECORD_TYPE_ACK = 26,

};



#endif /* _TLS_PROT_H */

net/sunrpc/svcsock.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <net/tcp.h>

#include <net/tcp_states.h>

#include <net/tls.h>

#include <net/tls_prot.h>

#include <net/handshake.h>

#include <linux/uaccess.h>

#include <linux/highmem.h>

net/sunrpc/xprtsock.c

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <net/udp.h>

#include <net/tcp.h>

#include <net/tls.h>

#include <net/tls_prot.h>

#include <net/handshake.h>



#include <linux/bvec.h>