summaryrefslogtreecommitdiff
path: root/net/tls/tls_main.c
diff options
context:
space:
mode:
authorSabrina Dubroca <sd@queasysnail.net>2023-08-25 23:35:12 +0200
committerJakub Kicinski <kuba@kernel.org>2023-08-27 17:17:41 -0700
commit8db44ab26bebe969851468bea6072d9a094b2ace (patch)
treef6a66429c6b8f7d5625e849306fc24fe5e1e9610 /net/tls/tls_main.c
parent037303d6760751fdb95ba62cf448ecbc1ac29c98 (diff)
tls: rename tls_cipher_size_desc to tls_cipher_desc
We're going to add other fields to it to fully describe a cipher, so the "_size" name won't match the contents. Signed-off-by: Sabrina Dubroca <sd@queasysnail.net> Link: https://lore.kernel.org/r/76ca6c7686bd6d1534dfa188fb0f1f6fabebc791.1692977948.git.sd@queasysnail.net Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tls/tls_main.c')
-rw-r--r--net/tls/tls_main.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 1bf04636948d..217c2aa004dc 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -58,7 +58,7 @@ enum {
TLS_NUM_PROTS,
};
-#define CIPHER_SIZE_DESC(cipher) [cipher - TLS_CIPHER_MIN] = { \
+#define CIPHER_DESC(cipher) [cipher - TLS_CIPHER_MIN] = { \
.iv = cipher ## _IV_SIZE, \
.key = cipher ## _KEY_SIZE, \
.salt = cipher ## _SALT_SIZE, \
@@ -66,15 +66,15 @@ enum {
.rec_seq = cipher ## _REC_SEQ_SIZE, \
}
-const struct tls_cipher_size_desc tls_cipher_size_desc[TLS_CIPHER_MAX + 1 - TLS_CIPHER_MIN] = {
- CIPHER_SIZE_DESC(TLS_CIPHER_AES_GCM_128),
- CIPHER_SIZE_DESC(TLS_CIPHER_AES_GCM_256),
- CIPHER_SIZE_DESC(TLS_CIPHER_AES_CCM_128),
- CIPHER_SIZE_DESC(TLS_CIPHER_CHACHA20_POLY1305),
- CIPHER_SIZE_DESC(TLS_CIPHER_SM4_GCM),
- CIPHER_SIZE_DESC(TLS_CIPHER_SM4_CCM),
- CIPHER_SIZE_DESC(TLS_CIPHER_ARIA_GCM_128),
- CIPHER_SIZE_DESC(TLS_CIPHER_ARIA_GCM_256),
+const struct tls_cipher_desc tls_cipher_desc[TLS_CIPHER_MAX + 1 - TLS_CIPHER_MIN] = {
+ CIPHER_DESC(TLS_CIPHER_AES_GCM_128),
+ CIPHER_DESC(TLS_CIPHER_AES_GCM_256),
+ CIPHER_DESC(TLS_CIPHER_AES_CCM_128),
+ CIPHER_DESC(TLS_CIPHER_CHACHA20_POLY1305),
+ CIPHER_DESC(TLS_CIPHER_SM4_GCM),
+ CIPHER_DESC(TLS_CIPHER_SM4_CCM),
+ CIPHER_DESC(TLS_CIPHER_ARIA_GCM_128),
+ CIPHER_DESC(TLS_CIPHER_ARIA_GCM_256),
};
static const struct proto *saved_tcpv6_prot;