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: API: - algif_hash needs to wait for init operations to complete. - The has_key setting for shash was always true. Algorithms: - Add missing selections of CRYPTO_HASH. - Fix pkcs7 authentication. Drivers: - Fix stack alignment bug in chacha20-ssse3. - Fix performance regression in caam due to incorrect setting. - Fix potential compile-only build failure of stm32" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: atmel-aes - remove calls of clk_prepare() from atomic contexts crypto: algif_hash - wait for crypto_ahash_init() to complete crypto: shash - Fix has_key setting hwrng: stm32 - Fix dependencies for !HAS_IOMEM archs crypto: ghash,poly1305 - select CRYPTO_HASH where needed crypto: chacha20-ssse3 - Align stack pointer to 64 bytes PKCS#7: Don't require SpcSpOpusInfo in Authenticode pkcs7 signatures crypto: caam - make write transactions bufferable on PPC platforms
No related branches found
No related tags found
Showing
- arch/x86/crypto/chacha20-ssse3-x86_64.S 4 additions, 2 deletionsarch/x86/crypto/chacha20-ssse3-x86_64.S
- crypto/Kconfig 2 additions, 0 deletionscrypto/Kconfig
- crypto/algif_hash.c 3 additions, 1 deletioncrypto/algif_hash.c
- crypto/asymmetric_keys/pkcs7_parser.c 1 addition, 3 deletionscrypto/asymmetric_keys/pkcs7_parser.c
- crypto/shash.c 3 additions, 4 deletionscrypto/shash.c
- drivers/char/hw_random/Kconfig 1 addition, 0 deletionsdrivers/char/hw_random/Kconfig
- drivers/crypto/atmel-aes.c 12 additions, 4 deletionsdrivers/crypto/atmel-aes.c
- drivers/crypto/caam/ctrl.c 2 additions, 2 deletionsdrivers/crypto/caam/ctrl.c
Loading
Please register or sign in to comment