From 9cbb3b0bd2905a5b973878793f4925875faa798c Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Sun, 14 Jun 2026 04:16:19 +0000
Subject: [PATCH] make crypto_sign_ed25519_keypair_from_seed non-static. The
 new ML-DSA/ed25519 code needs it

---
 usr.bin/ssh/ed25519.c  | 4 ++--
 usr.bin/ssh/ed25519.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr.bin/ssh/ed25519.c b/usr.bin/ssh/ed25519.c
index b524a7562b7..ae98cb975ac 100644
--- a/usr.bin/ssh/ed25519.c
+++ b/usr.bin/ssh/ed25519.c
@@ -1,4 +1,4 @@
-/*  $OpenBSD: ed25519.c,v 1.7 2026/06/07 08:50:17 dtucker Exp $ */
+/*  $OpenBSD: ed25519.c,v 1.8 2026/06/14 04:16:19 djm Exp $ */
 
 /*
  * Public Domain, Authors:
@@ -1908,7 +1908,7 @@ static void ge25519_scalarmult_base(ge25519_p3 *r, const sc25519 *s)
 }
 /* from supercop-20221122/crypto_sign/ed25519/ref/keypair.c */
 
-static int crypto_sign_ed25519_keypair_from_seed(unsigned char *pk,unsigned char *sk, const unsigned char *seed)
+int crypto_sign_ed25519_keypair_from_seed(unsigned char *pk,unsigned char *sk, const unsigned char *seed)
 {
   unsigned char az[64];
   sc25519 scsk;
diff --git a/usr.bin/ssh/ed25519.sh b/usr.bin/ssh/ed25519.sh
index 5846cb6e7ab..987f61d80c9 100644
--- a/usr.bin/ssh/ed25519.sh
+++ b/usr.bin/ssh/ed25519.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#       $OpenBSD: ed25519.sh,v 1.5 2026/06/07 08:50:17 dtucker Exp $
+#       $OpenBSD: ed25519.sh,v 1.6 2026/06/14 04:16:19 djm Exp $
 #       Placed in the Public Domain.
 #
 AUTHOR="supercop-20221122/crypto_sign/ed25519/ref/implementors"
@@ -101,7 +101,7 @@ _EOF
 	*/crypto_sign/ed25519/ref/keypair.c)
 	    # provide an explicit-seed key generation function and rename
 	    # it to the name OpenSSH expects
-	    sed -e "s/int crypto_sign_keypair(unsigned char \*pk,unsigned char \*sk)/static int crypto_sign_ed25519_keypair_from_seed(unsigned char *pk,unsigned char *sk, const unsigned char *seed)/g" \
+	    sed -e "s/int crypto_sign_keypair(unsigned char \*pk,unsigned char \*sk)/int crypto_sign_ed25519_keypair_from_seed(unsigned char *pk,unsigned char *sk, const unsigned char *seed)/g" \
 	        -e "s/randombytes(sk,32);/memcpy(sk, seed, 32);/g"
 	    ;;
 	*/crypto_sign/ed25519/ref/open.c)