Skip to content

Commit 7209523

Browse files
rheniummatzbot
authored andcommitted
[ruby/openssl] kdf: fix wrong OPENSSL_cleanse() calls
Embarrassingly, the previous commits introduced OPENSSL_cleanse() calls against the temporary struct instead of the buffer content. Thanks to nagachika for noticing. ruby/openssl@8eca3efad4
1 parent a5c9e84 commit 7209523

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/openssl/ossl_kdf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ kdf_pbkdf2_hmac(int argc, VALUE *argv, VALUE self)
9292
memcpy(args.salt, RSTRING_PTR(salt), saltlen);
9393
if (!rb_thread_call_without_gvl(pbkdf2_hmac_nogvl, &args, NULL, NULL))
9494
ossl_raise(eKDF, "PKCS5_PBKDF2_HMAC");
95-
OPENSSL_cleanse(&args.pass, passlen);
95+
OPENSSL_cleanse(args.pass, passlen);
9696
ALLOCV_END(pass_tmp);
9797
ALLOCV_END(salt_tmp);
9898
return str;
@@ -200,7 +200,7 @@ kdf_scrypt(int argc, VALUE *argv, VALUE self)
200200
memcpy(args.salt, RSTRING_PTR(salt), saltlen);
201201
if (!rb_thread_call_without_gvl(scrypt_nogvl, &args, NULL, NULL))
202202
ossl_raise(eKDF, "EVP_PBE_scrypt");
203-
OPENSSL_cleanse(&args.pass, passlen);
203+
OPENSSL_cleanse(args.pass, passlen);
204204
ALLOCV_END(pass_tmp);
205205
ALLOCV_END(salt_tmp);
206206
return str;

0 commit comments

Comments
 (0)