upstream: don't link hash.c

OpenBSD-Regress-ID: a145f09c1efb1fcd3924544463f1f94f5d4805c0

diff --git a/regress/unittests/authopt/Makefile b/regress/unittests/authopt/Makefile
index 1ecaa30ce34357e3d4b46ac600c34a4eb45742f3..1860b3fe958242b7342b7d71f933c82c59ac3e16 100644 (file)
--- a/regress/unittests/authopt/Makefile
+++ b/regress/unittests/authopt/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.10 2025/07/24 06:04:47 djm Exp $
+#      $OpenBSD: Makefile,v 1.11 2025/10/30 23:55:09 djm Exp $
 
 PROG=test_authopt
 SRCS=tests.c
@@ -11,12 +11,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 ssh-pkcs11-client.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
 
 REGRESS_TARGETS=run-regress-${PROG}

diff --git a/regress/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile
index 76c8e67f8aa1b449173ac5805a9d5bb505bd50f0..a07e924f6356332944ed4a3534814b294ebbff8d 100644 (file)
--- a/regress/unittests/hostkeys/Makefile
+++ b/regress/unittests/hostkeys/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.13 2025/07/24 06:04:47 djm Exp $
+#      $OpenBSD: Makefile,v 1.14 2025/10/30 23:55:09 djm Exp $
 
 PROG=test_hostkeys
 SRCS=tests.c test_iterate.c
@@ -9,12 +9,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 hostfile.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 ssh-pkcs11-client.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
 
 REGRESS_TARGETS=run-regress-${PROG}

diff --git a/regress/unittests/kex/Makefile b/regress/unittests/kex/Makefile
index 5201a35df5bc6061fa11648177c6db2cf0220bfe..fe871d628ea815aefb30a0b701c96d9f9d3e09f5 100644 (file)
--- a/regress/unittests/kex/Makefile
+++ b/regress/unittests/kex/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.19 2025/07/24 06:04:47 djm Exp $
+#      $OpenBSD: Makefile,v 1.20 2025/10/30 23:55:09 djm Exp $
 
 PROG=test_kex
 SRCS=tests.c test_kex.c test_proposal.c
@@ -9,7 +9,7 @@ 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 packet.c dispatch.c canohost.c ssh_api.c
-SRCS+=compat.c ed25519.c hash.c
+SRCS+=compat.c
 SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c
 SRCS+=ssh-ed25519-sk.c sk-usbhid.c ssh-pkcs11-client.c
 
@@ -29,8 +29,8 @@ SRCS+=        kexmlkem768x25519.c
 SRCS+= sntrup761.c
 SRCS+= utf8.c
 
-SRCS+=digest-openssl.c
-#SRCS+=digest-libc.c
+SRCS+=digest-openssl.c ed25519-openssl.c
+#SRCS+=digest-libc.c ed25519.c
 
 REGRESS_TARGETS=run-regress-${PROG}
 

diff --git a/regress/unittests/sshkey/Makefile b/regress/unittests/sshkey/Makefile
index 77d07d1b550e765f97149c81f6ef974c3fe29559..e592b012fb05bef2dcccb6445dddb6884b43d8a7 100644 (file)
--- a/regress/unittests/sshkey/Makefile
+++ b/regress/unittests/sshkey/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.14 2025/07/24 06:04:47 djm Exp $
+#      $OpenBSD: Makefile,v 1.15 2025/10/30 23:55:09 djm Exp $
 
 PROG=test_sshkey
 SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c
@@ -9,14 +9,14 @@ 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 ssh-pkcs11-client.c
-
-SRCS+=digest-openssl.c
-#SRCS+=digest-libc.c
 SRCS+=utf8.c
 
+SRCS+=digest-openssl.c ed25519-openssl.c
+#SRCS+=digest-libc.c ed25519.c
+
+
 REGRESS_TARGETS=run-regress-${PROG}
 
 run-regress-${PROG}: ${PROG}

diff --git a/regress/unittests/sshsig/Makefile b/regress/unittests/sshsig/Makefile
index f2f03e843856340303a68fa69161d037e403b2de..a982ccc7ff73b599cc2198f5f0a9930016c9420b 100644 (file)
--- a/regress/unittests/sshsig/Makefile
+++ b/regress/unittests/sshsig/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.5 2025/07/24 06:04:47 djm Exp $
+#      $OpenBSD: Makefile,v 1.6 2025/10/30 23:55:09 djm Exp $
 
 PROG=test_sshsig
 SRCS=tests.c
@@ -9,12 +9,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 sshsig.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 ssh-pkcs11-client.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
 
 REGRESS_TARGETS=run-regress-${PROG}