[openssh-commits] [openssh] 01/04: upstream: Make mlkem768ecdh build with OPENSSL=no. ok djm@

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 52794802d93c4b06d81a5a9a192b78baed6f9efd
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Thu Jul 30 07:29:09 2026 +0000

    upstream: Make mlkem768ecdh build with OPENSSL=no. ok djm@
    
    OpenBSD-Commit-ID: b23fc98b885d72b57d9a2b989f6c062751bff52b
---
 kexgen.c          | 24 ++++++++++++------------
 kexmlkem768ecdh.c |  2 ++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/kexgen.c b/kexgen.c
index b6bd438b5..d1f9d840a 100644
--- a/kexgen.c
+++ b/kexgen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgen.c,v 1.13 2026/07/27 12:28:52 markus Exp $ */
+/* $OpenBSD: kexgen.c,v 1.14 2026/07/30 07:29:09 dtucker Exp $ */
 /*
  * Copyright (c) 2019 Markus Friedl.  All rights reserved.
  *
@@ -113,6 +113,9 @@ kex_gen_client(struct ssh *ssh)
 	case KEX_ECDH_SHA2:
 		r = kex_ecdh_keypair(kex);
 		break;
+	case KEX_KEM_MLKEM768ECDH_SHA256:
+		r = kex_kem_mlkem768ecdh_keypair(kex);
+		break;
 #endif /* WITH_OPENSSL */
 	case KEX_C25519_SHA256:
 		r = kex_c25519_keypair(kex);
@@ -123,9 +126,6 @@ kex_gen_client(struct ssh *ssh)
 	case KEX_KEM_MLKEM768X25519_SHA256:
 		r = kex_kem_mlkem768x25519_keypair(kex);
 		break;
-	case KEX_KEM_MLKEM768ECDH_SHA256:
-		r = kex_kem_mlkem768ecdh_keypair(kex);
-		break;
 	default:
 		r = SSH_ERR_INVALID_ARGUMENT;
 		break;
@@ -190,6 +190,10 @@ input_kex_gen_reply(int type, uint32_t seq, struct ssh *ssh)
 	case KEX_ECDH_SHA2:
 		r = kex_ecdh_dec(kex, server_blob, &shared_secret);
 		break;
+	case KEX_KEM_MLKEM768ECDH_SHA256:
+		r = kex_kem_mlkem768ecdh_dec(kex, server_blob,
+		    &shared_secret);
+		break;
 #endif /* WITH_OPENSSL */
 	case KEX_C25519_SHA256:
 		r = kex_c25519_dec(kex, server_blob, &shared_secret);
@@ -202,10 +206,6 @@ input_kex_gen_reply(int type, uint32_t seq, struct ssh *ssh)
 		r = kex_kem_mlkem768x25519_dec(kex, server_blob,
 		    &shared_secret);
 		break;
-	case KEX_KEM_MLKEM768ECDH_SHA256:
-		r = kex_kem_mlkem768ecdh_dec(kex, server_blob,
-		    &shared_secret);
-		break;
 	default:
 		r = SSH_ERR_INVALID_ARGUMENT;
 		break;
@@ -317,6 +317,10 @@ input_kex_gen_init(int type, uint32_t seq, struct ssh *ssh)
 		r = kex_ecdh_enc(kex, client_pubkey, &server_pubkey,
 		    &shared_secret);
 		break;
+	case KEX_KEM_MLKEM768ECDH_SHA256:
+		r = kex_kem_mlkem768ecdh_enc(kex, client_pubkey,
+		    &server_pubkey, &shared_secret);
+		break;
 #endif /* WITH_OPENSSL */
 	case KEX_C25519_SHA256:
 		r = kex_c25519_enc(kex, client_pubkey, &server_pubkey,
@@ -330,10 +334,6 @@ input_kex_gen_init(int type, uint32_t seq, struct ssh *ssh)
 		r = kex_kem_mlkem768x25519_enc(kex, client_pubkey,
 		    &server_pubkey, &shared_secret);
 		break;
-	case KEX_KEM_MLKEM768ECDH_SHA256:
-		r = kex_kem_mlkem768ecdh_enc(kex, client_pubkey,
-		    &server_pubkey, &shared_secret);
-		break;
 	default:
 		r = SSH_ERR_INVALID_ARGUMENT;
 		break;
diff --git a/kexmlkem768ecdh.c b/kexmlkem768ecdh.c
index 94c2aeae4..4a02e6927 100644
--- a/kexmlkem768ecdh.c
+++ b/kexmlkem768ecdh.c
@@ -38,6 +38,7 @@
 #include "digest.h"
 #include "ssherr.h"
 
+#ifdef WITH_OPENSSL
 int
 kex_kem_mlkem768ecdh_keypair(struct kex *kex)
 {
@@ -301,3 +302,4 @@ kex_kem_mlkem768ecdh_dec(struct kex *kex,
 	sshbuf_free(buf);
 	return r;
 }
+#endif	/* WITH_OPENSSL */

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.