Skip to content

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

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

Open
lealem47 wants to merge 2 commits into
base: master
Choose a base branch
from
+21 −1
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9830c74
evp: pass a zero salt length when EVP_BytesToKey has no salt
lealem47 Nov 11, 2026
f85b6be
Add zero salt test case for EVP_BytesToKey
lealem47 Nov 12, 2026
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
16 changes: 16 additions & 0 deletions tests/api/test_evp_cipher.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,14 @@ int test_wolfSSL_EVP_BytesToKey(void)
0x48,0x65,0x6c,0x6c,0x6f,0x20,0x57,0x6f,
0x72,0x6c,0x64
};
const byte expKeyNoSalt[AES_BLOCK_SIZE] = {
0x18,0x5f,0x8d,0xb3,0x22,0x71,0xfe,0x25,
0xf5,0x61,0xa6,0xfc,0x93,0x8b,0x2e,0x26
};
const byte expIvNoSalt[AES_BLOCK_SIZE] = {
0x43,0x06,0xec,0x30,0x4e,0xda,0x51,0x80,
0x07,0xd1,0x76,0x48,0x26,0x38,0x19,0x69
};

type = wolfSSL_EVP_get_cipherbynid(NID_aes_128_cbc);

Expand All @@ -711,6 +719,14 @@ int test_wolfSSL_EVP_BytesToKey(void)
md = EVP_sha256();
ExpectIntEQ(EVP_BytesToKey(type, md, salt, data, sz, count, key, iv),
16);

/* NULL salt: key || IV is SHA-256("Hello") */
XMEMSET(key, 0, sizeof(key));
XMEMSET(iv, 0, sizeof(iv));
ExpectIntEQ(EVP_BytesToKey(type, md, NULL, data, sz, count, key, iv),
16);
ExpectBufEQ(key, expKeyNoSalt, sizeof(expKeyNoSalt));
ExpectBufEQ(iv, expIvNoSalt, sizeof(expIvNoSalt));
#endif
return EXPECT_RESULT();
}
Expand Down
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