diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-11 21:29:41 +0800 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2016-02-24 14:34:07 +0000 |
| commit | c8f7691fa11023ada207422138c0808820d181d3 (patch) | |
| tree | 7887c08245272b328c0c0083b66218f6cdf4a2cd /crypto | |
| parent | 05b93b57b60b3461726019eeba7a45500b889573 (diff) | |
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>
[bwh: Backported to 3.2: use crypto_ablkcipher_has_setkey()]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
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 f0037c0c36b7..584d70f7f824 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -760,7 +760,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); |