Skip to content
  • Linus Torvalds's avatar
    Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 48162a20
    Linus Torvalds authored
    Pull crypto fixes from Herbert Xu:
     "This fixes the following issues:
    
      API:
       - A large number of bug fixes for the af_alg interface, credit goes
         to Dmitry Vyukov for discovering and reporting these issues.
    
      Algorithms:
       - sw842 needs to select crc32.
       - The soft dependency on crc32c is now in the correct spot.
    
      Drivers:
       - The atmel AES driver needs HAS_DMA.
       - The atmel AES driver was a missing break statement, fortunately
         it's only a debug function.
       - A number of bug fixes for the Intel qat driver"
    
    * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (24 commits)
      crypto: algif_skcipher - sendmsg SG marking is off by one
      crypto: crc32c - Fix crc32c soft dependency
      crypto: algif_skcipher - Load TX SG list after waiting
      crypto: atmel-aes - Add missing break to atmel_aes_reg_name
      crypto: algif_skcipher - Fix race condition in skcipher_check_key
      crypto: algif_hash - Fix race condition in hash_check_key
      crypto: CRYPTO_DEV_ATMEL_AES should depend on HAS_DMA
      lib: sw842: select crc32
      crypto: af_alg - Forbid bind(2) when nokey child sockets are present
      crypto: algif_skcipher - Remove custom release parent function
      crypto: algif_hash - Remove custom release parent function
      crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path
      crypto: qat - update init_esram for C3xxx dev type
      crypto: qat - fix timeout issues
      crypto: qat - remove to call get_sram_bar_id for qat_c3xxx
      crypto: algif_skcipher - Add key check exception for cipher_null
      crypto: skcipher - Add crypto_skcipher_has_setkey
      crypto: algif_hash - Require setkey before accept(2)
      crypto: hash - Add crypto_ahash_has_setkey
      crypto: algif_skcipher - Add nokey compatibility path
      ...
    48162a20