smb3: rename encryption/decryption TFMs

Detach the TFM name from a specific algorithm (AES-CCM) as
AES-GCM is also supported, making the name misleading.

s/ccmaesencrypt/enc/
s/ccmaesdecrypt/dec/

Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
index d848bc0..1f766f3 100644 (file)
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/cifs/cifsencrypt.c
@@ -743,14 +743,14 @@ cifs_crypto_secmech_release(struct TCP_Server_Info *server)
                server->secmech.hmacmd5 = NULL;
        }
 
-       if (server->secmech.ccmaesencrypt) {
-               crypto_free_aead(server->secmech.ccmaesencrypt);
-               server->secmech.ccmaesencrypt = NULL;
+       if (server->secmech.enc) {
+               crypto_free_aead(server->secmech.enc);
+               server->secmech.enc = NULL;
        }
 
-       if (server->secmech.ccmaesdecrypt) {
-               crypto_free_aead(server->secmech.ccmaesdecrypt);
-               server->secmech.ccmaesdecrypt = NULL;
+       if (server->secmech.dec) {
+               crypto_free_aead(server->secmech.dec);
+               server->secmech.dec = NULL;
        }
 
        kfree_sensitive(server->secmech.sdesccmacaes);

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 338bc11..95e90d6 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -171,8 +171,8 @@ struct cifs_secmech {
        struct sdesc *sdeschmacsha256;  /* ctxt to generate smb2 signature */
        struct sdesc *sdesccmacaes;  /* ctxt to generate smb3 signature */
        struct sdesc *sdescsha512; /* ctxt to generate smb3.11 signing key */
-       struct crypto_aead *ccmaesencrypt; /* smb3 encryption aead */
-       struct crypto_aead *ccmaesdecrypt; /* smb3 decryption aead */
+       struct crypto_aead *enc; /* smb3 AEAD encryption TFM (AES-CCM and AES-GCM) */
+       struct crypto_aead *dec; /* smb3 AEAD decryption TFM (AES-CCM and AES-GCM) */
 };
 
 /* per smb session structure/fields */

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 9a68687..5187250 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -4357,8 +4357,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
                return rc;
        }
 
-       tfm = enc ? server->secmech.ccmaesencrypt :
-                                               server->secmech.ccmaesdecrypt;
+       tfm = enc ? server->secmech.enc : server->secmech.dec;
 
        if ((server->cipher_type == SMB2_ENCRYPTION_AES256_CCM) ||
                (server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))

diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c
index 4640fc4..d4e1a5d 100644 (file)
--- a/fs/cifs/smb2transport.c
+++ b/fs/cifs/smb2transport.c
@@ -904,7 +904,7 @@ smb3_crypto_aead_allocate(struct TCP_Server_Info *server)
 {
        struct crypto_aead *tfm;
 
-       if (!server->secmech.ccmaesencrypt) {
+       if (!server->secmech.enc) {
                if ((server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) ||
                    (server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
                        tfm = crypto_alloc_aead("gcm(aes)", 0, 0);
@@ -915,23 +915,23 @@ smb3_crypto_aead_allocate(struct TCP_Server_Info *server)
                                 __func__);
                        return PTR_ERR(tfm);
                }
-               server->secmech.ccmaesencrypt = tfm;
+               server->secmech.enc = tfm;
        }
 
-       if (!server->secmech.ccmaesdecrypt) {
+       if (!server->secmech.dec) {
                if ((server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) ||
                    (server->cipher_type == SMB2_ENCRYPTION_AES256_GCM))
                        tfm = crypto_alloc_aead("gcm(aes)", 0, 0);
                else
                        tfm = crypto_alloc_aead("ccm(aes)", 0, 0);
                if (IS_ERR(tfm)) {
-                       crypto_free_aead(server->secmech.ccmaesencrypt);
-                       server->secmech.ccmaesencrypt = NULL;
+                       crypto_free_aead(server->secmech.enc);
+                       server->secmech.enc = NULL;
                        cifs_server_dbg(VFS, "%s: Failed to alloc decrypt aead\n",
                                 __func__);
                        return PTR_ERR(tfm);
                }
-               server->secmech.ccmaesdecrypt = tfm;
+               server->secmech.dec = tfm;
        }
 
        return 0;