crypto: remove blkcipher
Subsystems (15)
cover crypto: remove blkcipher
Now that all "blkcipher" algorithms have been converted to "skcipher", this series removes the blkcipher algorithm type.
The skcipher (symmetric key cipher) algorithm type was introduced a few years ago to replace both blkcipher and ablkcipher (synchronous and asynchronous block cipher). The advantages of skcipher include:
- A much less confusing name, since none of these algorithm types have ever actually been for raw block ciphers, but rather for all length-preserving encryption modes including block cipher modes of operation, stream ciphers, and other length-preserving modes.
- It unified blkcipher and ablkcipher into a single algorithm type which supports both synchronous and asynchronous implementations. Note, blkcipher already operated only on scatterlists, so the fact that skcipher does too isn't a regression in functionality.
- Better type safety by using struct skcipher_alg, struct crypto_skcipher, etc. instead of crypto_alg, crypto_tfm, etc.
- It sometimes simplifies the implementations of algorithms.
Also, the blkcipher API was no longer being tested.
Eric Biggers (5):
crypto: unify the crypto_has_skcipher*() functions
crypto: remove crypto_has_ablkcipher()
crypto: rename crypto_skcipher_type2 to crypto_skcipher_type
crypto: remove the "blkcipher" algorithm type
crypto: rename the crypto_blkcipher module and kconfig option
Documentation/crypto/api-skcipher.rst | 13 +- Documentation/crypto/architecture.rst | 2 - Documentation/crypto/devel-algos.rst | 27 +- arch/arm/crypto/Kconfig | 6 +- arch/arm64/crypto/Kconfig | 8 +- crypto/Kconfig | 84 ++-- crypto/Makefile | 7 +- crypto/api.c | 2 +- crypto/blkcipher.c | 548 -------------------------- crypto/cryptd.c | 2 +- crypto/crypto_user_stat.c | 4 - crypto/essiv.c | 6 +- crypto/skcipher.c | 124 +----- drivers/crypto/Kconfig | 52 +-- drivers/crypto/amlogic/Kconfig | 2 +- drivers/crypto/caam/Kconfig | 6 +- drivers/crypto/cavium/nitrox/Kconfig | 2 +- drivers/crypto/ccp/Kconfig | 2 +- drivers/crypto/hisilicon/Kconfig | 2 +- drivers/crypto/qat/Kconfig | 2 +- drivers/crypto/ux500/Kconfig | 2 +- drivers/crypto/virtio/Kconfig | 2 +- drivers/net/wireless/cisco/Kconfig | 2 +- include/crypto/algapi.h | 74 ---- include/crypto/internal/skcipher.h | 12 - include/crypto/skcipher.h | 27 +- include/linux/crypto.h | 426 +------------------- net/bluetooth/Kconfig | 2 +- net/rxrpc/Kconfig | 2 +- net/xfrm/Kconfig | 2 +- net/xfrm/xfrm_algo.c | 4 +- 31 files changed, 124 insertions(+), 1332 deletions(-) delete mode 100644 crypto/blkcipher.c
Signature · 1 line
2.23.0
PATCH 1/5 crypto: unify the crypto_has_skcipher*() functions
From: Eric Biggers <[email protected]>
crypto_has_skcipher() and crypto_has_skcipher2() do the same thing: they check for the availability of an algorithm of type skcipher, blkcipher, or ablkcipher, which also meets any non-type constraints the caller specified. And they have exactly the same prototype.
Therefore, eliminate the redundancy by removing crypto_has_skcipher() and renaming crypto_has_skcipher2() to crypto_has_skcipher().
--- crypto/skcipher.c | 4 ++-- include/crypto/skcipher.h | 19 +------------------ 2 files changed, 3 insertions(+), 20 deletions(-)
crypto/skcipher.c +2 -2
@@ -1017,12 +1017,12 @@ struct crypto_sync_skcipher *crypto_alloc_sync_skcipher( }EXPORT_SYMBOL_GPL (crypto_alloc_sync_skcipher); -int crypto_has_skcipher2 (const char *alg_name,u32 type,u32 mask) +int crypto_has_skcipher (const char *alg_name,u32 type,u32 mask) {return crypto_type_has_alg (alg_name, &crypto_skcipher_type2, type, mask); } -EXPORT_SYMBOL_GPL (crypto_has_skcipher2); +EXPORT_SYMBOL_GPL (crypto_has_skcipher);static int skcipher_prepare_alg (struct skcipher_alg *alg) {
include/crypto/skcipher.h +1 -18
@@ -218,30 +218,13 @@ static inline void crypto_free_sync_skcipher(struct crypto_sync_skcipher *tfm)* crypto_has_skcipher() - Search for the availability of an skcipher. * @alg_name: is the cra_name / name or cra_driver_name / driver name of the * skcipher -* @type: specifies the type of the cipher -* @mask: specifies the mask for the cipher -* -* Return: true when the skcipher is known to the kernel crypto API; false -* otherwise -*/ -static inline int crypto_has_skcipher (const char *alg_name,u32 type, -u32 mask) -{ -return crypto_has_alg (alg_name,crypto_skcipher_type (type), -crypto_skcipher_mask (mask)); -} - -/** -* crypto_has_skcipher2() - Search for the availability of an skcipher. -* @alg_name: is the cra_name / name or cra_driver_name / driver name of the -* skcipher * @type: specifies the type of the skcipher * @mask: specifies the mask for the skcipher * * Return: true when the skcipher is known to the kernel crypto API; false * otherwise */ -int crypto_has_skcipher2 (const char *alg_name,u32 type,u32 mask); +int crypto_has_skcipher (const char *alg_name,u32 type,u32 mask);static inline const char *crypto_skcipher_driver_name (struct crypto_skcipher *tfm)
Signature · 1 line
2.23.0
PATCH 2/5 crypto: remove crypto_has_ablkcipher()
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
crypto_has_ablkcipher() has no users, and it does the same thing as crypto_has_skcipher() anyway. So remove it. This also removes the last user of crypto_skcipher_type() and crypto_skcipher_mask(), so remove those too.
--- Documentation/crypto/api-skcipher.rst | 2 +- include/linux/crypto.h | 31 --------------------------- 2 files changed, 1 insertion(+), 32 deletions(-)
Documentation/crypto/api-skcipher.rst +1 -1
@@ -41,7 +41,7 @@ Asynchronous Block Cipher API - Deprecated :doc: Asynchronous Block Cipher API .. kernel-doc:: include/linux/crypto.h - :functions: crypto_free_ablkcipher crypto_has_ablkcipher crypto_ablkcipher_ivsize crypto_ablkcipher_blocksize crypto_ablkcipher_setkey crypto_ablkcipher_reqtfm crypto_ablkcipher_encrypt crypto_ablkcipher_decrypt + :functions: crypto_free_ablkcipher crypto_ablkcipher_ivsize crypto_ablkcipher_blocksize crypto_ablkcipher_setkey crypto_ablkcipher_reqtfm crypto_ablkcipher_encrypt crypto_ablkcipher_decrypt Asynchronous Cipher Request Handle - Deprecated -----------------------------------------------
include/linux/crypto.h +0 -31
@@ -900,20 +900,6 @@ static inline struct crypto_ablkcipher *__crypto_ablkcipher_cast(return (struct crypto_ablkcipher *)tfm; } -static inline u32 crypto_skcipher_type (u32 type) -{ - type &= ~CRYPTO_ALG_TYPE_MASK ; - type |=CRYPTO_ALG_TYPE_BLKCIPHER ; -return type; -} - -static inline u32 crypto_skcipher_mask (u32 mask) -{ - mask &= ~CRYPTO_ALG_TYPE_MASK ; - mask |=CRYPTO_ALG_TYPE_BLKCIPHER_MASK ; -return mask; -} -/** * DOC: Asynchronous Block Cipher API *
@@ -959,23 +945,6 @@ static inline void crypto_free_ablkcipher(struct crypto_ablkcipher *tfm)crypto_free_tfm (crypto_ablkcipher_tfm (tfm)); } -/** -* crypto_has_ablkcipher() - Search for the availability of an ablkcipher. -* @alg_name: is the cra_name / name or cra_driver_name / driver name of the -* ablkcipher -* @type: specifies the type of the cipher -* @mask: specifies the mask for the cipher -* -* Return: true when the ablkcipher is known to the kernel crypto API; false -* otherwise -*/ -static inline int crypto_has_ablkcipher (const char *alg_name,u32 type, -u32 mask) -{ -return crypto_has_alg (alg_name,crypto_skcipher_type (type), -crypto_skcipher_mask (mask)); -} -static inline struct ablkcipher_tfm *crypto_ablkcipher_crt (struct crypto_ablkcipher *tfm) {
Signature · 1 line
2.23.0
PATCH 3/5 crypto: rename crypto_skcipher_type2 to crypto_skcipher_type
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Now that the crypto_skcipher_type() function has been removed, there's no reason to call the crypto_type struct for skciphers "crypto_skcipher_type2". Rename it to simply "crypto_skcipher_type".
--- crypto/skcipher.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
crypto/skcipher.c +6 -7
@@ -964,7 +964,7 @@ static int crypto_skcipher_report(struct sk_buff *skb, struct crypto_alg *alg) }#endif -static const struct crypto_type crypto_skcipher_type2 = { +static const struct crypto_type crypto_skcipher_type = { .extsize = crypto_skcipher_extsize, .init_tfm = crypto_skcipher_init_tfm, .free = crypto_skcipher_free_instance,
@@ -981,7 +981,7 @@ static const struct crypto_type crypto_skcipher_type2 = {int crypto_grab_skcipher (struct crypto_skcipher_spawn *spawn,const char *name,u32 type,u32 mask) { - spawn->base.frontend = &crypto_skcipher_type2; + spawn->base.frontend = &crypto_skcipher_type;return crypto_grab_spawn (&spawn->base, name, type, mask); }EXPORT_SYMBOL_GPL (crypto_grab_skcipher);
@@ -989,7 +989,7 @@ EXPORT_SYMBOL_GPL(crypto_grab_skcipher);struct crypto_skcipher *crypto_alloc_skcipher (const char *alg_name,u32 type,u32 mask) { -return crypto_alloc_tfm (alg_name, &crypto_skcipher_type2, type, mask); +return crypto_alloc_tfm (alg_name, &crypto_skcipher_type, type, mask); }EXPORT_SYMBOL_GPL (crypto_alloc_skcipher);
@@ -1001,7 +1001,7 @@ struct crypto_sync_skcipher *crypto_alloc_sync_skcipher(/* Only sync algorithms allowed. */ mask |=CRYPTO_ALG_ASYNC ; - tfm =crypto_alloc_tfm (alg_name, &crypto_skcipher_type2, type, mask); + tfm =crypto_alloc_tfm (alg_name, &crypto_skcipher_type, type, mask);/* * Make sure we do not allocate something that might get used with
@@ -1019,8 +1019,7 @@ EXPORT_SYMBOL_GPL(crypto_alloc_sync_skcipher);int crypto_has_skcipher (const char *alg_name,u32 type,u32 mask) { -return crypto_type_has_alg (alg_name, &crypto_skcipher_type2, - type, mask); +return crypto_type_has_alg (alg_name, &crypto_skcipher_type, type, mask); }EXPORT_SYMBOL_GPL (crypto_has_skcipher);
@@ -1037,7 +1036,7 @@ static int skcipher_prepare_alg(struct skcipher_alg *alg)if (!alg->walksize) alg->walksize = alg->chunksize; - base->cra_type = &crypto_skcipher_type2; + base->cra_type = &crypto_skcipher_type; base->cra_flags &= ~CRYPTO_ALG_TYPE_MASK ; base->cra_flags |=CRYPTO_ALG_TYPE_SKCIPHER ;
Signature · 1 line
2.23.0
PATCH 4/5 crypto: remove the "blkcipher" algorithm type
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Now that all "blkcipher" algorithms have been converted to "skcipher", remove the blkcipher algorithm type.
The skcipher (symmetric key cipher) algorithm type was introduced a few years ago to replace both blkcipher and ablkcipher (synchronous and asynchronous block cipher). The advantages of skcipher include:
- A much less confusing name, since none of these algorithm types have ever actually been for raw block ciphers, but rather for all length-preserving encryption modes including block cipher modes of operation, stream ciphers, and other length-preserving modes.
- It unified blkcipher and ablkcipher into a single algorithm type which supports both synchronous and asynchronous implementations. Note, blkcipher already operated only on scatterlists, so the fact that skcipher does too isn't a regression in functionality.
- Better type safety by using struct skcipher_alg, struct crypto_skcipher, etc. instead of crypto_alg, crypto_tfm, etc.
- It sometimes simplifies the implementations of algorithms.
Also, the blkcipher API was no longer being tested.
--- Documentation/crypto/api-skcipher.rst | 11 +- Documentation/crypto/architecture.rst | 2 - Documentation/crypto/devel-algos.rst | 27 +- crypto/Makefile | 1 - crypto/api.c | 2 +- crypto/blkcipher.c | 548 -------------------------- crypto/cryptd.c | 2 +- crypto/crypto_user_stat.c | 4 - crypto/essiv.c | 6 +- crypto/skcipher.c | 107 +---- include/crypto/algapi.h | 74 ---- include/crypto/internal/skcipher.h | 12 - include/crypto/skcipher.h | 8 - include/linux/crypto.h | 395 +------------------ net/xfrm/xfrm_algo.c | 4 +- 15 files changed, 22 insertions(+), 1181 deletions(-) delete mode 100644 crypto/blkcipher.c
Documentation/crypto/api-skcipher.rst +1 -10
@@ -5,7 +5,7 @@ Block Cipher Algorithm Definitions :doc: Block Cipher Algorithm Definitions .. kernel-doc:: include/linux/crypto.h - :functions: crypto_alg ablkcipher_alg blkcipher_alg cipher_alg compress_alg + :functions: crypto_alg ablkcipher_alg cipher_alg compress_alg Symmetric Key Cipher API ------------------------
@@ -51,12 +51,3 @@ Asynchronous Cipher Request Handle - Deprecated .. kernel-doc:: include/linux/crypto.h :functions: crypto_ablkcipher_reqsize ablkcipher_request_set_tfm ablkcipher_request_alloc ablkcipher_request_free ablkcipher_request_set_callback ablkcipher_request_set_crypt - -Synchronous Block Cipher API - Deprecated ------------------------------------------ - -.. kernel-doc:: include/linux/crypto.h - :doc: Synchronous Block Cipher API - -.. kernel-doc:: include/linux/crypto.h - :functions: crypto_alloc_blkcipher crypto_free_blkcipher crypto_has_blkcipher crypto_blkcipher_name crypto_blkcipher_ivsize crypto_blkcipher_blocksize crypto_blkcipher_setkey crypto_blkcipher_encrypt crypto_blkcipher_encrypt_iv crypto_blkcipher_decrypt crypto_blkcipher_decrypt_iv crypto_blkcipher_set_iv crypto_blkcipher_get_iv
Documentation/crypto/architecture.rst +0 -2
@@ -201,8 +201,6 @@ the aforementioned cipher types: - CRYPTO_ALG_TYPE_AEAD Authenticated Encryption with Associated Data (MAC) -- CRYPTO_ALG_TYPE_BLKCIPHER Synchronous multi-block cipher - - CRYPTO_ALG_TYPE_ABLKCIPHER Asynchronous multi-block cipher - CRYPTO_ALG_TYPE_KPP Key-agreement Protocol Primitive (KPP) such as
Documentation/crypto/devel-algos.rst +11 -16
@@ -128,25 +128,20 @@ process requests that are unaligned. This implies, however, additional overhead as the kernel crypto API needs to perform the realignment of the data which may imply moving of data. -Cipher Definition With struct blkcipher_alg and ablkcipher_alg -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cipher Definition With struct skcipher_alg +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Struct blkcipher_alg defines a synchronous block cipher whereas struct -ablkcipher_alg defines an asynchronous block cipher. +Struct skcipher_alg defines a multi-block cipher, or more generally, a +length-preserving symmetric cipher algorithm. -Please refer to the single block cipher description for schematics of -the block cipher usage. +Scatterlist handling +~~~~~~~~~~~~~~~~~~~~ -Specifics Of Asynchronous Multi-Block Cipher -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -There are a couple of specifics to the asynchronous interface. - -First of all, some of the drivers will want to use the Generic -ScatterWalk in case the hardware needs to be fed separate chunks of the -scatterlist which contains the plaintext and will contain the -ciphertext. Please refer to the ScatterWalk interface offered by the -Linux kernel scatter / gather list implementation. +Some drivers will want to use the Generic ScatterWalk in case the +hardware needs to be fed separate chunks of the scatterlist which +contains the plaintext and will contain the ciphertext. Please refer +to the ScatterWalk interface offered by the Linux kernel scatter / +gather list implementation. Hashing [HASH] --------------
crypto/Makefile +0 -1
@@ -16,7 +16,6 @@ obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o obj-$(CONFIG_CRYPTO_AEAD2) += aead.o crypto_blkcipher-y := ablkcipher.o -crypto_blkcipher-y += blkcipher.o crypto_blkcipher-y += skcipher.o obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o
crypto/api.c +1 -1
@@ -406,7 +406,7 @@ EXPORT_SYMBOL_GPL(__crypto_alloc_tfm);* * The returned transform is of a non-determinate type. Most people * should use one of the more specific allocation functions such as -* crypto_alloc_blkcipher. +* crypto_alloc_skcipher(). * * In case of error the return value is an error pointer. */
crypto/blkcipher.c deleted +0 -548
548 lines not on this page · raw message
crypto/cryptd.c +1 -1
@@ -919,7 +919,7 @@ static int cryptd_create(struct crypto_template *tmpl, struct rtattr **tb)return PTR_ERR (algt);switch (algt->type & algt->mask &CRYPTO_ALG_TYPE_MASK ) { -case CRYPTO_ALG_TYPE_BLKCIPHER : +case CRYPTO_ALG_TYPE_SKCIPHER :return cryptd_create_skcipher (tmpl, tb, &queue);case CRYPTO_ALG_TYPE_HASH :return cryptd_create_hash (tmpl, tb, &queue);
crypto/crypto_user_stat.c +0 -4
@@ -213,10 +213,6 @@ static int crypto_reportstat_one(struct crypto_alg *alg,if (crypto_report_cipher (skb, alg)) goto nla_put_failure;break ; -case CRYPTO_ALG_TYPE_BLKCIPHER : -if (crypto_report_cipher (skb, alg)) - goto nla_put_failure; -break ;case CRYPTO_ALG_TYPE_CIPHER :if (crypto_report_cipher (skb, alg)) goto nla_put_failure;
crypto/essiv.c +3 -3
@@ -486,7 +486,7 @@ static int essiv_create(struct crypto_template *tmpl, struct rtattr **tb) type = algt->type & algt->mask;switch (type) { -case CRYPTO_ALG_TYPE_BLKCIPHER : +case CRYPTO_ALG_TYPE_SKCIPHER : skcipher_inst =kzalloc (sizeof (*skcipher_inst) +sizeof (*ictx),GFP_KERNEL );if (!skcipher_inst)
@@ -586,7 +586,7 @@ static int essiv_create(struct crypto_template *tmpl, struct rtattr **tb) base->cra_alignmask = block_base->cra_alignmask; base->cra_priority = block_base->cra_priority; -if (type ==CRYPTO_ALG_TYPE_BLKCIPHER ) { +if (type ==CRYPTO_ALG_TYPE_SKCIPHER ) { skcipher_inst->alg.setkey = essiv_skcipher_setkey; skcipher_inst->alg.encrypt = essiv_skcipher_encrypt; skcipher_inst->alg.decrypt = essiv_skcipher_decrypt;
@@ -628,7 +628,7 @@ static int essiv_create(struct crypto_template *tmpl, struct rtattr **tb) out_free_hash:crypto_mod_put (_hash_alg); out_drop_skcipher: -if (type ==CRYPTO_ALG_TYPE_BLKCIPHER ) +if (type ==CRYPTO_ALG_TYPE_SKCIPHER )crypto_drop_skcipher (&ictx->u.skcipher_spawn);else crypto_drop_aead (&ictx->u.aead_spawn);
crypto/skcipher.c +1 -106
131 lines not on this page · raw message
include/crypto/algapi.h +0 -74
104 lines not on this page · raw message
include/crypto/internal/skcipher.h +0 -12
@@ -182,10 +182,6 @@ static inline u32 skcipher_request_flags(struct skcipher_request *req)static inline unsigned int crypto_skcipher_alg_min_keysize (struct skcipher_alg *alg) { -if ((alg->base.cra_flags &CRYPTO_ALG_TYPE_MASK ) == -CRYPTO_ALG_TYPE_BLKCIPHER ) -return alg->base.cra_blkcipher.min_keysize; -if (alg->base.cra_ablkcipher.encrypt)return alg->base.cra_ablkcipher.min_keysize;
@@ -195,10 +191,6 @@ static inline unsigned int crypto_skcipher_alg_min_keysize(static inline unsigned int crypto_skcipher_alg_max_keysize (struct skcipher_alg *alg) { -if ((alg->base.cra_flags &CRYPTO_ALG_TYPE_MASK ) == -CRYPTO_ALG_TYPE_BLKCIPHER ) -return alg->base.cra_blkcipher.max_keysize; -if (alg->base.cra_ablkcipher.encrypt)return alg->base.cra_ablkcipher.max_keysize;
@@ -208,10 +200,6 @@ static inline unsigned int crypto_skcipher_alg_max_keysize(static inline unsigned int crypto_skcipher_alg_walksize (struct skcipher_alg *alg) { -if ((alg->base.cra_flags &CRYPTO_ALG_TYPE_MASK ) == -CRYPTO_ALG_TYPE_BLKCIPHER ) -return alg->base.cra_blocksize; -if (alg->base.cra_ablkcipher.encrypt)return alg->base.cra_blocksize;
include/crypto/skcipher.h +0 -8
@@ -241,10 +241,6 @@ static inline struct skcipher_alg *crypto_skcipher_alg(static inline unsigned int crypto_skcipher_alg_ivsize (struct skcipher_alg *alg) { -if ((alg->base.cra_flags &CRYPTO_ALG_TYPE_MASK ) == -CRYPTO_ALG_TYPE_BLKCIPHER ) -return alg->base.cra_blkcipher.ivsize; -if (alg->base.cra_ablkcipher.encrypt)return alg->base.cra_ablkcipher.ivsize;
@@ -290,10 +286,6 @@ static inline unsigned int crypto_skcipher_blocksize(static inline unsigned int crypto_skcipher_alg_chunksize (struct skcipher_alg *alg) { -if ((alg->base.cra_flags &CRYPTO_ALG_TYPE_MASK ) == -CRYPTO_ALG_TYPE_BLKCIPHER ) -return alg->base.cra_blocksize; -if (alg->base.cra_ablkcipher.encrypt)return alg->base.cra_blocksize;
include/linux/crypto.h +2 -393
479 lines not on this page · raw message
net/xfrm/xfrm_algo.c +2 -2
@@ -626,8 +626,8 @@ static const struct xfrm_algo_list xfrm_aalg_list = {static const struct xfrm_algo_list xfrm_ealg_list = { .algs = ealg_list, .entries =ARRAY_SIZE (ealg_list), - .type =CRYPTO_ALG_TYPE_BLKCIPHER , - .mask =CRYPTO_ALG_TYPE_BLKCIPHER_MASK , + .type =CRYPTO_ALG_TYPE_SKCIPHER , + .mask =CRYPTO_ALG_TYPE_MASK , };static const struct xfrm_algo_list xfrm_calg_list = {
Signature · 1 line
2.23.0
PATCH 5/5 crypto: rename the crypto_blkcipher module and kconfig option
In reply to Eric BiggersFrom: Eric Biggers <[email protected]>
Now that the blkcipher algorithm type has been removed in favor of skcipher, rename the crypto_blkcipher kernel module to crypto_skcipher, and rename the config options accordingly:
CONFIG_CRYPTO_BLKCIPHER => CONFIG_CRYPTO_SKCIPHER CONFIG_CRYPTO_BLKCIPHER2 => CONFIG_CRYPTO_SKCIPHER2
--- arch/arm/crypto/Kconfig | 6 +- arch/arm64/crypto/Kconfig | 8 +-- crypto/Kconfig | 84 ++++++++++++++-------------- crypto/Makefile | 6 +- drivers/crypto/Kconfig | 52 ++++++++--------- drivers/crypto/amlogic/Kconfig | 2 +- drivers/crypto/caam/Kconfig | 6 +- drivers/crypto/cavium/nitrox/Kconfig | 2 +- drivers/crypto/ccp/Kconfig | 2 +- drivers/crypto/hisilicon/Kconfig | 2 +- drivers/crypto/qat/Kconfig | 2 +- drivers/crypto/ux500/Kconfig | 2 +- drivers/crypto/virtio/Kconfig | 2 +- drivers/net/wireless/cisco/Kconfig | 2 +- net/bluetooth/Kconfig | 2 +- net/rxrpc/Kconfig | 2 +- net/xfrm/Kconfig | 2 +- 17 files changed, 92 insertions(+), 92 deletions(-)
arch/arm/crypto/Kconfig +3 -3
@@ -81,7 +81,7 @@ config CRYPTO_AES_ARM config CRYPTO_AES_ARM_BS tristate "Bit sliced AES using NEON instructions" depends on KERNEL_MODE_NEON - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_LIB_AES select CRYPTO_SIMD help
@@ -97,7 +97,7 @@ config CRYPTO_AES_ARM_BS config CRYPTO_AES_ARM_CE tristate "Accelerated AES using ARMv8 Crypto Extensions" depends on KERNEL_MODE_NEON && (CC_IS_CLANG || GCC_VERSION >= 40800) - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_SIMD help Use an implementation of AES in CBC, CTR and XTS modes that uses
@@ -130,7 +130,7 @@ config CRYPTO_CRC32_ARM_CE config CRYPTO_CHACHA20_NEON tristate "NEON accelerated ChaCha stream cipher algorithms" depends on KERNEL_MODE_NEON - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_CHACHA20 config CRYPTO_NHPOLY1305_NEON
arch/arm64/crypto/Kconfig +4 -4
@@ -86,7 +86,7 @@ config CRYPTO_AES_ARM64_CE_CCM config CRYPTO_AES_ARM64_CE_BLK tristate "AES in ECB/CBC/CTR/XTS modes using ARMv8 Crypto Extensions" depends on KERNEL_MODE_NEON - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_AES_ARM64_CE select CRYPTO_AES_ARM64 select CRYPTO_SIMD
@@ -94,7 +94,7 @@ config CRYPTO_AES_ARM64_CE_BLK config CRYPTO_AES_ARM64_NEON_BLK tristate "AES in ECB/CBC/CTR/XTS modes using NEON instructions" depends on KERNEL_MODE_NEON - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_AES_ARM64 select CRYPTO_LIB_AES select CRYPTO_SIMD
@@ -102,7 +102,7 @@ config CRYPTO_AES_ARM64_NEON_BLK config CRYPTO_CHACHA20_NEON tristate "ChaCha20, XChaCha20, and XChaCha12 stream ciphers using NEON instructions" depends on KERNEL_MODE_NEON - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_CHACHA20 config CRYPTO_NHPOLY1305_NEON
@@ -113,7 +113,7 @@ config CRYPTO_NHPOLY1305_NEON config CRYPTO_AES_ARM64_BS tristate "AES in ECB/CBC/CTR/XTS modes using bit-sliced NEON algorithm" depends on KERNEL_MODE_NEON - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_AES_ARM64_NEON_BLK select CRYPTO_AES_ARM64 select CRYPTO_LIB_AES
crypto/Kconfig +42 -42
327 lines not on this page · raw message
crypto/Makefile +3 -3
@@ -15,9 +15,9 @@ obj-$(CONFIG_CRYPTO_ALGAPI2) += crypto_algapi.o obj-$(CONFIG_CRYPTO_AEAD2) += aead.o -crypto_blkcipher-y := ablkcipher.o -crypto_blkcipher-y += skcipher.o -obj-$(CONFIG_CRYPTO_BLKCIPHER2) += crypto_blkcipher.o +crypto_skcipher-y := ablkcipher.o +crypto_skcipher-y += skcipher.o +obj-$(CONFIG_CRYPTO_SKCIPHER2) += crypto_skcipher.o obj-$(CONFIG_CRYPTO_SEQIV) += seqiv.o obj-$(CONFIG_CRYPTO_ECHAINIV) += echainiv.o
drivers/crypto/Kconfig +26 -26
208 lines not on this page · raw message
drivers/crypto/amlogic/Kconfig +1 -1
@@ -1,7 +1,7 @@ config CRYPTO_DEV_AMLOGIC_GXL tristate "Support for amlogic cryptographic offloader" default y if ARCH_MESON - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_ENGINE select CRYPTO_ECB select CRYPTO_CBC
drivers/crypto/caam/Kconfig +3 -3
@@ -97,7 +97,7 @@ config CRYPTO_DEV_FSL_CAAM_CRYPTO_API select CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC select CRYPTO_AEAD select CRYPTO_AUTHENC - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_LIB_DES help Selecting this will offload crypto for users of the
@@ -110,7 +110,7 @@ config CRYPTO_DEV_FSL_CAAM_CRYPTO_API_QI default y select CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC select CRYPTO_AUTHENC - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_DES help Selecting this will use CAAM Queue Interface (QI) for sending
@@ -158,7 +158,7 @@ config CRYPTO_DEV_FSL_DPAA2_CAAM select CRYPTO_DEV_FSL_CAAM_COMMON select CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC select CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_AUTHENC select CRYPTO_AEAD select CRYPTO_HASH
drivers/crypto/cavium/nitrox/Kconfig +1 -1
@@ -4,7 +4,7 @@ # config CRYPTO_DEV_NITROX tristate - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_AES select CRYPTO_LIB_DES select FW_LOADER
drivers/crypto/ccp/Kconfig +1 -1
@@ -27,7 +27,7 @@ config CRYPTO_DEV_CCP_CRYPTO depends on CRYPTO_DEV_CCP_DD depends on CRYPTO_DEV_SP_CCP select CRYPTO_HASH - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_AUTHENC select CRYPTO_RSA select CRYPTO_LIB_AES
drivers/crypto/hisilicon/Kconfig +1 -1
@@ -2,7 +2,7 @@ config CRYPTO_DEV_HISI_SEC tristate "Support for Hisilicon SEC crypto block cipher accelerator" - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_ALGAPI select CRYPTO_LIB_DES select SG_SPLIT
drivers/crypto/qat/Kconfig +1 -1
@@ -3,7 +3,7 @@ config CRYPTO_DEV_QAT tristate select CRYPTO_AEAD select CRYPTO_AUTHENC - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_AKCIPHER select CRYPTO_DH select CRYPTO_HMAC
drivers/crypto/ux500/Kconfig +1 -1
@@ -8,7 +8,7 @@ config CRYPTO_DEV_UX500_CRYP tristate "UX500 crypto driver for CRYP block" depends on CRYPTO_DEV_UX500 select CRYPTO_ALGAPI - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_LIB_DES help This selects the crypto driver for the UX500_CRYP hardware. It supports
drivers/crypto/virtio/Kconfig +1 -1
@@ -3,7 +3,7 @@ config CRYPTO_DEV_VIRTIO tristate "VirtIO crypto driver" depends on VIRTIO select CRYPTO_AEAD - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_ENGINE default m help
drivers/net/wireless/cisco/Kconfig +1 -1
@@ -17,7 +17,7 @@ config AIRO depends on CFG80211 && ISA_DMA_API && (PCI || BROKEN) select WIRELESS_EXT select CRYPTO - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select WEXT_SPY select WEXT_PRIV ---help---
net/bluetooth/Kconfig +1 -1
@@ -9,7 +9,7 @@ menuconfig BT depends on RFKILL || !RFKILL select CRC16 select CRYPTO - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_LIB_AES imply CRYPTO_AES select CRYPTO_CMAC
net/rxrpc/Kconfig +1 -1
@@ -49,7 +49,7 @@ config RXKAD depends on AF_RXRPC select CRYPTO select CRYPTO_MANAGER - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER select CRYPTO_PCBC select CRYPTO_FCRYPT help
net/xfrm/Kconfig +1 -1
@@ -16,7 +16,7 @@ config XFRM_ALGO select XFRM select CRYPTO select CRYPTO_HASH - select CRYPTO_BLKCIPHER + select CRYPTO_SKCIPHER if INET config XFRM_USER
Signature · 1 line
2.23.0
Quoted 23 lines · Eric Biggers
Now that all "blkcipher" algorithms have been converted to "skcipher", this series removes the blkcipher algorithm type.
The skcipher (symmetric key cipher) algorithm type was introduced a few years ago to replace both blkcipher and ablkcipher (synchronous and asynchronous block cipher). The advantages of skcipher include:
- A much less confusing name, since none of these algorithm types have ever actually been for raw block ciphers, but rather for all length-preserving encryption modes including block cipher modes of operation, stream ciphers, and other length-preserving modes.
- It unified blkcipher and ablkcipher into a single algorithm type which supports both synchronous and asynchronous implementations. Note, blkcipher already operated only on scatterlists, so the fact that skcipher does too isn't a regression in functionality.
- Better type safety by using struct
skcipher_alg, structcrypto_skcipher, etc. instead ofcrypto_alg,crypto_tfm, etc.- It sometimes simplifies the implementations of algorithms.
Quoted 9 lines
Also, the blkcipher API was no longer being tested.
Eric Biggers (5):
crypto: unify the crypto_has_skcipher*() functions
crypto: removecrypto_has_ablkcipher()
crypto: renamecrypto_skcipher_type2tocrypto_skcipher_type
crypto: remove the "blkcipher" algorithm type
crypto: rename thecrypto_blkciphermodule and kconfig option
For the series
although obviously, this needs to wait until my albkcipher purge series is applied.
Quoted 37 lines
Documentation/crypto/api-skcipher.rst | 13 +- Documentation/crypto/architecture.rst | 2 - Documentation/crypto/devel-algos.rst | 27 +- arch/arm/crypto/Kconfig | 6 +- arch/arm64/crypto/Kconfig | 8 +- crypto/Kconfig | 84 ++-- crypto/Makefile | 7 +- crypto/api.c | 2 +- crypto/blkcipher.c | 548 -------------------------- crypto/cryptd.c | 2 +- crypto/crypto_user_stat.c | 4 - crypto/essiv.c | 6 +- crypto/skcipher.c | 124 +----- drivers/crypto/Kconfig | 52 +-- drivers/crypto/amlogic/Kconfig | 2 +- drivers/crypto/caam/Kconfig | 6 +- drivers/crypto/cavium/nitrox/Kconfig | 2 +- drivers/crypto/ccp/Kconfig | 2 +- drivers/crypto/hisilicon/Kconfig | 2 +- drivers/crypto/qat/Kconfig | 2 +- drivers/crypto/ux500/Kconfig | 2 +- drivers/crypto/virtio/Kconfig | 2 +- drivers/net/wireless/cisco/Kconfig | 2 +- include/crypto/algapi.h | 74 ---- include/crypto/internal/skcipher.h | 12 - include/crypto/skcipher.h | 27 +- include/linux/crypto.h | 426 +------------------- net/bluetooth/Kconfig | 2 +- net/rxrpc/Kconfig | 2 +- net/xfrm/Kconfig | 2 +- net/xfrm/xfrm_algo.c | 4 +- 31 files changed, 124 insertions(+), 1332 deletions(-) delete mode 100644 crypto/blkcipher.c--
2.23.0
Quoted 35 lines · Ard Biesheuvel
Quoted 23 lines · Eric Biggers
Now that all "blkcipher" algorithms have been converted to "skcipher", this series removes the blkcipher algorithm type.
The skcipher (symmetric key cipher) algorithm type was introduced a few years ago to replace both blkcipher and ablkcipher (synchronous and asynchronous block cipher). The advantages of skcipher include:
- A much less confusing name, since none of these algorithm types have ever actually been for raw block ciphers, but rather for all length-preserving encryption modes including block cipher modes of operation, stream ciphers, and other length-preserving modes.
- It unified blkcipher and ablkcipher into a single algorithm type which supports both synchronous and asynchronous implementations. Note, blkcipher already operated only on scatterlists, so the fact that skcipher does too isn't a regression in functionality.
- Better type safety by using struct
skcipher_alg, structcrypto_skcipher, etc. instead ofcrypto_alg,crypto_tfm, etc.- It sometimes simplifies the implementations of algorithms.
Quoted 9 lines
Also, the blkcipher API was no longer being tested.
Eric Biggers (5):
crypto: unify the crypto_has_skcipher*() functions
crypto: removecrypto_has_ablkcipher()
crypto: renamecrypto_skcipher_type2tocrypto_skcipher_type
crypto: remove the "blkcipher" algorithm type
crypto: rename thecrypto_blkciphermodule and kconfig option
Quoted 7 lines
For the series
Acked-by Ard Biesheuvel <[email protected]>although obviously, this needs to wait until my albkcipher purge series is applied.
Why does it need to wait? This just removes blkcipher, not ablkcipher.
- Eric
Quoted 39 lines · Eric Biggers
Quoted 37 lines · Ard Biesheuvel
Quoted 23 lines · Eric Biggers
Now that all "blkcipher" algorithms have been converted to "skcipher", this series removes the blkcipher algorithm type.
The skcipher (symmetric key cipher) algorithm type was introduced a few years ago to replace both blkcipher and ablkcipher (synchronous and asynchronous block cipher). The advantages of skcipher include:
- A much less confusing name, since none of these algorithm types have ever actually been for raw block ciphers, but rather for all length-preserving encryption modes including block cipher modes of operation, stream ciphers, and other length-preserving modes.
- It unified blkcipher and ablkcipher into a single algorithm type which supports both synchronous and asynchronous implementations. Note, blkcipher already operated only on scatterlists, so the fact that skcipher does too isn't a regression in functionality.
- Better type safety by using struct
skcipher_alg, structcrypto_skcipher, etc. instead ofcrypto_alg,crypto_tfm, etc.- It sometimes simplifies the implementations of algorithms.
Quoted 9 lines
Also, the blkcipher API was no longer being tested.
Eric Biggers (5):
crypto: unify the crypto_has_skcipher*() functions
crypto: removecrypto_has_ablkcipher()
crypto: renamecrypto_skcipher_type2tocrypto_skcipher_type
crypto: remove the "blkcipher" algorithm type
crypto: rename thecrypto_blkciphermodule and kconfig optionFor the series
Quoted 8 lines
Quoted 5 lines
Acked-by Ard Biesheuvel <[email protected]>although obviously, this needs to wait until my albkcipher purge series is applied.
Why does it need to wait? This just removes blkcipher, not ablkcipher.
OK, ignore me - I failed to notice that :-)
Herbert Xu
maintainerQuoted 63 lines · Eric Biggers
Now that all "blkcipher" algorithms have been converted to "skcipher", this series removes the blkcipher algorithm type.
The skcipher (symmetric key cipher) algorithm type was introduced a few years ago to replace both blkcipher and ablkcipher (synchronous and asynchronous block cipher). The advantages of skcipher include:
- A much less confusing name, since none of these algorithm types have ever actually been for raw block ciphers, but rather for all length-preserving encryption modes including block cipher modes of operation, stream ciphers, and other length-preserving modes.
- It unified blkcipher and ablkcipher into a single algorithm type which supports both synchronous and asynchronous implementations. Note, blkcipher already operated only on scatterlists, so the fact that skcipher does too isn't a regression in functionality.
- Better type safety by using struct
skcipher_alg, structcrypto_skcipher, etc. instead ofcrypto_alg,crypto_tfm, etc.- It sometimes simplifies the implementations of algorithms.
Also, the blkcipher API was no longer being tested.
Eric Biggers (5):
crypto: unify the crypto_has_skcipher*() functions
crypto: removecrypto_has_ablkcipher()
crypto: renamecrypto_skcipher_type2tocrypto_skcipher_type
crypto: remove the "blkcipher" algorithm type
crypto: rename thecrypto_blkciphermodule and kconfig optionDocumentation/crypto/api-skcipher.rst | 13 +- Documentation/crypto/architecture.rst | 2 - Documentation/crypto/devel-algos.rst | 27 +- arch/arm/crypto/Kconfig | 6 +- arch/arm64/crypto/Kconfig | 8 +- crypto/Kconfig | 84 ++-- crypto/Makefile | 7 +- crypto/api.c | 2 +- crypto/blkcipher.c | 548 -------------------------- crypto/cryptd.c | 2 +- crypto/crypto_user_stat.c | 4 - crypto/essiv.c | 6 +- crypto/skcipher.c | 124 +----- drivers/crypto/Kconfig | 52 +-- drivers/crypto/amlogic/Kconfig | 2 +- drivers/crypto/caam/Kconfig | 6 +- drivers/crypto/cavium/nitrox/Kconfig | 2 +- drivers/crypto/ccp/Kconfig | 2 +- drivers/crypto/hisilicon/Kconfig | 2 +- drivers/crypto/qat/Kconfig | 2 +- drivers/crypto/ux500/Kconfig | 2 +- drivers/crypto/virtio/Kconfig | 2 +- drivers/net/wireless/cisco/Kconfig | 2 +- include/crypto/algapi.h | 74 ---- include/crypto/internal/skcipher.h | 12 - include/crypto/skcipher.h | 27 +- include/linux/crypto.h | 426 +------------------- net/bluetooth/Kconfig | 2 +- net/rxrpc/Kconfig | 2 +- net/xfrm/Kconfig | 2 +- net/xfrm/xfrm_algo.c | 4 +- 31 files changed, 124 insertions(+), 1332 deletions(-)
Quoted 1 line
delete mode 100644
crypto/blkcipher.c
All applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt