tls: Move cipher info to a separate struct

Separate tx crypto parameters to a separate cipher_context struct.
The same parameters will be used for rx using the same struct.

tls_advance_record_sn is modified to only take the cipher info.

Signed-off-by: Dave Watson <davejwatson@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index d824d548447e..c671560b832b 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -259,8 +259,8 @@ static void tls_sk_proto_close(struct sock *sk, long timeout)
                 }
         }
 
-        kfree(ctx->rec_seq);
-        kfree(ctx->iv);
+        kfree(ctx->tx.rec_seq);
+        kfree(ctx->tx.iv);
 
         if (ctx->tx_conf == TLS_SW_TX)
                 tls_sw_free_tx_resources(sk);
@@ -319,9 +319,9 @@ static int do_tls_getsockopt_tx(struct sock *sk, char __user *optval,
                 }
                 lock_sock(sk);
                 memcpy(crypto_info_aes_gcm_128->iv,
-                       ctx->iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE,
+                       ctx->tx.iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE,
                        TLS_CIPHER_AES_GCM_128_IV_SIZE);
-                memcpy(crypto_info_aes_gcm_128->rec_seq, ctx->rec_seq,
+                memcpy(crypto_info_aes_gcm_128->rec_seq, ctx->tx.rec_seq,
                        TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE);
                 release_sock(sk);
                 if (copy_to_user(optval,