• Linus Torvalds's avatar
    Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 6159c49e
    Linus Torvalds authored
    Pull crypto updates from Herbert Xu:
     "Algorithms:
    
       - Fix rmmod crash with x86/curve25519
    
       - Add ECDH NIST P384
    
       - Generate assembly files at build-time with perl scripts on arm
    
       - Switch to HMAC SHA512 DRBG as default DRBG
    
      Drivers:
    
       - Add sl3516 crypto engine
    
       - Add ECDH NIST P384 support in hisilicon/hpre
    
       - Add {ofb,cfb,ctr} over {aes,sm4} in hisilicon/sec
    
       - Add {ccm,gcm} over {aes,sm4} in hisilicon/sec
    
       - Enable omap hwrng driver for TI K3 family
    
       - Add support for AEAD algorithms in qce"
    
    * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (142 commits)
      crypto: sl3516 - depends on HAS_IOMEM
      crypto: hisilicon/qm - implement for querying hardware tasks status.
      crypto: sl3516 - Fix build warning without CONFIG_PM
      MAINTAINERS: update caam crypto driver maintainers list
      crypto: nx - Fix numerous sparse byte-order warnings
      crypto: nx - Fix RCU warning in nx842_OF_upd_status
      crypto: api - Move crypto attr definitions out of crypto.h
      crypto: nx - Fix memcpy() over-reading in nonce
      crypto: hisilicon/sec - Fix spelling mistake "fallbcak" -> "fallback"
      crypto: sa2ul - Remove unused auth_len variable
      crypto: sl3516 - fix duplicated inclusion
      crypto: hisilicon/zip - adds the max shaper type rate
      crypto: hisilicon/hpre - adds the max shaper type rate
      crypto: hisilicon/sec - adds the max shaper type rate
      crypto: hisilicon/qm - supports to inquiry each function's QoS
      crypto: hisilicon/qm - add pf ping single vf function
      crypto: hisilicon/qm - merges the work initialization process into a single function
      crypto: hisilicon/qm - add the "alg_qos" file node
      crypto: hisilicon/qm - supports writing QoS int the host
      crypto: api - remove CRYPTOA_U32 and related functions
      ...
    6159c49e
MAINTAINERS 590 KB