From: Tomas Mraz <tomas@openssl.org>
Date: Mon, 20 Jan 2025 07:53:21 +0000 (+0100)
Subject: kdf_scrypt_reset(): NULLify freed pointers
X-Git-Tag: openssl-3.2.4~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f49e56066a7300cf7323a36f7bbb75e7038f1841;p=thirdparty%2Fopenssl.git

kdf_scrypt_reset(): NULLify freed pointers

Otherwise doublefree happens with further usage.

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/26488)

(cherry picked from commit 901b108154fd8d28516b9b4bebde93ac5bc2a224)
---

diff --git a/providers/implementations/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c
index a6f8ca03ee4..73faea9d183 100644
--- a/providers/implementations/kdfs/scrypt.c
+++ b/providers/implementations/kdfs/scrypt.c
@@ -92,7 +92,9 @@ static void kdf_scrypt_reset(void *vctx)
     KDF_SCRYPT *ctx = (KDF_SCRYPT *)vctx;
 
     OPENSSL_free(ctx->salt);
+    ctx->salt = NULL;
     OPENSSL_clear_free(ctx->pass, ctx->pass_len);
+    ctx->pass = NULL;
     kdf_scrypt_init(ctx);
 }