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-20 01:28:35 +0300 |
| commit | 38c3e0d5568453c519ae53e1a67cc7e3501274d7 (patch) | |
| tree | d5071177adb88b664fe53062e27535e70fca4af8 | |
| parent | cdbd71838c8ccda502234560484a10b3aefabf82 (diff) | |
| download | linux-38c3e0d5568453c519ae53e1a67cc7e3501274d7.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>
| -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 3d5108fdb89c..e71fbdb344e2 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); |