Skip to content

evp: pass a zero salt length when EVP_BytesToKey has no salt #12102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lealem47 wants to merge 1 commit into from
Closed

evp: pass a zero salt length when EVP_BytesToKey has no salt #12102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion wolfcrypt/src/evp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7157,6 +7157,7 @@ void wolfSSL_EVP_init(void)
{
int ret;
int hashType = WC_HASH_TYPE_NONE;
int saltSz = 0;
WC_DECLARE_VAR(info, EncryptedInfo, 1, 0);

#ifdef WOLFSSL_SMALL_STACK
Expand Down Expand Up @@ -7187,8 +7188,11 @@ void wolfSSL_EVP_init(void)
if (count <= 0)
count = 1;

if (salt != NULL)
saltSz = EVP_SALT_SIZE;

ret = wc_PBKDF1_ex(key, (int)info->keySz, iv, (int)info->ivSz, data, sz,
salt, EVP_SALT_SIZE, count, hashType, NULL);
salt, saltSz, count, hashType, NULL);
if (ret == 0)
ret = (int)info->keySz;

Expand Down
Loading