Commit 71432033 authored Jan 11, 2026 by Linus Torvalds

Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux

Pull crypto library fixes from Eric Biggers:

 - A couple more fixes for the lib/crypto KUnit tests

 - Fix missing MMU protection for the AES S-box

* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  lib/crypto: aes: Fix missing MMU protection for AES S-box
  MAINTAINERS: add test vector generation scripts to "CRYPTO LIBRARY"
  lib/crypto: tests: Fix syntax error for old python versions
  lib/crypto: tests: polyval_kunit: Increase iterations for preparekey in IRQs

parents 9c7ef209 74d74bb7

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -6708,6 +6708,7 @@ S: Maintained
		T: git https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-next
		T: git https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes
		F: lib/crypto/
		F: scripts/crypto/

		CRYPTO SPEED TEST COMPARE
		M: Wang Jinchao <wangjinchao@xfusion.com>

lib/crypto/aes.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		* Emit the sbox as volatile const to prevent the compiler from doing
		* constant folding on sbox references involving fixed indexes.
		*/
		static volatile const u8 __cacheline_aligned aes_sbox[] = {
		static volatile const u8 ____cacheline_aligned aes_sbox[] = {
		0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
		0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
		0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
		@@ -48,7 +48,7 @@ static volatile const u8 __cacheline_aligned aes_sbox[] = {
		0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16,
		};

		static volatile const u8 __cacheline_aligned aes_inv_sbox[] = {
		static volatile const u8 ____cacheline_aligned aes_inv_sbox[] = {
		0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38,
		0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
		0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,

lib/crypto/tests/polyval_kunit.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,7 @@ static void test_polyval_preparekey_in_irqs(struct kunit *test)

		rand_bytes(state.raw_key, sizeof(state.raw_key));
		polyval_preparekey(&state.expected_key, state.raw_key);
		kunit_run_irq_test(test, polyval_irq_test_func, 20000, &state);
		kunit_run_irq_test(test, polyval_irq_test_func, 200000, &state);
		}

		static int polyval_suite_init(struct kunit_suite *suite)

scripts/crypto/gen-hash-testvecs.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ def print_c_struct_u8_array_field(name, value):
		def alg_digest_size_const(alg):
		if alg.startswith('blake2'):
		return f'{alg.upper()}_HASH_SIZE'
		return f'{alg.upper().replace('-', '_')}_DIGEST_SIZE'
		return f"{alg.upper().replace('-', '_')}_DIGEST_SIZE"

		def gen_unkeyed_testvecs(alg):
		print('')