github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

crypto: drbg - Rename MAX_ADDTL => MAX_ADDTL_BYTES

Browse Source 
Give this constant a name which is clearer and consistent with
DRBG_MAX_REQUEST_BYTES.  No functional change.

Suggested-by: Joachim Vandersmissen <joachim@jvdsn.com>
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Eric Biggers 2026-05-05 17:02:17 -07:00 committed by Herbert Xu
parent 81d7e2979e
commit 97b376ac3c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/drbg.c
View File

@ -122,7 +122,7 @@
* so that the value never quite completely fills the range of a size_t,
* allowing the health check to verify that larger values are rejected.
*/
#define DRBG_MAX_ADDTL (U32_MAX - 1)
#define DRBG_MAX_ADDTL_BYTES (U32_MAX - 1)
struct drbg_state {
struct mutex drbg_mutex; /* lock around DRBG */
@ -237,7 +237,7 @@ static int drbg_seed(struct drbg_state *drbg, const u8 *pers, size_t pers_len,
const u8 *entropy;
/* 9.1 / 9.2 / 9.3.1 step 3 */
if (pers_len > DRBG_MAX_ADDTL) {
if (pers_len > DRBG_MAX_ADDTL_BYTES) {
pr_devel("DRBG: personalization string too long %zu\n",
pers_len);
return -EINVAL;
@ -355,7 +355,7 @@ static int drbg_generate(struct drbg_state *drbg, u8 *out, size_t outlen,
/* 9.3.1 step 3 is implicit with the chosen DRBG */
/* 9.3.1 step 4 */
if (addtl_len > DRBG_MAX_ADDTL) {
if (addtl_len > DRBG_MAX_ADDTL_BYTES) {
pr_devel("DRBG: additional information string too long %zu\n",
addtl_len);
return -EINVAL;
@ -570,14 +570,15 @@ static inline int __init drbg_healthcheck_sanity(void)
*/
/* overflow addtllen with additional info string */
ret = drbg_generate(drbg, buf, OUTBUFLEN, buf, DRBG_MAX_ADDTL + 1);
ret = drbg_generate(drbg, buf, OUTBUFLEN, buf,
DRBG_MAX_ADDTL_BYTES + 1);
BUG_ON(ret == 0);
/* overflow max_bits */
ret = drbg_generate(drbg, buf, DRBG_MAX_REQUEST_BYTES + 1, NULL, 0);
BUG_ON(ret == 0);
/* overflow max addtllen with personalization string */
ret = drbg_seed(drbg, buf, DRBG_MAX_ADDTL + 1, false);
ret = drbg_seed(drbg, buf, DRBG_MAX_ADDTL_BYTES + 1, false);
BUG_ON(ret == 0);
/* all tests passed */