diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-30 15:20:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-30 15:20:18 -0700 |
commit | b415b57f7e77e032c4c6174b47eb658d19c8b36e (patch) | |
tree | 8fb6de71b2914d86a9b35c7f7ff6213f91007008 /crypto | |
parent | 3ea55dd3393236684af71db16df1906c5e9dbc65 (diff) | |
parent | 846525499c909f51d1ab7ee50fc769541f48483c (diff) | |
download | linux-crypto-b415b57f7e77e032c4c6174b47eb658d19c8b36e.tar.gz linux-crypto-b415b57f7e77e032c4c6174b47eb658d19c8b36e.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the following issues:
- missing selection in public_key that may result in a build failure
- Potential crash in error path in omap-sham
- ccp AES XTS bug that affects requests larger than 4096"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ccp - Fix AES XTS error for request sizes above 4096
crypto: public_key: select CRYPTO_AKCIPHER
crypto: omap-sham - potential Oops on error in probe
Diffstat (limited to '')
-rw-r--r-- | crypto/asymmetric_keys/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/Kconfig b/crypto/asymmetric_keys/Kconfig index e28e9120..331f6baf 100644 --- a/crypto/asymmetric_keys/Kconfig +++ b/crypto/asymmetric_keys/Kconfig @@ -13,6 +13,7 @@ config ASYMMETRIC_PUBLIC_KEY_SUBTYPE tristate "Asymmetric public-key crypto algorithm subtype" select MPILIB select CRYPTO_HASH_INFO + select CRYPTO_AKCIPHER help This option provides support for asymmetric public key type handling. If signature generation and/or verification are to be used, |