From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Jul 2019 03:57:08 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v5.3-rc1~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d2fa8b44b891f0da5ceda3e5a1402ccf0ab6f26;p=thirdparty%2Fkernel%2Flinux.git

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 5.3:

  API:
   - Test shash interface directly in testmgr
   - cra_driver_name is now mandatory

  Algorithms:
   - Replace arc4 crypto_cipher with library helper
   - Implement 5 way interleave for ECB, CBC and CTR on arm64
   - Add xxhash
   - Add continuous self-test on noise source to drbg
   - Update jitter RNG

  Drivers:
   - Add support for SHA204A random number generator
   - Add support for 7211 in iproc-rng200
   - Fix fuzz test failures in inside-secure
   - Fix fuzz test failures in talitos
   - Fix fuzz test failures in qat"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (143 commits)
  crypto: stm32/hash - remove interruptible condition for dma
  crypto: stm32/hash - Fix hmac issue more than 256 bytes
  crypto: stm32/crc32 - rename driver file
  crypto: amcc - remove memset after dma_alloc_coherent
  crypto: ccp - Switch to SPDX license identifiers
  crypto: ccp - Validate the the error value used to index error messages
  crypto: doc - Fix formatting of new crypto engine content
  crypto: doc - Add parameter documentation
  crypto: arm64/aes-ce - implement 5 way interleave for ECB, CBC and CTR
  crypto: arm64/aes-ce - add 5 way interleave routines
  crypto: talitos - drop icv_ool
  crypto: talitos - fix hash on SEC1.
  crypto: talitos - move struct talitos_edesc into talitos.h
  lib/scatterlist: Fix mapping iterator when sg->offset is greater than PAGE_SIZE
  crypto/NX: Set receive window credits to max number of CRBs in RxFIFO
  crypto: asymmetric_keys - select CRYPTO_HASH where needed
  crypto: serpent - mark __serpent_setkey_sbox noinline
  crypto: testmgr - dynamically allocate crypto_shash
  crypto: testmgr - dynamically allocate testvec_config
  crypto: talitos - eliminate unneeded 'done' functions at build time
  ...
---

4d2fa8b44b891f0da5ceda3e5a1402ccf0ab6f26
diff --cc drivers/crypto/stm32/Makefile
index ce77e38c77e00,23ce3bc46989c..518e0e0b11a9e
--- a/drivers/crypto/stm32/Makefile
+++ b/drivers/crypto/stm32/Makefile
@@@ -1,4 -1,3 +1,4 @@@
 +# SPDX-License-Identifier: GPL-2.0-only
- obj-$(CONFIG_CRYPTO_DEV_STM32_CRC) += stm32_crc32.o
+ obj-$(CONFIG_CRYPTO_DEV_STM32_CRC) += stm32-crc32.o
  obj-$(CONFIG_CRYPTO_DEV_STM32_HASH) += stm32-hash.o
  obj-$(CONFIG_CRYPTO_DEV_STM32_CRYP) += stm32-cryp.o
diff --cc drivers/net/ppp/ppp_mppe.c
index 66c8e65f68720,de3b57d09d0cb..bd3c80b0bc77d
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@@ -63,16 -64,8 +64,9 @@@ MODULE_AUTHOR("Frank Cusack <fcusack@fc
  MODULE_DESCRIPTION("Point-to-Point Protocol Microsoft Point-to-Point Encryption support");
  MODULE_LICENSE("Dual BSD/GPL");
  MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE));
 +MODULE_SOFTDEP("pre: arc4");
  MODULE_VERSION("1.0.2");
  
- static unsigned int
- setup_sg(struct scatterlist *sg, const void *address, unsigned int length)
- {
- 	sg_set_buf(sg, address, length);
- 	return length;
- }
- 
  #define SHA1_PAD_SIZE 40
  
  /*