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 3 commits into
base: main
Choose a base branch
from
Open

Fix/hkdf null salt openssl3 #76

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
610caf8
fix: pass empty string instead of nullptr for HKDF salt in exchange t…
seanjin99 Mar 6, 2026
4875870
Update exchange.cpp
seanjin99 Mar 11, 2026
4fb084e
Merge branch 'main' into fix/hkdf-null-salt-openssl3
riwoh Apr 13, 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
12 changes: 6 additions & 6 deletions test/main/cpp/exchange.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2020 Comcast Cable Communications Management, LLC
* Copyright 2020-2026 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down 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) {
Comment thread
riwoh marked this conversation as resolved.
Comment on lines +396 to 401
Copy link

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR description says descriptive comments were added to all remaining #if/#else/#endif blocks, but in this file there are still preprocessor blocks without explanatory comments (e.g., the #if OPENSSL_VERSION_NUMBER >= 0x30000000 around EVP_PKEY_CTX_add1_hkdf_info later in hkdf()). Either update the PR description to match the actual change set, or add the missing comments for consistency.

Copilot uses AI. Check for mistakes.
Copy link

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use_salt ? 4 : 0 hard-codes the length of the string literal "salt". To avoid accidental mismatches if the literal changes (and to mirror common practice elsewhere), prefer deriving the length from the literal (e.g., sizeof("salt") - 1) or a named constant.

Suggested change
use_salt ? 4 : 0) <= 0) {
use_salt ? sizeof("salt") - 1 : 0) <= 0) {

Copilot uses AI. Check for mistakes.
#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
Loading