Skip to content

ssl: fix miscellaneous issues found in review. #10972

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
philljj wants to merge 2 commits into
base: master
Choose a base branch
from
+14 −7
Open

ssl: fix miscellaneous issues found in review. #10972

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
b00943c
ssl: fix miscellaneous issues found in review.
philljj Jul 22, 2026
df73fa1
ssl_api_cert: remove dead sk null check.
philljj Jul 24, 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
8 changes: 5 additions & 3 deletions src/ssl_api_cert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2836,6 +2836,11 @@ static WOLF_STACK_OF(WOLFSSL_X509)* CreatePeerCertChain(const WOLFSSL* ssl,
return NULL;

sk = wolfSSL_sk_X509_new_null();
if (sk == NULL) {

@wolfSSL-Fenrir-bot wolfSSL-Fenrir-bot Jul 24, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🔵 [Low] Dead sk == NULL check after new early-return guard · Dead error handling

The PR adds an early return NULL when wolfSSL_sk_X509_new_null() returns NULL (line 2839), making the pre-existing if (sk == NULL) check at line 2870 unreachable — sk is never reassigned after line 2838.

Fix: Remove the dead if (sk == NULL) block at line 2870, or replace it with a WOLFSSL_ASSERT if the invariant is worth documenting.

@philljj philljj Jul 24, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

silly oversight on my part, fixed.

WOLFSSL_MSG("Error Creating sk");
return NULL;
}

for (i = 0; i < ssl->session->chain.count; i++) {
x509 = wolfSSL_X509_new_ex(ssl->heap);
if (x509 == NULL) {
Expand All @@ -2862,9 +2867,6 @@ static WOLF_STACK_OF(WOLFSSL_X509)* CreatePeerCertChain(const WOLFSSL* ssl,
}
}

if (sk == NULL) {
WOLFSSL_MSG("Null session chain");
}
return sk;
}

Expand Down
2 changes: 1 addition & 1 deletion src/ssl_api_pk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2858,7 +2858,7 @@ int wolfSSL_CTX_set_dh_auto(WOLFSSL_CTX* ctx, int onoff)
WOLFSSL_MSG("wc_SrpSetPassword failed.");
return WOLFSSL_FAILURE;
}
XFREE(ctx->srp_password, NULL, DYNAMIC_TYPE_SRP);
XFREE(ctx->srp_password, ctx->heap, DYNAMIC_TYPE_SRP);
ctx->srp_password = NULL;
} else {
/* save password for wolfSSL_set_srp_username */
Expand Down
2 changes: 1 addition & 1 deletion src/ssl_api_rw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ int wolfSSL_recv(WOLFSSL* ssl, void* data, int sz, int flags)
int wolfSSL_SendUserCanceled(WOLFSSL* ssl)
{
int ret = WC_NO_ERR_TRACE(WOLFSSL_FAILURE);
WOLFSSL_ENTER("wolfSSL_recv");
WOLFSSL_ENTER("wolfSSL_SendUserCanceled");

if (ssl != NULL) {
ssl->error = SendAlert(ssl, alert_warning, user_canceled);
Expand Down
5 changes: 3 additions & 2 deletions src/ssl_asn1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5855,7 +5855,7 @@ int wc_OBJ_sn2nid(const char *sn)
static int wolfssl_obj2txt_numeric(char *buf, int bufLen,
const WOLFSSL_ASN1_OBJECT *a)
{
int bufSz;
int bufSz;
int length;
word32 idx = 0;
byte tag;
Expand All @@ -5874,11 +5874,12 @@ int wc_OBJ_sn2nid(const char *sn)
return ASN_PARSE_E;
}

/* save an extra byte for null term. */
if (bufLen < MAX_OID_STRING_SZ) {
bufSz = bufLen - 1;
}
else {
bufSz = MAX_OID_STRING_SZ;
bufSz = MAX_OID_STRING_SZ - 1;
}

if ((bufSz = DecodePolicyOID(buf, (word32)bufSz, a->obj + idx,
Expand Down
4 changes: 4 additions & 0 deletions src/ssl_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4015,6 +4015,8 @@ int wolfSSL_RAND_pseudo_bytes(unsigned char* buf, int num)
hash = WC_SHA;
#elif !defined(NO_MD5)
hash = WC_MD5;
#else
#error "No PRF hash function available"
#endif

/* get secret value from source of entropy */
Expand All @@ -4029,6 +4031,7 @@ int wolfSSL_RAND_pseudo_bytes(unsigned char* buf, int num)
PRIVATE_KEY_LOCK();
ret = (ret == 0) ? WOLFSSL_SUCCESS: WOLFSSL_FAILURE;
}
ForceZero(secret, sizeof(secret));
#else
/* fall back to just doing wolfSSL_RAND_bytes if PRF not avialbale */
ret = wolfSSL_RAND_bytes(buf, num);
Expand Down Expand Up @@ -4202,6 +4205,7 @@ int wolfSSL_RAND_poll(void)
}

wc_UnLockMutex(&globalRNGMutex);
ForceZero(entropy, sizeof(entropy));

return ret;
}
Expand Down
Loading