Skip to content

KEX Fix #889

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

KEX Fix #889

Show file tree
Hide file tree
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
12 changes: 2 additions & 10 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2468,8 +2468,7 @@ int GenerateKey(byte hashId, byte keyId,
byte doKeyPad)
#if defined(WOLFSSL_WOLFSSH) \
&& (LIBWOLFSSL_VERSION_HEX >= WOLFSSL_V5_0_0) \
&& ((defined(HAVE_FIPS) && FIPS_VERSION_GE(5,2)) \
|| defined(WOLFSSH_NO_NISTP256_MLKEM768_SHA256))
&& (defined(HAVE_FIPS) && FIPS_VERSION_GE(5,2))
/* Cannot use the SSH KDF with ML-KEM. With ML-KEM, doKeyPad must be false,
* and the FIPS SSH KDF doesn't handle no-padding. Also, the ML-KEM algorithm
* isn't in our FIPS boundary. */
Expand Down Expand Up @@ -13173,14 +13172,7 @@ int SendKexDhInit(WOLFSSH* ssh)


if (ret == WS_SUCCESS) {
if (!ssh->handshake->useEcc
#ifndef WOLFSSH_NO_NISTP256_MLKEM768_SHA256
&& !ssh->handshake->useEccMlKem
#endif
#ifndef WOLFSSH_NO_CURVE25519_SHA256
&& !ssh->handshake->useCurve25519
#endif
) {
if (ssh->handshake->useDh) {
#ifndef WOLFSSH_NO_DH
DhKey* privKey = &ssh->handshake->privKey.dh;

Expand Down
4 changes: 4 additions & 0 deletions tests/kex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,10 @@ int wolfSSH_KexTest(int argc, char** argv)
AssertIntEQ(wolfSSH_KexTest_Connect("mlkem768x25519-sha256"),
EXIT_SUCCESS);
#endif
#if !defined(WOLFSSH_NO_NISTP256_MLKEM768_SHA256)
AssertIntEQ(wolfSSH_KexTest_Connect("mlkem768nistp256-sha256"),
EXIT_SUCCESS);
#endif
#if !defined(WOLFSSH_NO_NISTP384_MLKEM1024_SHA384)
AssertIntEQ(wolfSSH_KexTest_Connect("mlkem1024nistp384-sha384"),
EXIT_SUCCESS);
Expand Down