2015-11-25 17:50:54

by Alexander Kuleshov

Subject: [PATCH] crypto/cryptod: use crypto_skcipher_type() for getting skcipher type

The <linux/crypto.h> provides inline function - crypto_skcipher_type().
Let's use it in the cryptd_alloc_ablkcipher() instead of direct calculation.

Signed-off-by: Alexander Kuleshov <[email protected]>
---
crypto/cryptd.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index c81861b..c4af8aa 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -887,8 +887,7 @@ struct cryptd_ablkcipher *cryptd_alloc_ablkcipher(const char *alg_name,
if (snprintf(cryptd_alg_name, CRYPTO_MAX_ALG_NAME,
"cryptd(%s)", alg_name) >= CRYPTO_MAX_ALG_NAME)
return ERR_PTR(-EINVAL);
- type &= ~(CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_GENIV);
- type |= CRYPTO_ALG_TYPE_BLKCIPHER;
+ type = crypto_skcipher_type(type);
mask &= ~CRYPTO_ALG_TYPE_MASK;
mask |= (CRYPTO_ALG_GENIV | CRYPTO_ALG_TYPE_BLKCIPHER_MASK);
tfm = crypto_alloc_base(cryptd_alg_name, type, mask);
--
2.5.0

2015-11-27 13:26:23

by Herbert Xu

Subject: Re: [PATCH] crypto/cryptod: use crypto_skcipher_type() for getting skcipher type

On Wed, Nov 25, 2015 at 11:48:28PM +0600, Alexander Kuleshov wrote:
> The <linux/crypto.h> provides inline function - crypto_skcipher_type().
> Let's use it in the cryptd_alloc_ablkcipher() instead of direct calculation.
>
> Signed-off-by: Alexander Kuleshov <[email protected]>

Applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt