diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-11 14:29:41 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-18 11:16:12 +0100 |
| commit | 6e8d8ecf438792ecf7a3207488fb4eebc4edb040 (patch) | |
| tree | 72297045c5f6fea771f9e68781a4d816d539d732 /crypto/algif_skcipher.c | |
| parent | crypto: skcipher - Add crypto_skcipher_has_setkey (diff) | |
| download | linux-6e8d8ecf438792ecf7a3207488fb4eebc4edb040.tar.xz linux-6e8d8ecf438792ecf7a3207488fb4eebc4edb040.zip | |
crypto: algif_skcipher - Add key check exception for cipher_null
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: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/algif_skcipher.c')
| -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 110bab499e43..4a5bdb69fd49 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); |