Skip to content
  • Linus Torvalds's avatar
    Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 5bcbe22c
    Linus Torvalds authored
    Pull crypto update from Herbert Xu:
     "API:
       - Try to catch hash output overrun in testmgr
       - Introduce walksize attribute for batched walking
       - Make crypto_xor() and crypto_inc() alignment agnostic
    
      Algorithms:
       - Add time-invariant AES algorithm
       - Add standalone CBCMAC algorithm
    
      Drivers:
       - Add NEON acclerated chacha20 on ARM/ARM64
       - Expose AES-CTR as synchronous skcipher on ARM64
       - Add scalar AES implementation on ARM64
       - Improve scalar AES implementation on ARM
       - Improve NEON AES implementation on ARM/ARM64
       - Merge CRC32 and PMULL instruction based drivers on ARM64
       - Add NEON acclerated CBCMAC/CMAC/XCBC AES on ARM64
       - Add IPsec AUTHENC implementation in atmel
       - Add Support for Octeon-tx CPT Engine
       - Add Broadcom SPU driver
       - Add MediaTek driver"
    
    * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (142 commits)
      crypto: xts - Add ECB dependency
      crypto: cavium - switch to pci_alloc_irq_vectors
      crypto: cavium - switch to pci_alloc_irq_vectors
      crypto: cavium - remove dead MSI-X related define
      crypto: brcm - Avoid double free in ahash_finup()
      crypto: cavium - fix Kconfig dependencies
      crypto: cavium - cpt_bind_vq_to_grp could return an error code
      crypto: doc - fix typo
      hwrng: omap - update Kconfig help description
      crypto: ccm - drop unnecessary minimum 32-bit alignment
      crypto: ccm - honour alignmask of subordinate MAC cipher
      crypto: caam - fix state buffer DMA (un)mapping
      crypto: caam - abstract ahash request double buffering
      crypto: caam - fix error path for ctx_dma mapping failure
      crypto: caam - fix DMA API leaks for multiple setkey() calls
      crypto: caam - don't dma_map key for hash algorithms
      crypto: caam - use dma_map_sg() return code
      crypto: caam - replace sg_count() with sg_nents_for_len()
      crypto: caam - check sg_count() return value
      crypto: caam - fix HW S/G in ablkcipher_giv_edesc_alloc()
      ..
    5bcbe22c