• Linus Torvalds's avatar
    Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · a78208e2
    Linus Torvalds authored
    Pull crypto updates from Herbert Xu:
     "API:
       - Removed CRYPTO_TFM_RES flags
       - Extended spawn grabbing to all algorithm types
       - Moved hash descsize verification into API code
    
      Algorithms:
       - Fixed recursive pcrypt dead-lock
       - Added new 32 and 64-bit generic versions of poly1305
       - Added cryptogams implementation of x86/poly1305
    
      Drivers:
       - Added support for i.MX8M Mini in caam
       - Added support for i.MX8M Nano in caam
       - Added support for i.MX8M Plus in caam
       - Added support for A33 variant of SS in sun4i-ss
       - Added TEE support for Raven Ridge in ccp
       - Added in-kernel API to submit TEE commands in ccp
       - Added AMD-TEE driver
       - Added support for BCM2711 in iproc-rng200
       - Added support for AES256-GCM based ciphers for chtls
       - Added aead support on SEC2 in hisilicon"
    
    * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (244 commits)
      crypto: arm/chacha - fix build failured when kernel mode NEON is disabled
      crypto: caam - add support for i.MX8M Plus
      crypto: x86/poly1305 - emit does base conversion itself
      crypto: hisilicon - fix spelling mistake "disgest" -> "digest"
      crypto: chacha20poly1305 - add back missing test vectors and test chunking
      crypto: x86/poly1305 - fix .gitignore typo
      tee: fix memory allocation failure checks on drv_data and amdtee
      crypto: ccree - erase unneeded inline funcs
      crypto: ccree - make cc_pm_put_suspend() void
      crypto: ccree - split overloaded usage of irq field
      crypto: ccree - fix PM race condition
      crypto: ccree - fix FDE descriptor sequence
      crypto: ccree - cc_do_send_request() is void func
      crypto: ccree - fix pm wrongful error reporting
      crypto: ccree - turn errors to debug msgs
      crypto: ccree - fix AEAD decrypt auth fail
      crypto: ccree - fix typo in comment
      crypto: ccree - fix typos in error msgs
      crypto: atmel-{aes,sha,tdes} - Retire crypto_platform_data
      crypto: x86/sha - Eliminate casts on asm implementations
      ...
    a78208e2