• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 32dc43e4
    Linus Torvalds authored
    Pull crypto update from Herbert Xu:
     "Here is the crypto update for 3.9:
    
       - Added accelerated implementation of crc32 using pclmulqdq.
    
       - Added test vector for fcrypt.
    
       - Added support for OMAP4/AM33XX cipher and hash.
    
       - Fixed loose crypto_user input checks.
    
       - Misc fixes"
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (43 commits)
      crypto: user - ensure user supplied strings are nul-terminated
      crypto: user - fix empty string test in report API
      crypto: user - fix info leaks in report API
      crypto: caam - Added property fsl,sec-era in SEC4.0 device tree binding.
      crypto: use ERR_CAST
      crypto: atmel-aes - adjust duplicate test
      crypto: crc32-pclmul - Kill warning on x86-32
      crypto: x86/twofish - assembler clean-ups: use ENTRY/ENDPROC, localize jump labels
      crypto: x86/sha1 - assembler clean-ups: use ENTRY/ENDPROC
      crypto: x86/serpent - use ENTRY/ENDPROC for assember functions and localize jump targets
      crypto: x86/salsa20 - assembler cleanup, use ENTRY/ENDPROC for assember functions and rename ECRYPT_* to salsa20_*
      crypto: x86/ghash - assembler clean-up: use ENDPROC at end of assember functions
      crypto: x86/crc32c - assembler clean-up: use ENTRY/ENDPROC
      crypto: cast6-avx: use ENTRY()/ENDPROC() for assembler functions
      crypto: cast5-avx: use ENTRY()/ENDPROC() for assembler functions and localize jump targets
      crypto: camellia-x86_64/aes-ni: use ENTRY()/ENDPROC() for assembler functions and localize jump targets
      crypto: blowfish-x86_64: use ENTRY()/ENDPROC() for assembler functions and localize jump targets
      crypto: aesni-intel - add ENDPROC statements for assembler functions
      crypto: x86/aes - assembler clean-ups: use ENTRY/ENDPROC, localize jump targets
      crypto: testmgr - add test vector for fcrypt
      ...
    32dc43e4
ctr.c 12.3 KB