• Linus Torvalds's avatar
    Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · b71acb0e
    Linus Torvalds authored
    Pull crypto updates from Herbert Xu:
       - Add 1472-byte test to tcrypt for IPsec
       - Reintroduced crypto stats interface with numerous changes
       - Support incremental algorithm dumps
       - Add xchacha12/20
       - Add nhpoly1305
       - Add adiantum
       - Add streebog hash
       - Mark cts(cbc(aes)) as FIPS allowed
       - 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