zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pbkdf2: change FIPS zeroization to use the OPENSSL_PEDANTIC_ZEROIZATION define

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26068)
This commit is contained in:
Pauli 2024-11-27 11:19:32 +11:00 committed by Tomas Mraz
parent db1d8c90d5
commit 8d09e61be6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/implementations/kdfs/pbkdf2.c
View File

@ -93,7 +93,7 @@ static void *kdf_pbkdf2_new(void *provctx)
static void kdf_pbkdf2_cleanup(KDF_PBKDF2 *ctx) static void kdf_pbkdf2_cleanup(KDF_PBKDF2 *ctx)
{ {
ossl_prov_digest_reset(&ctx->digest); ossl_prov_digest_reset(&ctx->digest);
#ifdef FIPS_MODULE #ifdef OPENSSL_PEDANTIC_ZEROIZATION
OPENSSL_clear_free(ctx->salt, ctx->salt_len); OPENSSL_clear_free(ctx->salt, ctx->salt_len);
#else #else
OPENSSL_free(ctx->salt); OPENSSL_free(ctx->salt);