+++ /dev/null
-From 977d524b86005c307a4d0ed46d890c93102e12b7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 25 Oct 2019 12:41:10 -0700
-Subject: crypto: skcipher - remove crypto_has_ablkcipher()
-
-From: Eric Biggers <ebiggers@google.com>
-
-[ Upstream commit cec0cb8a28f9060367099beeafd0dbdb76fdfae2 ]
-
-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.
-
-Signed-off-by: Eric Biggers <ebiggers@google.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Stable-dep-of: efbc7764c444 ("crypto: marvell/cesa - Fix type mismatch warning")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- Documentation/crypto/api-skcipher.rst | 2 +-
- include/linux/crypto.h | 31 ---------------------------
- 2 files changed, 1 insertion(+), 32 deletions(-)
-
-diff --git a/Documentation/crypto/api-skcipher.rst b/Documentation/crypto/api-skcipher.rst
-index 20ba08dddf2ec..55e0851f6fed9 100644
---- a/Documentation/crypto/api-skcipher.rst
-+++ b/Documentation/crypto/api-skcipher.rst
-@@ -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
- -----------------------------------------------
-diff --git a/include/linux/crypto.h b/include/linux/crypto.h
-index 0c720a2982ae4..019ddf7596534 100644
---- a/include/linux/crypto.h
-+++ b/include/linux/crypto.h
-@@ -903,20 +903,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
- *
-@@ -962,23 +948,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)
- {
---
-2.39.2
-
+++ /dev/null
-From 250ed9f7489ea73ea7422f38c4e4f648af200125 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 25 Oct 2019 12:41:09 -0700
-Subject: crypto: skcipher - unify the crypto_has_skcipher*() functions
-
-From: Eric Biggers <ebiggers@google.com>
-
-[ Upstream commit d3ca75a8b3d77f2788e6c119ea7c3e3a1ab1e1ca ]
-
-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().
-
-Signed-off-by: Eric Biggers <ebiggers@google.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Stable-dep-of: efbc7764c444 ("crypto: marvell/cesa - Fix type mismatch warning")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- crypto/skcipher.c | 4 ++--
- include/crypto/skcipher.h | 19 +------------------
- 2 files changed, 3 insertions(+), 20 deletions(-)
-
-diff --git a/crypto/skcipher.c b/crypto/skcipher.c
-index 22753c1c72022..233678d078169 100644
---- a/crypto/skcipher.c
-+++ b/crypto/skcipher.c
-@@ -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)
- {
-diff --git a/include/crypto/skcipher.h b/include/crypto/skcipher.h
-index 0bce6005d325d..6514e32e7c2fd 100644
---- a/include/crypto/skcipher.h
-+++ b/include/crypto/skcipher.h
-@@ -220,30 +220,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)
---
-2.39.2
-
crypto-nx-fix-build-warnings-when-debug_fs-is-not-en.patch
modpost-fix-section-mismatch-message-for-r_arm_abs32.patch
modpost-fix-section-mismatch-message-for-r_arm_-pc24.patch
-crypto-skcipher-unify-the-crypto_has_skcipher-functi.patch
-crypto-skcipher-remove-crypto_has_ablkcipher.patch
crypto-marvell-cesa-fix-type-mismatch-warning.patch
modpost-fix-off-by-one-in-is_executable_section.patch
arc-define-asm_nl-and-__align-_str-outside-ifdef-__a.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
