Skip to contentSkip to conversation

ksmbd: Remove unnecessary selection of CRYPTO_ECB

PATCH Applied Eric Biggers 2 participants 2 messages Apr 4 – Apr 5

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ksmbd: Remove unnecessary selection of CRYPTO_ECB

Since the SMB server never uses any ecb(...) algorithm from the crypto_skcipher API, selecting CRYPTO_ECB is unnecessary.

Remove it along with the unused CRYPTO_BLK_* constants.

---

This patch is targeting the ksmbd tree.

 fs/smb/server/Kconfig      | 1 -
 fs/smb/server/crypto_ctx.h | 5 -----
 fs/smb/server/server.c     | 1 -
 3 files changed, 7 deletions(-)
fs/smb/server/Kconfig +0 -1
index 5c77c5552ed8a..37387410e5bb3 100644
@@ -5,11 +5,10 @@ config SMB_SERVER
 	depends on FILE_LOCKING
 	select NLS
 	select NLS_UTF8
 	select NLS_UCS2_UTILS
 	select CRYPTO
-	select CRYPTO_ECB
 	select CRYPTO_LIB_ARC4
 	select CRYPTO_LIB_DES
 	select CRYPTO_LIB_MD5
 	select CRYPTO_LIB_SHA256
 	select CRYPTO_LIB_SHA512
fs/smb/server/crypto_ctx.h +0 -5
index b9476ed520ae4..27fd553d10aab 100644
@@ -18,15 +18,10 @@ enum {
 	CRYPTO_AEAD_AES_GCM = 16,
 	CRYPTO_AEAD_AES_CCM,
 	CRYPTO_AEAD_MAX,
 };
 
-enum {
-	CRYPTO_BLK_ECBDES	= 32,
-	CRYPTO_BLK_MAX,
-};
-
 struct ksmbd_crypto_ctx {
 	struct list_head		list;
 
 	struct shash_desc		*desc[CRYPTO_SHASH_MAX];
 	struct crypto_aead		*ccmaes[CRYPTO_AEAD_MAX];
fs/smb/server/server.c +0 -1
index 422d9d9782859..d8893079abdb5 100644
@@ -627,11 +627,10 @@ static void __exit ksmbd_server_exit(void)
 }
 
 MODULE_AUTHOR("Namjae Jeon <[email protected]>");
 MODULE_DESCRIPTION("Linux kernel CIFS/SMB SERVER");
 MODULE_LICENSE("GPL");
-MODULE_SOFTDEP("pre: ecb");
 MODULE_SOFTDEP("pre: nls");
 MODULE_SOFTDEP("pre: aes");
 MODULE_SOFTDEP("pre: cmac");
 MODULE_SOFTDEP("pre: aead2");
 MODULE_SOFTDEP("pre: ccm");

base-commit: 2febe6e6ee6e34c7754eff3c4d81aa7b0dcb7979

Signature · 1 line
2.53.0
maintainer Applied
#1 lore raw
Quoted 7 lines · Eric Biggers

Since the SMB server never uses any ecb(...) algorithm from the crypto_skcipher API, selecting CRYPTO_ECB is unnecessary.

Remove it along with the unused CRYPTO_BLK_* constants.

Applied it to #ksmbd-for-next-next.
Thanks!