Skip to content

Always reinitialize the SSL cipher suites in InitSSL_Side as the side and enabled algos have likely changed. #9685

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
dgarske merged 5 commits into from
Jan 23, 2026
Merged

Always reinitialize the SSL cipher suites in InitSSL_Side as the side and enabled algos have likely changed. #9685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89931bd
Always reinitialize the SSL cipher suites in InitSSL_Side as the side…
kareem-wolfssl Jan 20, 2026
d505c0b
Only reinitialize suites in InitSSL_Side if they were not set by the …
kareem-wolfssl Jan 20, 2026
0f0163d
Merge branch 'master' of https://github.com/wolfSSL/wolfssl into gh7735
kareem-wolfssl Jan 20, 2026
baedba6
Force client haveDH to true in wolfSSL_set_options. haveDH won't be …
kareem-wolfssl Jan 22, 2026
4c0c51f
Merge branch 'master' of https://github.com/wolfSSL/wolfssl into gh7735
kareem-wolfssl Jan 22, 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
10 changes: 10 additions & 0 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2253,6 +2253,16 @@ int InitSSL_Side(WOLFSSL* ssl, word16 side)
}
#endif /* WOLFSSL_DTLS && !NO_WOLFSSL_SERVER */

/* Forcefully reinitialize suites here as the side may have changed,
* unless the user has explicitly set cipher suites.
* Two separate checks to ensure suites are always allocated, to avoid
* failing suites == NULL check in InitSSL_Suites. */
if (ssl->suites && !ssl->suites->setSuites) {
FreeSuites(ssl);
}
if (!ssl->suites) {
AllocateSuites(ssl);
}
return InitSSL_Suites(ssl);
}
#endif /* OPENSSL_EXTRA || WOLFSSL_EITHER_SIDE ||
Expand Down
10 changes: 9 additions & 1 deletion src/ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17128,7 +17128,15 @@ long wolfSSL_set_options(WOLFSSL* ssl, long op)
if (AllocateSuites(ssl) != 0)
return 0;
if (!ssl->suites->setSuites) {
InitSuites(ssl->suites, ssl->version, keySz, haveRSA,
/* Client side won't set DH params, so it needs haveDH set to TRUE. */
if (ssl->options.side == WOLFSSL_CLIENT_END)
InitSuites(ssl->suites, ssl->version, keySz, haveRSA,
havePSK, TRUE, ssl->options.haveECDSAsig,
ssl->options.haveECC, TRUE, ssl->options.haveStaticECC,
ssl->options.useAnon,
TRUE, TRUE, TRUE, TRUE, ssl->options.side);
else
InitSuites(ssl->suites, ssl->version, keySz, haveRSA,
havePSK, ssl->options.haveDH, ssl->options.haveECDSAsig,
ssl->options.haveECC, TRUE, ssl->options.haveStaticECC,
ssl->options.useAnon,
Expand Down
Loading