mirror of
https://github.com/openssh/openssh-portable.git
synced 2026-06-24 08:48:18 +00:00
upstream: make crypto_sign_ed25519_keypair_from_seed non-static.
The new ML-DSA/ed25519 code needs it OpenBSD-Commit-ID: 48d00a2094bca8e422494aaa76105c708837436e
This commit is contained in:
committed by
Damien Miller
parent
81ca1451bf
commit
db1bad146f
@@ -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:
|
||||
@@ -1912,7 +1912,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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user