diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-11 16:29:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-17 23:31:03 +0300 |
| commit | a8e70a1a4fd6c0bc634a2b3f7b4b77ee378c3134 (patch) | |
| tree | e91b6cc8e6071d8e6bd04f6de325905eb7152fe1 /crypto | |
| parent | 7f5c995746ebc3f431c596ffabb98af1b3e3de86 (diff) | |
| download | linux-a8e70a1a4fd6c0bc634a2b3f7b4b77ee378c3134.tar.xz | |
crypto: algif_skcipher - Add key check exception for cipher_null
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algif_skcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index bb0ee129a775..c3b5c91b22d9 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -978,7 +978,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_skcipher_has_setkey(tfm->skcipher)) return -ENOKEY; return skcipher_accept_parent_common(private, sk); |