Skip to content

Commit 9a7e417

Browse files
jallisonciqPlaidCat
authored andcommitted
Revert "Revert: crypto: DRBG - switch to HMAC SHA512 DRBG as default DRBG"
JIRA: INTERNAL Revert Author <[email protected]> Revert Commit fd8a0de. Revert Reason: This changes the default DRBG back to HMAC SHA512 to keep entropy certifications for all Rocky9.6 FIPS modules. Approved by the lab. Keeping hmac(sha512) allows the entropy certificates used for Rocky 9.2 FIPS to be re-used in 9.6, preventing re-certification of all the kernel and userspace modules. NB. We still get the scalability speedup from the per-CPU DRBG changes. Signed-off-by: Jeremy Allison <[email protected]> Signed-off-by: Jonathan Maple <[email protected]>
1 parent 31a5581 commit 9a7e417

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

crypto/drbg.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,18 +176,18 @@ static const struct drbg_core drbg_cores[] = {
176176
.blocklen_bytes = 48,
177177
.cra_name = "hmac_sha384",
178178
.backend_cra_name = "hmac(sha384)",
179-
}, {
180-
.flags = DRBG_HMAC | DRBG_STRENGTH256,
181-
.statelen = 64, /* block length of cipher */
182-
.blocklen_bytes = 64,
183-
.cra_name = "hmac_sha512",
184-
.backend_cra_name = "hmac(sha512)",
185179
}, {
186180
.flags = DRBG_HMAC | DRBG_STRENGTH256,
187181
.statelen = 32, /* block length of cipher */
188182
.blocklen_bytes = 32,
189183
.cra_name = "hmac_sha256",
190184
.backend_cra_name = "hmac(sha256)",
185+
}, {
186+
.flags = DRBG_HMAC | DRBG_STRENGTH256,
187+
.statelen = 64, /* block length of cipher */
188+
.blocklen_bytes = 64,
189+
.cra_name = "hmac_sha512",
190+
.backend_cra_name = "hmac(sha512)",
191191
},
192192
#endif /* CONFIG_CRYPTO_DRBG_HMAC */
193193
};

0 commit comments

Comments
 (0)