tls: get salt using crypto_info_salt in tls_enc_skb
authorSabrina Dubroca <sd@queasysnail.net>
Mon, 9 Oct 2023 20:50:41 +0000 (22:50 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Oct 2023 10:26:09 +0000 (11:26 +0100)
I skipped this conversion in my previous series.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tls/tls_device_fallback.c

index 1d743f310f4f0c91436edab26153c8fdd42e1e7f..b4a65f53d9c087909620973b4103d8f3932856ae 100644 (file)
@@ -340,10 +340,7 @@ static struct sk_buff *tls_enc_skb(struct tls_context *tls_ctx,
 
        switch (tls_ctx->crypto_send.info.cipher_type) {
        case TLS_CIPHER_AES_GCM_128:
-               salt = tls_ctx->crypto_send.aes_gcm_128.salt;
-               break;
        case TLS_CIPHER_AES_GCM_256:
-               salt = tls_ctx->crypto_send.aes_gcm_256.salt;
                break;
        default:
                goto free_req;
@@ -356,6 +353,7 @@ static struct sk_buff *tls_enc_skb(struct tls_context *tls_ctx,
                goto free_req;
 
        iv = buf;
+       salt = crypto_info_salt(&tls_ctx->crypto_send.info, cipher_desc);
        memcpy(iv, salt, cipher_desc->salt);
        aad = buf + cipher_desc->salt + cipher_desc->iv;
        dummy_buf = aad + TLS_AAD_SPACE_SIZE;