Piecuu/linux-samsung-r9q2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This push fixes a regression in ahash and hides the Kconfig sub-options for the jitter RNG.

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEn51F/lCuNhUwmDeSxycdCkmxi6cFAmVJ+X0ACgkQxycdCkmx
 i6d26w/+LqMXxGgO7tLfnNtcaz3Xz3pNwMC0psIdfkL2ZxY44qX/kxWuURasjQqT
 AYB4jTG/cRMtXTw3ayFxtNZ1CFCNNNUKxWmzSvv398m5SmqJTG4IHmi3td0vlpUn
 i4AHNbRM8spINlIE/R4j/Bv9fsUHTvuRGHOclRtNMH8+Hk2CySNGeENeUheWxQDN
 /+r1Jiq+AkyX1e1lmzBhR6PnHx6rPIWVB2nVIMAZAzoDrNVy+o2hQ4Oln00Sceip
 TJ74cQoA9/tFPqYONEG37oc/22jKYHN7nUnO6H5E7pi8qRXunsxH5rX5A412VAI0
 KbDnRqXWPVuaGcq3WdaE/9L9All3Hy2bpzT0J/khVSZ3oFl4aarf50mbD2pQNjqW
 D1aDrPhFwlT0dXGzz3oNX1y1exSfRvku3kQxwO2ejRG2L+FRoGHCXnl7LkMWvNQZ
 bsZruPReGZqtKk0CxTT7Asxi3SEWBe2GiFc3ZqDrvsBVrwb10FyzT8zHfMVDqn2r
 foRPOBl4muhMwWUd3LxMxluV/wsx0LwW6++KRzzAewoBRI/x8G37epBQIzO23slf
 q69i7Fo0W3dIH2+9vIqSrBkKXbjqlO/3oTH3n/FnstyNJT26S+5zqRHNLF13zEw5
 OrpwsZynWaKNivwZRnLzrTZGGsXJSiMF4VbXb8lwWaTWJtiADMU=
 =ZfkT
 -----END PGP SIGNATURE-----

Merge tag 'v6.7-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a regression in ahash and hides the Kconfig sub-options for
  the jitter RNG"

* tag 'v6.7-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ahash - Set using_shash for cloned ahash wrapper over shash
  crypto: jitterentropy - Hide esoteric Kconfig options under FIPS and EXPERT
This commit is contained in:
Linus Torvalds 2023-11-09 17:04:58 -08:00
commit 3b22041343
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crypto/Kconfig
View file

@ -1297,10 +1297,12 @@ config CRYPTO_JITTERENTROPY
See https://www.chronox.de/jent.html See https://www.chronox.de/jent.html
if CRYPTO_JITTERENTROPY
if CRYPTO_FIPS && EXPERT
choice choice
prompt "CPU Jitter RNG Memory Size" prompt "CPU Jitter RNG Memory Size"
default CRYPTO_JITTERENTROPY_MEMSIZE_2 default CRYPTO_JITTERENTROPY_MEMSIZE_2
depends on CRYPTO_JITTERENTROPY
help help
The Jitter RNG measures the execution time of memory accesses. The Jitter RNG measures the execution time of memory accesses.
Multiple consecutive memory accesses are performed. If the memory Multiple consecutive memory accesses are performed. If the memory
@ -1344,7 +1346,6 @@ config CRYPTO_JITTERENTROPY_OSR
int "CPU Jitter RNG Oversampling Rate" int "CPU Jitter RNG Oversampling Rate"
range 1 15 range 1 15
default 1 default 1
depends on CRYPTO_JITTERENTROPY
help help
The Jitter RNG allows the specification of an oversampling rate (OSR). The Jitter RNG allows the specification of an oversampling rate (OSR).
The Jitter RNG operation requires a fixed amount of timing The Jitter RNG operation requires a fixed amount of timing
@ -1359,7 +1360,6 @@ config CRYPTO_JITTERENTROPY_OSR
config CRYPTO_JITTERENTROPY_TESTINTERFACE config CRYPTO_JITTERENTROPY_TESTINTERFACE
bool "CPU Jitter RNG Test Interface" bool "CPU Jitter RNG Test Interface"
depends on CRYPTO_JITTERENTROPY
help help
The test interface allows a privileged process to capture The test interface allows a privileged process to capture
the raw unconditioned high resolution time stamp noise that the raw unconditioned high resolution time stamp noise that
@ -1377,6 +1377,28 @@ config CRYPTO_JITTERENTROPY_TESTINTERFACE
If unsure, select N. If unsure, select N.
endif # if CRYPTO_FIPS && EXPERT
if !(CRYPTO_FIPS && EXPERT)
config CRYPTO_JITTERENTROPY_MEMORY_BLOCKS
int
default 64
config CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE
int
default 32
config CRYPTO_JITTERENTROPY_OSR
int
default 1
config CRYPTO_JITTERENTROPY_TESTINTERFACE
bool
endif # if !(CRYPTO_FIPS && EXPERT)
endif # if CRYPTO_JITTERENTROPY
config CRYPTO_KDF800108_CTR config CRYPTO_KDF800108_CTR
tristate tristate
select CRYPTO_HMAC select CRYPTO_HMAC

1
crypto/ahash.c
View file

@ -651,6 +651,7 @@ struct crypto_ahash *crypto_clone_ahash(struct crypto_ahash *hash)
err = PTR_ERR(shash); err = PTR_ERR(shash);
goto out_free_nhash; goto out_free_nhash;
} }
nhash->using_shash = true;
*nctx = shash; *nctx = shash;
return nhash; return nhash;
} }