From: Herbert Xu <[email protected]>

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.

Cc: [email protected]
Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: Andrey Ryabinin <[email protected]>
---
 crypto/algif_skcipher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index db5f0f0..4677a45 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -759,7 +759,7 @@ static int skcipher_accept_parent(void *private, struct 
sock *sk)
 {
        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);
-- 
2.7.3

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to