[PATCH 3.2 75/87] crypto: algif_skcipher - Add key check exception for cipher_null

From	Ben Hutchings <ben@decadent.org.uk>
Newsgroups	linux.kernel
Subject	[PATCH 3.2 75/87] crypto: algif_skcipher - Add key check exception for cipher_null
Date	2016-02-09 01:20 +0100
Message-ID	<r04ca-4m5-11@gated-at.bofh.it> (permalink)
References	<r03SN-3V2-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

3.2.77-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Herbert Xu <herbert@gondor.apana.org.au>

commit 6e8d8ecf438792ecf7a3207488fb4eebc4edb040 upstream.

This patch adds an exception to the key check so that cipher_null
users may continue to use algif_skcipher without setting a key.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
[bwh: Backported to 3.2: use crypto_ablkcipher_has_setkey()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 crypto/algif_skcipher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -760,7 +760,7 @@ static int skcipher_accept_parent(void *
 {
 	struct skcipher_tfm *tfm = private;
 
-	if (!tfm->has_key)
+	if (!tfm->has_key && crypto_ablkcipher_has_setkey(tfm->skcipher))
 		return -ENOKEY;
 
 	return skcipher_accept_parent_common(private, sk);

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.2 75/87] crypto: algif_skcipher - Add key check  exception for cipher_null Ben Hutchings <ben@decadent.org.uk> - 2016-02-09 01:20 +0100

csiph-web