Skip to content

Fix/hkdf null salt openssl3 #76

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
seanjin99 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix/hkdf null salt openssl3 #76

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
10 changes: 5 additions & 5 deletions test/main/cpp/exchange.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,12 +393,12 @@ static Sec_Result hkdf(SEC_BYTE* key, SEC_SIZE key_len, SEC_BYTE* out, const SEC
return SEC_RESULT_FAILURE;
}

#if OPENSSL_VERSION_NUMBER >= 0x30000000
if (EVP_PKEY_CTX_set1_hkdf_salt(pctx, reinterpret_cast<const unsigned char*>(use_salt ? "salt" : nullptr),
// OpenSSL 3.x OSSL_PARAM_construct_octet_string() rejects NULL data pointer
// even when length is 0, causing EVP_PKEY_CTX_set1_hkdf_salt() to fail.
// Pass "" instead of nullptr to satisfy the non-NULL check.
if (EVP_PKEY_CTX_set1_hkdf_salt(pctx,
reinterpret_cast<const unsigned char*>(use_salt ? "salt" : ""),
use_salt ? 4 : 0) <= 0) {
#else
if (EVP_PKEY_CTX_set1_hkdf_salt(pctx, use_salt ? "salt" : nullptr, use_salt ? 4 : 0) <= 0) {
#endif
EVP_PKEY_CTX_free(pctx);
return SEC_RESULT_FAILURE;
}
Expand Down