Commit d8dc121e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull crypto fixes from Herbert Xu:

 - Regression fix in drbg due to missing self-test for new default
   algorithm

 - Add ratelimit on user-triggerable message in qat

 - Fix build failure due to missing dependency in sl3516

 - Remove obsolete PageSlab checks

 - Fix bogus hardware register writes on Kunpeng920 in hisilicon/sec

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hisilicon/sec - fix the process of disabling sva prefetching
  crypto: sl3516 - Add dependency on ARCH_GEMINI
  crypto: sl3516 - Typo s/Stormlink/Storlink/
  crypto: drbg - self test for HMAC(SHA-512)
  crypto: omap - Drop obsolete PageSlab check
  crypto: scatterwalk - Remove obsolete PageSlab check
  crypto: qat - ratelimit invalid ioctl message and print the invalid cmd
parents 9b76d71f 66192b2e

crypto/testmgr.c

+4 −1
Original line number Diff line number Diff line
@@ -4686,8 +4686,11 @@ static const struct alg_test_desc alg_test_descs[] = { 
		.test = alg_test_null,

	}, {

		.alg = "drbg_nopr_hmac_sha512",

		.test = alg_test_null,

		.test = alg_test_drbg,

		.fips_allowed = 1,

		.suite = {

			.drbg = __VECS(drbg_nopr_hmac_sha512_tv_template)

		}

	}, {

		.alg = "drbg_nopr_sha1",

		.fips_allowed = 1,

crypto/testmgr.h

+49 −0
Original line number Diff line number Diff line
@@ -21984,6 +21984,55 @@ static const struct drbg_testvec drbg_nopr_hmac_sha256_tv_template[] = { 
	},

};









/* Test vector obtained during NIST ACVP testing */









static const struct drbg_testvec drbg_nopr_hmac_sha512_tv_template[] = {









	{









		.entropy = (unsigned char *)









			"\xDF\xB0\xF2\x18\xF0\x78\x07\x01\x29\xA4\x29\x26"









			"\x2F\x8A\x34\xCB\x37\xEF\xEE\x41\xE6\x96\xF7\xFF"









			"\x61\x47\xD3\xED\x41\x97\xEF\x64\x0C\x48\x56\x5A"









			"\xE6\x40\x6E\x4A\x3B\x9E\x7F\xAC\x08\xEC\x25\xAE"









			"\x0B\x51\x0E\x2C\x44\x2E\xBD\xDB\x57\xD0\x4A\x6D"









			"\x80\x3E\x37\x0F",









		.entropylen = 64,









		.expected = (unsigned char *)









			"\x48\xc6\xa8\xdb\x09\xae\xde\x5d\x8c\x77\xf3\x52"









			"\x92\x71\xa7\xb9\x6d\x53\x6d\xa3\x73\xe3\x55\xb8"









			"\x39\xd6\x44\x2b\xee\xcb\xe1\x32\x15\x30\xbe\x4e"









			"\x9b\x1e\x06\xd1\x6b\xbf\xd5\x3e\xea\x7c\xf5\xaa"









			"\x4b\x05\xb5\xd3\xa7\xb2\xc4\xfe\xe7\x1b\xda\x11"









			"\x43\x98\x03\x70\x90\xbf\x6e\x43\x9b\xe4\x14\xef"









			"\x71\xa3\x2a\xef\x9f\x0d\xb9\xe3\x52\xf2\x89\xc9"









			"\x66\x9a\x60\x60\x99\x60\x62\x4c\xd6\x45\x52\x54"









			"\xe6\x32\xb2\x1b\xd4\x48\xb5\xa6\xf9\xba\xd3\xff"









			"\x29\xc5\x21\xe0\x91\x31\xe0\x38\x8c\x93\x0f\x3c"









			"\x30\x7b\x53\xa3\xc0\x7f\x2d\xc1\x39\xec\x69\x0e"









			"\xf2\x4a\x3c\x65\xcc\xed\x07\x2a\xf2\x33\x83\xdb"









			"\x10\x74\x96\x40\xa7\xc5\x1b\xde\x81\xca\x0b\x8f"









			"\x1e\x0a\x1a\x7a\xbf\x3c\x4a\xb8\x8c\xaf\x7b\x80"









			"\xb7\xdc\x5d\x0f\xef\x1b\x97\x6e\x3d\x17\x23\x5a"









			"\x31\xb9\x19\xcf\x5a\xc5\x00\x2a\xb6\xf3\x99\x34"









			"\x65\xee\xe9\x1c\x55\xa0\x3b\x07\x60\xc9\xc4\xe4"









			"\xf7\x57\x5c\x34\x9f\xc6\x31\x30\x3f\x23\xb2\x89"









			"\xc0\xe7\x50\xf3\xde\x59\xd1\x0e\xb3\x0f\x78\xcc"









			"\x7e\x54\x5e\x61\xf6\x86\x3d\xb3\x11\x94\x36\x3e"









			"\x61\x5c\x48\x99\xf6\x7b\x02\x9a\xdc\x6a\x28\xe6"









			"\xd1\xa7\xd1\xa3",









		.expectedlen = 256,









		.addtla = (unsigned char *)









			"\x6B\x0F\x4A\x48\x0B\x12\x85\xE4\x72\x23\x7F\x7F"









			"\x94\x7C\x24\x69\x14\x9F\xDC\x72\xA6\x33\xAD\x3C"









			"\x8C\x72\xC1\x88\x49\x59\x82\xC5",









		.addtlb = (unsigned char *)









			"\xC4\xAF\x36\x3D\xB8\x5D\x9D\xFA\x92\xF5\xC3\x3C"









			"\x2D\x1E\x22\x2A\xBD\x8B\x05\x6F\xA3\xFC\xBF\x16"









			"\xED\xAA\x75\x8D\x73\x9A\xF6\xEC",









		.addtllen = 32,









		.pers = NULL,









		.perslen = 0,









	}









};

















static const struct drbg_testvec drbg_nopr_ctr_aes192_tv_template[] = {









	{









		.entropy = (unsigned char *)

























drivers/crypto/Kconfig



+3
−3






























Original line number
Diff line number
Diff line







@@ -267,14 +267,14 @@ config CRYPTO_DEV_NIAGARA2







	  checksumming, and raw copies.



















config CRYPTO_DEV_SL3516









	tristate "Stormlink SL3516 crypto offloader"









	depends on HAS_IOMEM









	tristate "Storlink SL3516 crypto offloader"









	depends on ARCH_GEMINI || COMPILE_TEST









	depends on HAS_IOMEM && PM









	select CRYPTO_SKCIPHER









	select CRYPTO_ENGINE









	select CRYPTO_ECB









	select CRYPTO_AES









	select HW_RANDOM









	depends on PM









	help









	  This option allows you to have support for SL3516 crypto offloader.










































drivers/crypto/gemini/sl3516-ce-cipher.c



+1
−1






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0









/*









 * sl3516-ce-cipher.c - hardware cryptographic offloader for Stormlink SL3516 SoC









 * sl3516-ce-cipher.c - hardware cryptographic offloader for Storlink SL3516 SoC









 *









 * Copyright (C) 2021 Corentin LABBE <clabbe@baylibre.com>









 *
































drivers/crypto/gemini/sl3516-ce-core.c



+1
−1






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0









/*









 * sl3516-ce-core.c - hardware cryptographic offloader for Stormlink SL3516 SoC









 * sl3516-ce-core.c - hardware cryptographic offloader for Storlink SL3516 SoC









 *









 * Copyright (C) 2021 Corentin Labbe <clabbe@baylibre.com>









 *