Commit 4c1c0782 authored by Eric Biggers's avatar Eric Biggers Committed by Steve French
Browse files

smb: client: Remove obsolete cmac(aes) allocation 



Since the crypto library API is now being used instead of crypto_shash,
the "cmac(aes)" crypto_shash that is being allocated and stored in
'struct cifs_secmech' is no longer used.  Remove it.

That makes the kconfig selection of CRYPTO_CMAC and the module softdep
on "cmac" unnecessary.  So remove those too.

Finally, since this removes the last use of crypto_shash from the smb
client, also remove the remaining crypto_shash-related helper functions.

Note: cifs_unicode.c was relying on <linux/unaligned.h> being included
transitively via <crypto/internal/hash.h>.  Since the latter include is
removed, make cifs_unicode.c include <linux/unaligned.h> explicitly.

Reviewed-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 3a4580e7

fs/smb/client/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ config CIFS 
	select NLS

	select NLS_UCS2_UTILS

	select CRYPTO

	select CRYPTO_CMAC

	select CRYPTO_AEAD2

	select CRYPTO_CCM

	select CRYPTO_GCM

fs/smb/client/cifs_unicode.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */

#include <linux/fs.h>

#include <linux/slab.h>

#include <linux/unaligned.h>

#include "cifs_fs_sb.h"

#include "cifs_unicode.h"

#include "cifsglob.h"

fs/smb/client/cifsencrypt.c

+0 −2
Original line number Diff line number Diff line
@@ -503,8 +503,6 @@ calc_seckey(struct cifs_ses *ses) 
void

cifs_crypto_secmech_release(struct TCP_Server_Info *server)

{

	cifs_free_hash(&server->secmech.aes_cmac);



	if (server->secmech.enc) {

		crypto_free_aead(server->secmech.enc);

		server->secmech.enc = NULL;

fs/smb/client/cifsfs.c

+0 −1
Original line number Diff line number Diff line
@@ -2123,7 +2123,6 @@ MODULE_DESCRIPTION 
MODULE_VERSION(CIFS_VERSION);

MODULE_SOFTDEP("nls");

MODULE_SOFTDEP("aes");

MODULE_SOFTDEP("cmac");

MODULE_SOFTDEP("aead2");

MODULE_SOFTDEP("ccm");

MODULE_SOFTDEP("gcm");

fs/smb/client/cifsglob.h

+1 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/fcntl.h>

#include "cifs_fs_sb.h"

#include "cifsacl.h"

#include <crypto/internal/hash.h>

#include <uapi/linux/cifs/cifs_mount.h>

#include "../common/smbglob.h"

#include "../common/smb2pdu.h"
@@ -221,10 +220,8 @@ struct session_key { 
	char *response;

};



/* crypto hashing related structure/fields, not specific to a sec mech */

/* encryption related structure/fields, not specific to a sec mech */

struct cifs_secmech {

	struct shash_desc *aes_cmac; /* block-cipher based MAC function, for SMB3 signatures */



	struct crypto_aead *enc; /* smb3 encryption AEAD TFM (AES-CCM and AES-GCM) */

	struct crypto_aead *dec; /* smb3 decryption AEAD TFM (AES-CCM and AES-GCM) */

};