Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "API: - Add 1472-byte test to tcrypt for IPsec - Reintroduced crypto stats interface with numerous changes - Support incremental algorithm dumps Algorithms: - Add xchacha12/20 - Add nhpoly1305 - Add adiantum - Add streebog hash - Mark cts(cbc(aes)) as FIPS allowed Drivers: - Improve performance of arm64/chacha20 - Improve performance of x86/chacha20 - Add NEON-accelerated nhpoly1305 - Add SSE2 accelerated nhpoly1305 - Add AVX2 accelerated nhpoly1305 - Add support for 192/256-bit keys in gcmaes AVX - Add SG support in gcmaes AVX - ESN for inline IPsec tx in chcr - Add support for CryptoCell 703 in ccree - Add support for CryptoCell 713 in ccree - Add SM4 support in ccree - Add SM3 support in ccree - Add support for chacha20 in caam/qi2 - Add support for chacha20 + poly1305 in caam/jr - Add support for chacha20 + poly1305 in caam/qi2 - Add AEAD cipher support in cavium/nitrox" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (130 commits) crypto: skcipher - remove remnants of internal IV generators crypto: cavium/nitrox - Fix build with !CONFIG_DEBUG_FS crypto: salsa20-generic - don't unnecessarily use atomic walk crypto: skcipher - add might_sleep() to skcipher_walk_virt() crypto: x86/chacha - avoid sleeping under kernel_fpu_begin() crypto: cavium/nitrox - Added AEAD cipher support crypto: mxc-scc - fix build warnings on ARM64 crypto: api - document missing stats member crypto: user - remove unused dump functions crypto: chelsio - Fix wrong error counter increments crypto: chelsio - Reset counters on cxgb4 Detach crypto: chelsio - Handle PCI shutdown event crypto: chelsio - cleanup:send addr as value in function argument crypto: chelsio - Use same value for both channel in single WR crypto: chelsio - Swap location of AAD and IV sent in WR crypto: chelsio - remove set but not used variable 'kctx_len' crypto: ux500 - Use proper enum in hash_set_dma_transfer crypto: ux500 - Use proper enum in cryp_set_dma_transfer crypto: aesni - Add scatter/gather avx stubs, and use them in C crypto: aesni - Introduce partial block macro ..
No related branches found
No related tags found
Showing
- Documentation/crypto/api.rst 0 additions, 9 deletionsDocumentation/crypto/api.rst
- Documentation/crypto/architecture.rst 5 additions, 26 deletionsDocumentation/crypto/architecture.rst
- Documentation/devicetree/bindings/crypto/arm-cryptocell.txt 6 additions, 2 deletionsDocumentation/devicetree/bindings/crypto/arm-cryptocell.txt
- Documentation/devicetree/bindings/crypto/fsl-dcp.txt 2 additions, 0 deletionsDocumentation/devicetree/bindings/crypto/fsl-dcp.txt
- MAINTAINERS 7 additions, 2 deletionsMAINTAINERS
- arch/arm/crypto/Kconfig 15 additions, 1 deletionarch/arm/crypto/Kconfig
- arch/arm/crypto/Makefile 4 additions, 2 deletionsarch/arm/crypto/Makefile
- arch/arm/crypto/aes-ce-glue.c 0 additions, 1 deletionarch/arm/crypto/aes-ce-glue.c
- arch/arm/crypto/aes-cipher-core.S 52 additions, 10 deletionsarch/arm/crypto/aes-cipher-core.S
- arch/arm/crypto/chacha-neon-core.S 64 additions, 34 deletionsarch/arm/crypto/chacha-neon-core.S
- arch/arm/crypto/chacha-neon-glue.c 201 additions, 0 deletionsarch/arm/crypto/chacha-neon-glue.c
- arch/arm/crypto/chacha20-neon-glue.c 0 additions, 127 deletionsarch/arm/crypto/chacha20-neon-glue.c
- arch/arm/crypto/nh-neon-core.S 116 additions, 0 deletionsarch/arm/crypto/nh-neon-core.S
- arch/arm/crypto/nhpoly1305-neon-glue.c 77 additions, 0 deletionsarch/arm/crypto/nhpoly1305-neon-glue.c
- arch/arm64/crypto/Kconfig 6 additions, 1 deletionarch/arm64/crypto/Kconfig
- arch/arm64/crypto/Makefile 5 additions, 2 deletionsarch/arm64/crypto/Makefile
- arch/arm64/crypto/chacha-neon-core.S 439 additions, 45 deletionsarch/arm64/crypto/chacha-neon-core.S
- arch/arm64/crypto/chacha-neon-glue.c 198 additions, 0 deletionsarch/arm64/crypto/chacha-neon-glue.c
- arch/arm64/crypto/chacha20-neon-glue.c 0 additions, 133 deletionsarch/arm64/crypto/chacha20-neon-glue.c
- arch/arm64/crypto/nh-neon-core.S 103 additions, 0 deletionsarch/arm64/crypto/nh-neon-core.S
Loading
Please register or sign in to comment