tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 3b220413 a12deb44

+26 -3
+25 -3
crypto/Kconfig
··· 1297 1297 1298 1298 See https://www.chronox.de/jent.html 1299 1299 1300 + if CRYPTO_JITTERENTROPY 1301 + if CRYPTO_FIPS && EXPERT 1302 + 1300 1303 choice 1301 1304 prompt "CPU Jitter RNG Memory Size" 1302 1305 default CRYPTO_JITTERENTROPY_MEMSIZE_2 1303 - depends on CRYPTO_JITTERENTROPY 1304 1306 help 1305 1307 The Jitter RNG measures the execution time of memory accesses. 1306 1308 Multiple consecutive memory accesses are performed. If the memory ··· 1346 1344 int "CPU Jitter RNG Oversampling Rate" 1347 1345 range 1 15 1348 1346 default 1 1349 - depends on CRYPTO_JITTERENTROPY 1350 1347 help 1351 1348 The Jitter RNG allows the specification of an oversampling rate (OSR). 1352 1349 The Jitter RNG operation requires a fixed amount of timing ··· 1360 1359 1361 1360 config CRYPTO_JITTERENTROPY_TESTINTERFACE 1362 1361 bool "CPU Jitter RNG Test Interface" 1363 - depends on CRYPTO_JITTERENTROPY 1364 1362 help 1365 1363 The test interface allows a privileged process to capture 1366 1364 the raw unconditioned high resolution time stamp noise that ··· 1376 1376 the first 1000 entropy events since boot can be sampled. 1377 1377 1378 1378 If unsure, select N. 1379 + 1380 + endif # if CRYPTO_FIPS && EXPERT 1381 + 1382 + if !(CRYPTO_FIPS && EXPERT) 1383 + 1384 + config CRYPTO_JITTERENTROPY_MEMORY_BLOCKS 1385 + int 1386 + default 64 1387 + 1388 + config CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE 1389 + int 1390 + default 32 1391 + 1392 + config CRYPTO_JITTERENTROPY_OSR 1393 + int 1394 + default 1 1395 + 1396 + config CRYPTO_JITTERENTROPY_TESTINTERFACE 1397 + bool 1398 + 1399 + endif # if !(CRYPTO_FIPS && EXPERT) 1400 + endif # if CRYPTO_JITTERENTROPY 1379 1401 1380 1402 config CRYPTO_KDF800108_CTR 1381 1403 tristate
+1
crypto/ahash.c
··· 651 651 err = PTR_ERR(shash); 652 652 goto out_free_nhash; 653 653 } 654 + nhash->using_shash = true; 654 655 *nctx = shash; 655 656 return nhash; 656 657 }