1
0
Fork 0
alistair23-linux/drivers/crypto/qce
Linus Torvalds 37dc79565c Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu:
 "Here is the crypto update for 4.15:

  API:

   - Disambiguate EBUSY when queueing crypto request by adding ENOSPC.
     This change touches code outside the crypto API.
   - Reset settings when empty string is written to rng_current.

  Algorithms:

   - Add OSCCA SM3 secure hash.

  Drivers:

   - Remove old mv_cesa driver (replaced by marvell/cesa).
   - Enable rfc3686/ecb/cfb/ofb AES in crypto4xx.
   - Add ccm/gcm AES in crypto4xx.
   - Add support for BCM7278 in iproc-rng200.
   - Add hash support on Exynos in s5p-sss.
   - Fix fallback-induced error in vmx.
   - Fix output IV in atmel-aes.
   - Fix empty GCM hash in mediatek.

  Others:

   - Fix DoS potential in lib/mpi.
   - Fix potential out-of-order issues with padata"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (162 commits)
  lib/mpi: call cond_resched() from mpi_powm() loop
  crypto: stm32/hash - Fix return issue on update
  crypto: dh - Remove pointless checks for NULL 'p' and 'g'
  crypto: qat - Clean up error handling in qat_dh_set_secret()
  crypto: dh - Don't permit 'key' or 'g' size longer than 'p'
  crypto: dh - Don't permit 'p' to be 0
  crypto: dh - Fix double free of ctx->p
  hwrng: iproc-rng200 - Add support for BCM7278
  dt-bindings: rng: Document BCM7278 RNG200 compatible
  crypto: chcr - Replace _manual_ swap with swap macro
  crypto: marvell - Add a NULL entry at the end of mv_cesa_plat_id_table[]
  hwrng: virtio - Virtio RNG devices need to be re-registered after suspend/resume
  crypto: atmel - remove empty functions
  crypto: ecdh - remove empty exit()
  MAINTAINERS: update maintainer for qat
  crypto: caam - remove unused param of ctx_map_to_sec4_sg()
  crypto: caam - remove unneeded edesc zeroization
  crypto: atmel-aes - Reset the controller before each use
  crypto: atmel-aes - properly set IV after {en,de}crypt
  hwrng: core - Reset user selected rng by writing "" to rng_current
  ...
2017-11-14 10:52:09 -08:00
..
Makefile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ablkcipher.c crypto: Use PTR_ERR_ZERO 2017-09-22 17:43:27 +08:00
cipher.h crypto: qce - Use skcipher for fallback 2016-07-01 23:45:09 +08:00
common.c crypto: qce - fix sparse warnings 2014-07-08 21:18:21 +08:00
common.h crypto: qce - fix sparse warnings 2014-07-08 21:18:21 +08:00
core.c crypto: qce: drop owner assignment from platform_drivers 2014-10-20 16:20:26 +02:00
core.h crypto: qce - Qualcomm crypto engine driver 2014-07-03 21:40:27 +08:00
dma.c crypto: qce - dma_map_sg can handle chained SG 2015-10-08 21:42:19 +08:00
dma.h crypto: qce - dma_map_sg can handle chained SG 2015-10-08 21:42:19 +08:00
regs-v5.h crypto: qce - Qualcomm crypto engine driver 2014-07-03 21:40:27 +08:00
sha.c crypto: qce - move to generic async completion 2017-11-03 22:11:22 +08:00
sha.h crypto: qce - dma_map_sg can handle chained SG 2015-10-08 21:42:19 +08:00