From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Oct 2020 15:50:16 +0000 (-0700)
Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=39a5101f989e8d2be557136704d53990f9b402c8;p=uclinux-h8%2Flinux.git

Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto updates from Herbert Xu:
 "API:
   - Allow DRBG testing through user-space af_alg
   - Add tcrypt speed testing support for keyed hashes
   - Add type-safe init/exit hooks for ahash

  Algorithms:
   - Mark arc4 as obsolete and pending for future removal
   - Mark anubis, khazad, sead and tea as obsolete
   - Improve boot-time xor benchmark
   - Add OSCCA SM2 asymmetric cipher algorithm and use it for integrity

  Drivers:
   - Fixes and enhancement for XTS in caam
   - Add support for XIP8001B hwrng in xiphera-trng
   - Add RNG and hash support in sun8i-ce/sun8i-ss
   - Allow imx-rngc to be used by kernel entropy pool
   - Use crypto engine in omap-sham
   - Add support for Ingenic X1830 with ingenic"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (205 commits)
  X.509: Fix modular build of public_key_sm2
  crypto: xor - Remove unused variable count in do_xor_speed
  X.509: fix error return value on the failed path
  crypto: bcm - Verify GCM/CCM key length in setkey
  crypto: qat - drop input parameter from adf_enable_aer()
  crypto: qat - fix function parameters descriptions
  crypto: atmel-tdes - use semicolons rather than commas to separate statements
  crypto: drivers - use semicolons rather than commas to separate statements
  hwrng: mxc-rnga - use semicolons rather than commas to separate statements
  hwrng: iproc-rng200 - use semicolons rather than commas to separate statements
  hwrng: stm32 - use semicolons rather than commas to separate statements
  crypto: xor - use ktime for template benchmarking
  crypto: xor - defer load time benchmark to a later time
  crypto: hisilicon/zip - fix the uninitalized 'curr_qm_qp_num'
  crypto: hisilicon/zip - fix the return value when device is busy
  crypto: hisilicon/zip - fix zero length input in GZIP decompress
  crypto: hisilicon/zip - fix the uncleared debug registers
  lib/mpi: Fix unused variable warnings
  crypto: x86/poly1305 - Remove assignments with no effect
  hwrng: npcm - modify readl to readb
  ...
---

39a5101f989e8d2be557136704d53990f9b402c8
diff --cc crypto/tcrypt.c
index 12e82a61b896,234b1adcfbcb..eea0f453cfb6
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@@ -2416,11 -2417,12 +2417,12 @@@ static int do_test(const char *alg, u3
  	case 317:
  		test_hash_speed("rmd320", sec, generic_hash_speed_template);
  		if (mode > 300 && mode < 400) break;
 -		/* fall through */
 +		fallthrough;
  	case 318:
- 		test_hash_speed("ghash-generic", sec, hash_speed_template_16);
+ 		klen = 16;
+ 		test_hash_speed("ghash", sec, generic_hash_speed_template);
  		if (mode > 300 && mode < 400) break;
 -		/* fall through */
 +		fallthrough;
  	case 319:
  		test_hash_speed("crc32c", sec, generic_hash_speed_template);
  		if (mode > 300 && mode < 400) break;
diff --cc drivers/crypto/Kconfig
index 52a9b7cf6576,c2950127def6..37593387164a
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@@ -873,9 -873,7 +873,10 @@@ config CRYPTO_DEV_SA2U
  	select CRYPTO_AES
  	select CRYPTO_AES_ARM64
  	select CRYPTO_ALGAPI
+ 	select CRYPTO_AUTHENC
 +	select CRYPTO_SHA1
 +	select CRYPTO_SHA256
 +	select CRYPTO_SHA512
  	select HW_RANDOM
  	select SG_SPLIT
  	help