upstream: Adjust Makefiles to include just-added

ssherr_libcrypto where necessary.

OpenBSD-Regress-ID: 53d179a2db3ab931f2aa0e5447cf20cb9787a8bb

diff --git a/regress/unittests/authopt/Makefile b/regress/unittests/authopt/Makefile
index 1860b3fe958242b7342b7d71f933c82c59ac3e16..a7b8a867da3da39bcdcb9064a8d8e136618907d5 100644 (file)
--- a/regress/unittests/authopt/Makefile
+++ b/regress/unittests/authopt/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.11 2025/10/30 23:55:09 djm Exp $
+#      $OpenBSD: Makefile,v 1.12 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_authopt
 SRCS=tests.c
@@ -13,6 +13,7 @@ SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c
 SRCS+=addr.c addrmatch.c bitmap.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+=ssherr-libcrypto.c
 
 SRCS+=digest-openssl.c ed25519-openssl.c
 #SRCS+=digest-libc.c ed25519.c

diff --git a/regress/unittests/bitmap/Makefile b/regress/unittests/bitmap/Makefile
index c38cc7918cc1f16559d8040fdedbefc1faca8bc5..22bc00c340cefcdf80469295b6412c015ff4867e 100644 (file)
--- a/regress/unittests/bitmap/Makefile
+++ b/regress/unittests/bitmap/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.5 2025/04/15 04:00:42 djm Exp $
+#      $OpenBSD: Makefile,v 1.6 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_bitmap
 SRCS=tests.c
@@ -6,6 +6,7 @@ SRCS=tests.c
 # From usr.sbin/ssh
 SRCS+=bitmap.c atomicio.c misc.c xmalloc.c fatal.c log.c cleanup.c match.c
 SRCS+=sshbuf.c sshbuf-getput-basic.c sshbuf-misc.c ssherr.c addr.c addrmatch.c
+SRCS+=ssherr-libcrypto.c
 
 REGRESS_TARGETS=run-regress-${PROG}
 

diff --git a/regress/unittests/conversion/Makefile b/regress/unittests/conversion/Makefile
index f9f5859ac5e8f5129b41cc4a845668d187f36549..93dffa55319b76d22052aa5a3325028d39d1c719 100644 (file)
--- a/regress/unittests/conversion/Makefile
+++ b/regress/unittests/conversion/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.5 2025/04/15 04:00:42 djm Exp $
+#      $OpenBSD: Makefile,v 1.6 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_conversion
 SRCS=tests.c
@@ -6,7 +6,7 @@ SRCS=tests.c
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
 SRCS+=atomicio.c misc.c xmalloc.c log.c uidswap.c cleanup.c fatal.c ssherr.c
-SRCS+=match.c addr.c addrmatch.c
+SRCS+=match.c addr.c addrmatch.c ssherr-libcrypto.c
 
 REGRESS_TARGETS=run-regress-${PROG}
 

diff --git a/regress/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile
index a07e924f6356332944ed4a3534814b294ebbff8d..2e154e12f7551866487f3f51f2aba30c3822a8f1 100644 (file)
--- a/regress/unittests/hostkeys/Makefile
+++ b/regress/unittests/hostkeys/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.14 2025/10/30 23:55:09 djm Exp $
+#      $OpenBSD: Makefile,v 1.15 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_hostkeys
 SRCS=tests.c test_iterate.c
@@ -10,7 +10,7 @@ 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+=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+=ssh-ed25519-sk.c sk-usbhid.c ssh-pkcs11-client.c ssherr-libcrypto.c
 
 SRCS+=digest-openssl.c ed25519-openssl.c
 #SRCS+=digest-libc.c ed25519.c

diff --git a/regress/unittests/kex/Makefile b/regress/unittests/kex/Makefile
index fe871d628ea815aefb30a0b701c96d9f9d3e09f5..7a53978f1749d7278ca4b83960e11556278d5e92 100644 (file)
--- a/regress/unittests/kex/Makefile
+++ b/regress/unittests/kex/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.20 2025/10/30 23:55:09 djm Exp $
+#      $OpenBSD: Makefile,v 1.21 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_kex
 SRCS=tests.c test_kex.c test_proposal.c
@@ -11,7 +11,7 @@ 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
 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+=ssh-ed25519-sk.c sk-usbhid.c ssh-pkcs11-client.c ssherr-libcrypto.c
 
 SRCS+= kex.c
 SRCS+= kex-names.c

diff --git a/regress/unittests/match/Makefile b/regress/unittests/match/Makefile
index 7b17e568934415bfa5977ee72dbcfdfea8aa4ebc..558e10bd415e3680870c19798d3178ed3328c3a0 100644 (file)
--- a/regress/unittests/match/Makefile
+++ b/regress/unittests/match/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.6 2025/04/15 04:00:42 djm Exp $
+#      $OpenBSD: Makefile,v 1.7 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_match
 SRCS=tests.c
@@ -6,7 +6,7 @@ SRCS=tests.c
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
 SRCS+=match.c misc.c log.c uidswap.c fatal.c ssherr.c addrmatch.c xmalloc.c
-SRCS+=cleanup.c atomicio.c addr.c
+SRCS+=cleanup.c atomicio.c addr.c ssherr-libcrypto.c
 
 REGRESS_TARGETS=run-regress-${PROG}
 

diff --git a/regress/unittests/misc/Makefile b/regress/unittests/misc/Makefile
index 77575061d4561334911e397f68c94407511a97af..c2d39244dee7a91e30b0d096e5936ac8af7f119f 100644 (file)
--- a/regress/unittests/misc/Makefile
+++ b/regress/unittests/misc/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.12 2025/09/04 00:34:17 djm Exp $
+#      $OpenBSD: Makefile,v 1.13 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_misc
 SRCS=tests.c
@@ -25,7 +25,7 @@ SRCS+=        addr.c
 SRCS+= addrmatch.c
 
 # From usr.bin/ssh/sshd/Makefile
-SRCS+= atomicio.c cleanup.c fatal.c
+SRCS+= atomicio.c cleanup.c fatal.c ssherr-libcrypto.c
 
 REGRESS_TARGETS=run-regress-${PROG}
 

diff --git a/regress/unittests/sshbuf/Makefile b/regress/unittests/sshbuf/Makefile
index a8ddfaf7ed247ff93d1db4d7e0c407626c5182f7..27106247e2a105e2304badb35bd725444bda4dbe 100644 (file)
--- a/regress/unittests/sshbuf/Makefile
+++ b/regress/unittests/sshbuf/Makefile
@@ -1,6 +1,4 @@
-#      $OpenBSD: Makefile,v 1.10 2021/01/09 12:24:31 dtucker Exp $
-
-#      $OpenBSD: Makefile,v 1.8 2020/01/26 00:09:50 djm Exp $
+#      $OpenBSD: Makefile,v 1.11 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_sshbuf
 SRCS=tests.c
@@ -15,7 +13,7 @@ SRCS+=test_sshbuf_fixed.c
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
 SRCS+=sshbuf-io.c atomicio.c misc.c xmalloc.c log.c fatal.c ssherr.c cleanup.c
-SRCS+=match.c addr.c addrmatch.c
+SRCS+=match.c addr.c addrmatch.c ssherr-libcrypto.c
 
 run-regress-${PROG}: ${PROG}
        env ${TEST_ENV} ./${PROG} ${UNITTEST_ARGS}

diff --git a/regress/unittests/sshkey/Makefile b/regress/unittests/sshkey/Makefile
index e592b012fb05bef2dcccb6445dddb6884b43d8a7..083175cbf2641d16d36b898414a365532b17e111 100644 (file)
--- a/regress/unittests/sshkey/Makefile
+++ b/regress/unittests/sshkey/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.15 2025/10/30 23:55:09 djm Exp $
+#      $OpenBSD: Makefile,v 1.16 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_sshkey
 SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c
@@ -11,7 +11,7 @@ SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c
 SRCS+=addr.c addrmatch.c bitmap.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+=utf8.c
+SRCS+=utf8.c ssherr-libcrypto.c
 
 SRCS+=digest-openssl.c ed25519-openssl.c
 #SRCS+=digest-libc.c ed25519.c

diff --git a/regress/unittests/sshsig/Makefile b/regress/unittests/sshsig/Makefile
index a982ccc7ff73b599cc2198f5f0a9930016c9420b..54abd8499b07a1b7413505d8865595c27a462cff 100644 (file)
--- a/regress/unittests/sshsig/Makefile
+++ b/regress/unittests/sshsig/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.6 2025/10/30 23:55:09 djm Exp $
+#      $OpenBSD: Makefile,v 1.7 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_sshsig
 SRCS=tests.c
@@ -10,7 +10,7 @@ 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+=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+=ssh-ed25519-sk.c sk-usbhid.c ssh-pkcs11-client.c ssherr-libcrypto.c
 
 SRCS+=digest-openssl.c ed25519-openssl.c
 #SRCS+=digest-libc.c ed25519.c

diff --git a/regress/unittests/utf8/Makefile b/regress/unittests/utf8/Makefile
index e89536500822fabc9ce40fae0e7f68ee5846d7d4..a5495735906b5adf6c04230b8c72cb667fef431c 100644 (file)
--- a/regress/unittests/utf8/Makefile
+++ b/regress/unittests/utf8/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.6 2025/04/15 04:00:42 djm Exp $
+#      $OpenBSD: Makefile,v 1.7 2026/02/06 23:39:14 dtucker Exp $
 
 PROG=test_utf8
 SRCS=tests.c
@@ -6,6 +6,7 @@ SRCS=tests.c
 # From usr.bin/ssh
 SRCS+=utf8.c atomicio.c misc.c xmalloc.c match.c ssherr.c cleanup.c fatal.c
 SRCS+=sshbuf.c sshbuf-getput-basic.c sshbuf-misc.c addr.c addrmatch.c log.c
+SRCS+=ssherr-libcrypto.c
 
 REGRESS_TARGETS=run-regress-${PROG}