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>
This commit is contained in:
Sabrina Dubroca
Jakub Kicinski
parent
037303d676
commit
8db44ab26b
@ -51,7 +51,7 @@
|
||||
#define TLS_DEC_STATS(net, field) \
|
||||
SNMP_DEC_STATS((net)->mib.tls_statistics, field)
|
||||
|
||||
struct tls_cipher_size_desc {
|
||||
struct tls_cipher_desc {
|
||||
unsigned int iv;
|
||||
unsigned int key;
|
||||
unsigned int salt;
|
||||
@ -61,14 +61,14 @@ struct tls_cipher_size_desc {
|
||||
|
||||
#define TLS_CIPHER_MIN TLS_CIPHER_AES_GCM_128
|
||||
#define TLS_CIPHER_MAX TLS_CIPHER_ARIA_GCM_256
|
||||
extern const struct tls_cipher_size_desc tls_cipher_size_desc[TLS_CIPHER_MAX + 1 - TLS_CIPHER_MIN];
|
||||
extern const struct tls_cipher_desc tls_cipher_desc[TLS_CIPHER_MAX + 1 - TLS_CIPHER_MIN];
|
||||
|
||||
static inline const struct tls_cipher_size_desc *get_cipher_size_desc(u16 cipher_type)
|
||||
static inline const struct tls_cipher_desc *get_cipher_desc(u16 cipher_type)
|
||||
{
|
||||
if (cipher_type < TLS_CIPHER_MIN || cipher_type > TLS_CIPHER_MAX)
|
||||
return NULL;
|
||||
|
||||
return &tls_cipher_size_desc[cipher_type - TLS_CIPHER_MIN];
|
||||
return &tls_cipher_desc[cipher_type - TLS_CIPHER_MIN];
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -884,7 +884,7 @@ static int
|
||||
tls_device_reencrypt(struct sock *sk, struct tls_context *tls_ctx)
|
||||
{
|
||||
struct tls_sw_context_rx *sw_ctx = tls_sw_ctx_rx(tls_ctx);
|
||||
const struct tls_cipher_size_desc *cipher_sz;
|
||||
const struct tls_cipher_desc *cipher_desc;
|
||||
int err, offset, copy, data_len, pos;
|
||||
struct sk_buff *skb, *skb_iter;
|
||||
struct scatterlist sg[1];
|
||||
@ -898,10 +898,10 @@ tls_device_reencrypt(struct sock *sk, struct tls_context *tls_ctx)
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
cipher_sz = get_cipher_size_desc(tls_ctx->crypto_recv.info.cipher_type);
|
||||
cipher_desc = get_cipher_desc(tls_ctx->crypto_recv.info.cipher_type);
|
||||
|
||||
rxm = strp_msg(tls_strp_msg(sw_ctx));
|
||||
orig_buf = kmalloc(rxm->full_len + TLS_HEADER_SIZE + cipher_sz->iv,
|
||||
orig_buf = kmalloc(rxm->full_len + TLS_HEADER_SIZE + cipher_desc->iv,
|
||||
sk->sk_allocation);
|
||||
if (!orig_buf)
|
||||
return -ENOMEM;
|
||||
@ -917,8 +917,8 @@ tls_device_reencrypt(struct sock *sk, struct tls_context *tls_ctx)
|
||||
|
||||
sg_init_table(sg, 1);
|
||||
sg_set_buf(&sg[0], buf,
|
||||
rxm->full_len + TLS_HEADER_SIZE + cipher_sz->iv);
|
||||
err = skb_copy_bits(skb, offset, buf, TLS_HEADER_SIZE + cipher_sz->iv);
|
||||
rxm->full_len + TLS_HEADER_SIZE + cipher_desc->iv);
|
||||
err = skb_copy_bits(skb, offset, buf, TLS_HEADER_SIZE + cipher_desc->iv);
|
||||
if (err)
|
||||
goto free_buf;
|
||||
|
||||
@ -929,7 +929,7 @@ tls_device_reencrypt(struct sock *sk, struct tls_context *tls_ctx)
|
||||
else
|
||||
err = 0;
|
||||
|
||||
data_len = rxm->full_len - cipher_sz->tag;
|
||||
data_len = rxm->full_len - cipher_desc->tag;
|
||||
|
||||
if (skb_pagelen(skb) > offset) {
|
||||
copy = min_t(int, skb_pagelen(skb) - offset, data_len);
|
||||
@ -1046,7 +1046,7 @@ int tls_set_device_offload(struct sock *sk, struct tls_context *ctx)
|
||||
{
|
||||
struct tls_context *tls_ctx = tls_get_ctx(sk);
|
||||
struct tls_prot_info *prot = &tls_ctx->prot_info;
|
||||
const struct tls_cipher_size_desc *cipher_sz;
|
||||
const struct tls_cipher_desc *cipher_desc;
|
||||
struct tls_record_info *start_marker_record;
|
||||
struct tls_offload_context_tx *offload_ctx;
|
||||
struct tls_crypto_info *crypto_info;
|
||||
@ -1094,31 +1094,31 @@ int tls_set_device_offload(struct sock *sk, struct tls_context *ctx)
|
||||
rc = -EINVAL;
|
||||
goto release_netdev;
|
||||
}
|
||||
cipher_sz = get_cipher_size_desc(crypto_info->cipher_type);
|
||||
cipher_desc = get_cipher_desc(crypto_info->cipher_type);
|
||||
|
||||
/* Sanity-check the rec_seq_size for stack allocations */
|
||||
if (cipher_sz->rec_seq > TLS_MAX_REC_SEQ_SIZE) {
|
||||
if (cipher_desc->rec_seq > TLS_MAX_REC_SEQ_SIZE) {
|
||||
rc = -EINVAL;
|
||||
goto release_netdev;
|
||||
}
|
||||
|
||||
prot->version = crypto_info->version;
|
||||
prot->cipher_type = crypto_info->cipher_type;
|
||||
prot->prepend_size = TLS_HEADER_SIZE + cipher_sz->iv;
|
||||
prot->tag_size = cipher_sz->tag;
|
||||
prot->prepend_size = TLS_HEADER_SIZE + cipher_desc->iv;
|
||||
prot->tag_size = cipher_desc->tag;
|
||||
prot->overhead_size = prot->prepend_size + prot->tag_size;
|
||||
prot->iv_size = cipher_sz->iv;
|
||||
prot->salt_size = cipher_sz->salt;
|
||||
ctx->tx.iv = kmalloc(cipher_sz->iv + cipher_sz->salt, GFP_KERNEL);
|
||||
prot->iv_size = cipher_desc->iv;
|
||||
prot->salt_size = cipher_desc->salt;
|
||||
ctx->tx.iv = kmalloc(cipher_desc->iv + cipher_desc->salt, GFP_KERNEL);
|
||||
if (!ctx->tx.iv) {
|
||||
rc = -ENOMEM;
|
||||
goto release_netdev;
|
||||
}
|
||||
|
||||
memcpy(ctx->tx.iv + cipher_sz->salt, iv, cipher_sz->iv);
|
||||
memcpy(ctx->tx.iv + cipher_desc->salt, iv, cipher_desc->iv);
|
||||
|
||||
prot->rec_seq_size = cipher_sz->rec_seq;
|
||||
ctx->tx.rec_seq = kmemdup(rec_seq, cipher_sz->rec_seq, GFP_KERNEL);
|
||||
prot->rec_seq_size = cipher_desc->rec_seq;
|
||||
ctx->tx.rec_seq = kmemdup(rec_seq, cipher_desc->rec_seq, GFP_KERNEL);
|
||||
if (!ctx->tx.rec_seq) {
|
||||
rc = -ENOMEM;
|
||||
goto free_iv;
|
||||
|
||||
@ -55,7 +55,7 @@ static int tls_enc_record(struct aead_request *aead_req,
|
||||
struct tls_prot_info *prot)
|
||||
{
|
||||
unsigned char buf[TLS_HEADER_SIZE + MAX_IV_SIZE];
|
||||
const struct tls_cipher_size_desc *cipher_sz;
|
||||
const struct tls_cipher_desc *cipher_desc;
|
||||
struct scatterlist sg_in[3];
|
||||
struct scatterlist sg_out[3];
|
||||
unsigned int buf_size;
|
||||
@ -69,9 +69,9 @@ static int tls_enc_record(struct aead_request *aead_req,
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
cipher_sz = get_cipher_size_desc(prot->cipher_type);
|
||||
cipher_desc = get_cipher_desc(prot->cipher_type);
|
||||
|
||||
buf_size = TLS_HEADER_SIZE + cipher_sz->iv;
|
||||
buf_size = TLS_HEADER_SIZE + cipher_desc->iv;
|
||||
len = min_t(int, *in_len, buf_size);
|
||||
|
||||
scatterwalk_copychunks(buf, in, len, 0);
|
||||
@ -85,11 +85,11 @@ static int tls_enc_record(struct aead_request *aead_req,
|
||||
scatterwalk_pagedone(out, 1, 1);
|
||||
|
||||
len = buf[4] | (buf[3] << 8);
|
||||
len -= cipher_sz->iv;
|
||||
len -= cipher_desc->iv;
|
||||
|
||||
tls_make_aad(aad, len - cipher_sz->tag, (char *)&rcd_sn, buf[0], prot);
|
||||
tls_make_aad(aad, len - cipher_desc->tag, (char *)&rcd_sn, buf[0], prot);
|
||||
|
||||
memcpy(iv + cipher_sz->salt, buf + TLS_HEADER_SIZE, cipher_sz->iv);
|
||||
memcpy(iv + cipher_desc->salt, buf + TLS_HEADER_SIZE, cipher_desc->iv);
|
||||
|
||||
sg_init_table(sg_in, ARRAY_SIZE(sg_in));
|
||||
sg_init_table(sg_out, ARRAY_SIZE(sg_out));
|
||||
@ -100,7 +100,7 @@ static int tls_enc_record(struct aead_request *aead_req,
|
||||
|
||||
*in_len -= len;
|
||||
if (*in_len < 0) {
|
||||
*in_len += cipher_sz->tag;
|
||||
*in_len += cipher_desc->tag;
|
||||
/* the input buffer doesn't contain the entire record.
|
||||
* trim len accordingly. The resulting authentication tag
|
||||
* will contain garbage, but we don't care, so we won't
|
||||
@ -121,7 +121,7 @@ static int tls_enc_record(struct aead_request *aead_req,
|
||||
scatterwalk_pagedone(out, 1, 1);
|
||||
}
|
||||
|
||||
len -= cipher_sz->tag;
|
||||
len -= cipher_desc->tag;
|
||||
aead_request_set_crypt(aead_req, sg_in, sg_out, len, iv);
|
||||
|
||||
rc = crypto_aead_encrypt(aead_req);
|
||||
@ -309,14 +309,14 @@ static void fill_sg_out(struct scatterlist sg_out[3], void *buf,
|
||||
int sync_size,
|
||||
void *dummy_buf)
|
||||
{
|
||||
const struct tls_cipher_size_desc *cipher_sz =
|
||||
get_cipher_size_desc(tls_ctx->crypto_send.info.cipher_type);
|
||||
const struct tls_cipher_desc *cipher_desc =
|
||||
get_cipher_desc(tls_ctx->crypto_send.info.cipher_type);
|
||||
|
||||
sg_set_buf(&sg_out[0], dummy_buf, sync_size);
|
||||
sg_set_buf(&sg_out[1], nskb->data + tcp_payload_offset, payload_len);
|
||||
/* Add room for authentication tag produced by crypto */
|
||||
dummy_buf += sync_size;
|
||||
sg_set_buf(&sg_out[2], dummy_buf, cipher_sz->tag);
|
||||
sg_set_buf(&sg_out[2], dummy_buf, cipher_desc->tag);
|
||||
}
|
||||
|
||||
static struct sk_buff *tls_enc_skb(struct tls_context *tls_ctx,
|
||||
@ -328,7 +328,7 @@ static struct sk_buff *tls_enc_skb(struct tls_context *tls_ctx,
|
||||
struct tls_offload_context_tx *ctx = tls_offload_ctx_tx(tls_ctx);
|
||||
int tcp_payload_offset = skb_tcp_all_headers(skb);
|
||||
int payload_len = skb->len - tcp_payload_offset;
|
||||
const struct tls_cipher_size_desc *cipher_sz;
|
||||
const struct tls_cipher_desc *cipher_desc;
|
||||
void *buf, *iv, *aad, *dummy_buf, *salt;
|
||||
struct aead_request *aead_req;
|
||||
struct sk_buff *nskb = NULL;
|
||||
@ -348,16 +348,16 @@ static struct sk_buff *tls_enc_skb(struct tls_context *tls_ctx,
|
||||
default:
|
||||
goto free_req;
|
||||
}
|
||||
cipher_sz = get_cipher_size_desc(tls_ctx->crypto_send.info.cipher_type);
|
||||
buf_len = cipher_sz->salt + cipher_sz->iv + TLS_AAD_SPACE_SIZE +
|
||||
sync_size + cipher_sz->tag;
|
||||
cipher_desc = get_cipher_desc(tls_ctx->crypto_send.info.cipher_type);
|
||||
buf_len = cipher_desc->salt + cipher_desc->iv + TLS_AAD_SPACE_SIZE +
|
||||
sync_size + cipher_desc->tag;
|
||||
buf = kmalloc(buf_len, GFP_ATOMIC);
|
||||
if (!buf)
|
||||
goto free_req;
|
||||
|
||||
iv = buf;
|
||||
memcpy(iv, salt, cipher_sz->salt);
|
||||
aad = buf + cipher_sz->salt + cipher_sz->iv;
|
||||
memcpy(iv, salt, cipher_desc->salt);
|
||||
aad = buf + cipher_desc->salt + cipher_desc->iv;
|
||||
dummy_buf = aad + TLS_AAD_SPACE_SIZE;
|
||||
|
||||
nskb = alloc_skb(skb_headroom(skb) + skb->len, GFP_ATOMIC);
|
||||
@ -471,7 +471,7 @@ int tls_sw_fallback_init(struct sock *sk,
|
||||
struct tls_offload_context_tx *offload_ctx,
|
||||
struct tls_crypto_info *crypto_info)
|
||||
{
|
||||
const struct tls_cipher_size_desc *cipher_sz;
|
||||
const struct tls_cipher_desc *cipher_desc;
|
||||
const u8 *key;
|
||||
int rc;
|
||||
|
||||
@ -495,13 +495,13 @@ int tls_sw_fallback_init(struct sock *sk,
|
||||
rc = -EINVAL;
|
||||
goto free_aead;
|
||||
}
|
||||
cipher_sz = get_cipher_size_desc(crypto_info->cipher_type);
|
||||
cipher_desc = get_cipher_desc(crypto_info->cipher_type);
|
||||
|
||||
rc = crypto_aead_setkey(offload_ctx->aead_send, key, cipher_sz->key);
|
||||
rc = crypto_aead_setkey(offload_ctx->aead_send, key, cipher_desc->key);
|
||||
if (rc)
|
||||
goto free_aead;
|
||||
|
||||
rc = crypto_aead_setauthsize(offload_ctx->aead_send, cipher_sz->tag);
|
||||
rc = crypto_aead_setauthsize(offload_ctx->aead_send, cipher_desc->tag);
|
||||
if (rc)
|
||||
goto free_aead;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user