Skip to content

Fix incorrect alerts. #9588

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

Merged
SparkiDev merged 3 commits into from
Jan 6, 2026
Merged

Fix incorrect alerts. #9588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7b83b0
Alert on out of order message with unexpected_message.
kareem-wolfssl Dec 26, 2025
6145f3a
Fix incorrect alert being sent when wolfSSL receives unexpected PSK e…
kareem-wolfssl Dec 26, 2025
7d04a53
Update X509_get_default_cert_* stubs to return empty strings.
kareem-wolfssl Dec 26, 2025
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
2 changes: 2 additions & 0 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35262,6 +35262,8 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
return wolfssl_alert_protocol_version;
case WC_NO_ERR_TRACE(BAD_CERTIFICATE_STATUS_ERROR):
return bad_certificate_status_response;
case WC_NO_ERR_TRACE(OUT_OF_ORDER_E):
return unexpected_message;
default:
return invalid_alert;
}
Expand Down
2 changes: 1 addition & 1 deletion src/tls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11607,7 +11607,7 @@ static int TLSX_PreSharedKey_Parse(WOLFSSL* ssl, const byte* input,
/* Find the list of identities sent to server. */
extension = TLSX_Find(ssl->extensions, TLSX_PRE_SHARED_KEY);
if (extension == NULL)
return PSK_KEY_ERROR;
return INCOMPLETE_DATA;
list = (PreSharedKey*)extension->data;

/* Mark the identity as chosen. */
Expand Down
8 changes: 4 additions & 4 deletions src/x509.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3448,25 +3448,25 @@ int wolfSSL_X509_pubkey_digest(const WOLFSSL_X509 *x509,
const char* wolfSSL_X509_get_default_cert_file_env(void)
{
WOLFSSL_STUB("X509_get_default_cert_file_env");
return NULL;
return "";
}

const char* wolfSSL_X509_get_default_cert_file(void)
{
WOLFSSL_STUB("X509_get_default_cert_file");
return NULL;
return "";
}

const char* wolfSSL_X509_get_default_cert_dir_env(void)
{
WOLFSSL_STUB("X509_get_default_cert_dir_env");
return NULL;
return "";
}

const char* wolfSSL_X509_get_default_cert_dir(void)
{
WOLFSSL_STUB("X509_get_default_cert_dir");
return NULL;
return "";
}
#endif

Expand Down
8 changes: 4 additions & 4 deletions tests/api/test_ossl_x509.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,10 +528,10 @@ int test_wolfSSL_X509(void)
ExpectIntEQ(X509_verify_cert(ctx), SSL_SUCCESS);

#ifndef NO_WOLFSSL_STUB
ExpectNull(X509_get_default_cert_file_env());
ExpectNull(X509_get_default_cert_file());
ExpectNull(X509_get_default_cert_dir_env());
ExpectNull(X509_get_default_cert_dir());
ExpectStrEQ(X509_get_default_cert_file_env(), "");
ExpectStrEQ(X509_get_default_cert_file(), "");
ExpectStrEQ(X509_get_default_cert_dir_env(), "");
ExpectStrEQ(X509_get_default_cert_dir(), "");
#endif

ExpectNull(wolfSSL_X509_get_der(NULL, NULL));
Expand Down