[openssh-commits] [openssh] 02/02: upstream: Make crypto_sign_ed25519_keypair_from_seed()

[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 5af8f3f290bd892352eb007866c066b7bf4a4385
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Sun Jun 7 08:50:17 2026 +0000

    upstream: Make crypto_sign_ed25519_keypair_from_seed()
    
    static to prevent compiler warnings since it's only used within ed25519.c.
    
    OpenBSD-Commit-ID: cf8b1e8f364167eb1766f646cc18a40f32242991
---
 ed25519.c  | 4 ++--
 ed25519.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ed25519.c b/ed25519.c
index 553f2f3c9..b7baa1490 100644
--- a/ed25519.c
+++ b/ed25519.c
@@ -1,4 +1,4 @@
-/*  $OpenBSD: ed25519.c,v 1.6 2026/06/05 06:51:02 djm Exp $ */
+/*  $OpenBSD: ed25519.c,v 1.7 2026/06/07 08:50:17 dtucker Exp $ */
 
 /*
  * Public Domain, Authors:
@@ -1912,7 +1912,7 @@ static void ge25519_scalarmult_base(ge25519_p3 *r, const sc25519 *s)
 }
 /* from supercop-20221122/crypto_sign/ed25519/ref/keypair.c */
 
-int crypto_sign_ed25519_keypair_from_seed(unsigned char *pk,unsigned char *sk, const unsigned char *seed)
+static 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/ed25519.sh b/ed25519.sh
index 1560b5efb..5846cb6e7 100644
--- a/ed25519.sh
+++ b/ed25519.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#       $OpenBSD: ed25519.sh,v 1.4 2026/06/05 06:51:02 djm Exp $
+#       $OpenBSD: ed25519.sh,v 1.5 2026/06/07 08:50:17 dtucker 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/crypto_sign_keypair(unsigned char \*pk,unsigned char \*sk)/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)/static 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)

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