diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-31 01:20:18 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-31 01:20:18 +0300 |
| commit | 446985428d2cd10efd5d139c33de16c50ee771ba (patch) | |
| tree | eab5e1a239c891b25329726b780fbc5092aacb5e /crypto | |
| parent | b02b1fbdd338f70e49efa9ca9899214134526701 (diff) | |
| parent | ab6a11a7c8ef47f996974dd3c648c2c0b1a36ab1 (diff) | |
| download | linux-446985428d2cd10efd5d139c33de16c50ee771ba.tar.xz | |
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 'crypto')
| -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 e28e912000a7..331f6baf2df8 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, |