[openssh-commits] [openssh] 05/07: upstream: link against ed25519-openssl.c instead of ed25519.c

[git+noreply at mindrot.org]

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

djm pushed a commit to branch master
in repository openssh.

commit 9d8c686981834bc1dde09f5067ff925d8fc158f5
Author: djm at openbsd.org <djm at openbsd.org>
AuthorDate: Thu Nov 6 01:33:03 2025 +0000

    upstream: link against ed25519-openssl.c instead of ed25519.c
    
    OpenBSD-Regress-ID: f789d46e99d2598929e3c2d00b45c47cc3102501
---
 regress/misc/sk-dummy/Makefile               | 5 +++--
 regress/misc/ssh-verify-attestation/Makefile | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/regress/misc/sk-dummy/Makefile b/regress/misc/sk-dummy/Makefile
index 3d5599bc4..97c2dcd84 100644
--- a/regress/misc/sk-dummy/Makefile
+++ b/regress/misc/sk-dummy/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 2025/11/01 05:39:25 anton Exp $
+#	$OpenBSD: Makefile,v 1.6 2025/11/06 01:33:03 djm Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -11,7 +11,8 @@ SSHREL=../../../../../usr.bin/ssh
 
 SRCS=sk-dummy.c
 # From usr.bin/ssh
-SRCS+=ed25519.c
+SRCS+=ed25519-openssl.c
+#SRCS+=ed25519.c
 OPENSSL?=	yes
 
 CFLAGS+=	-fPIC
diff --git a/regress/misc/ssh-verify-attestation/Makefile b/regress/misc/ssh-verify-attestation/Makefile
index 4665555cd..2124b78b1 100644
--- a/regress/misc/ssh-verify-attestation/Makefile
+++ b/regress/misc/ssh-verify-attestation/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2025/10/23 19:06:10 miod Exp $
+#	$OpenBSD: Makefile,v 1.4 2025/11/06 01:33:03 djm Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -16,12 +16,11 @@ SRCS+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c
 SRCS+=ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c
 SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c
 SRCS+=addr.c addrmatch.c bitmap.c
-SRCS+=ed25519.c hash.c
 SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c
 SRCS+=ssh-ed25519-sk.c sk-usbhid.c
 
-SRCS+=digest-openssl.c
-#SRCS+=digest-libc.c
+SRCS+=digest-openssl.c ed25519-openssl.c
+#SRCS+=digest-libc.c ed25519.c
 SRCS+=utf8.c
 
 OPENSSL?=	yes

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