Patch "crypto: skcipher - Add crypto_skcipher_has_setkey" has been added to the 4.3-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
crypto: skcipher - Add crypto_skcipher_has_setkey
to the 4.3-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
crypto-skcipher-add-crypto_skcipher_has_setkey.patch
and it can be found in the queue-4.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
a1383cd86a062fc798899ab20f0ec2116cce39cbMon Sep 17 00:00:00 2001
From: Herbert Xu <[email protected]>
Date: Mon, 11 Jan 2016 21:26:50 +0800
Subject: crypto: skcipher - Add crypto_skcipher_has_setkey
From: Herbert Xu <[email protected]>
commit a1383cd86a062fc798899ab20f0ec2116cce39cb upstream.
This patch adds a way for skcipher users to determine whether a key is required by a transform.
--- crypto/skcipher.c | 2 ++ include/crypto/skcipher.h | 7 +++++++ 2 files changed, 9 insertions(+)
crypto/skcipher.c +2 -0
@@ -118,6 +118,7 @@ int crypto_init_skcipher_ops_blkcipher(s skcipher->decrypt = skcipher_decrypt_blkcipher; skcipher->ivsize =crypto_blkcipher_ivsize (blkcipher); + skcipher->has_setkey = calg->cra_blkcipher.max_keysize;return 0 ; }
@@ -210,6 +211,7 @@ int crypto_init_skcipher_ops_ablkcipher( skcipher->ivsize =crypto_ablkcipher_ivsize (ablkcipher); skcipher->reqsize =crypto_ablkcipher_reqsize (ablkcipher) +sizeof (struct ablkcipher_request ); + skcipher->has_setkey = calg->cra_ablkcipher.max_keysize;return 0 ; }
include/crypto/skcipher.h +7 -0
@@ -61,6 +61,8 @@ struct crypto_skcipher {unsigned int ivsize;unsigned int reqsize; +bool has_setkey; +struct crypto_tfm base; };
@@ -305,6 +307,11 @@ static inline int crypto_skcipher_setkeyreturn tfm->setkey (tfm, key, keylen); } +static inline bool crypto_skcipher_has_setkey (struct crypto_skcipher *tfm) +{ +return tfm->has_setkey; +} +/** * crypto_skcipher_reqtfm() - obtain cipher handle from request * @req: skcipher_request out of which the cipher handle is to be obtained
Patches currently in stable-queue which might be from [email protected] are
queue-4.3/crypto-fix-test-vector-for-rsa.patch queue-4.3/crypto-algif_skcipher-use-new-skcipher-interface.patch queue-4.3/crypto-af_alg-disallow-bind-setkey-...-after-accept-2.patch queue-4.3/crypto-crc32c-pclmul-use-.rodata-instead-of-.rotata.patch queue-4.3/crypto-caam-fix-non-block-aligned-hash-calculation.patch queue-4.3/crypto-nx-fix-timing-leak-in-gcm-and-ccm-decryption.patch queue-4.3/crypto-skcipher-copy-iv-from-desc-even-for-0-len-walks.patch queue-4.3/crypto-skcipher-add-crypto_skcipher_has_setkey.patch queue-4.3/crypto-algif_skcipher-add-key-check-exception-for-cipher_null.patch queue-4.3/crypto-algif_skcipher-require-setkey-before-accept-2.patch queue-4.3/crypto-algif_skcipher-add-nokey-compatibility-path.patch queue-4.3/crypto-hash-add-crypto_ahash_has_setkey.patch queue-4.3/crypto-af_alg-add-nokey-compatibility-path.patch queue-4.3/crypto-sun4i-ss-add-missing-statesize.patch queue-4.3/crypto-algif_hash-require-setkey-before-accept-2.patch queue-4.3/crypto-qat-don-t-use-userspace-pointer.patch queue-4.3/crypto-talitos-fix-timing-leak-in-esp-icv-verification.patch queue-4.3/crypto-algif_hash-only-export-and-import-on-sockets-with-data.patch queue-4.3/crypto-af_alg-fix-socket-double-free-when-accept-fails.patch