• Linus Torvalds's avatar
    Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 39a5101f
    Linus Torvalds authored
    Pull crypto updates from Herbert Xu:
     "API:
       - Allow DRBG testing through user-space af_alg
       - Add tcrypt speed testing support for keyed hashes
       - Add type-safe init/exit hooks for ahash
    
      Algorithms:
       - Mark arc4 as obsolete and pending for future removal
       - Mark anubis, khazad, sead and tea as obsolete
       - Improve boot-time xor benchmark
       - Add OSCCA SM2 asymmetric cipher algorithm and use it for integrity
    
      Drivers:
       - Fixes and enhancement for XTS in caam
       - Add support for XIP8001B hwrng in xiphera-trng
       - Add RNG and hash support in sun8i-ce/sun8i-ss
       - Allow imx-rngc to be used by kernel entropy pool
       - Use crypto engine in omap-sham
       - Add support for Ingenic X1830 with ingenic"
    
    * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (205 commits)
      X.509: Fix modular build of public_key_sm2
      crypto: xor - Remove unused variable count in do_xor_speed
      X.509: fix error return value on the failed path
      crypto: bcm - Verify GCM/CCM key length in setkey
      crypto: qat - drop input parameter from adf_enable_aer()
      crypto: qat - fix function parameters descriptions
      crypto: atmel-tdes - use semicolons rather than commas to separate statements
      crypto: drivers - use semicolons rather than commas to separate statements
      hwrng: mxc-rnga - use semicolons rather than commas to separate statements
      hwrng: iproc-rng200 - use semicolons rather than commas to separate statements
      hwrng: stm32 - use semicolons rather than commas to separate statements
      crypto: xor - use ktime for template benchmarking
      crypto: xor - defer load time benchmark to a later time
      crypto: hisilicon/zip - fix the uninitalized 'curr_qm_qp_num'
      crypto: hisilicon/zip - fix the return value when device is busy
      crypto: hisilicon/zip - fix zero length input in GZIP decompress
      crypto: hisilicon/zip - fix the uncleared debug registers
      lib/mpi: Fix unused variable warnings
      crypto: x86/poly1305 - Remove assignments with no effect
      hwrng: npcm - modify readl to readb
      ...
    39a5101f