[openssh-commits] [openssh] 04/04: upstream: Adjust Makefiles to include just-added
git+noreply at mindrot.org
git+noreply at mindrot.org
Sat Feb 7 11:14:42 AEDT 2026
This is an automated email from the git hooks/post-receive script.
dtucker pushed a commit to branch master
in repository openssh.
commit 670f7d210ceae59db73b16b67e52d8fd8def3012
Author: dtucker at openbsd.org <dtucker at openbsd.org>
AuthorDate: Fri Feb 6 23:39:14 2026 +0000
upstream: Adjust Makefiles to include just-added
ssherr_libcrypto where necessary.
OpenBSD-Regress-ID: 53d179a2db3ab931f2aa0e5447cf20cb9787a8bb
---
regress/unittests/authopt/Makefile | 3 ++-
regress/unittests/bitmap/Makefile | 3 ++-
regress/unittests/conversion/Makefile | 4 ++--
regress/unittests/hostkeys/Makefile | 4 ++--
regress/unittests/kex/Makefile | 4 ++--
regress/unittests/match/Makefile | 4 ++--
regress/unittests/misc/Makefile | 4 ++--
regress/unittests/sshbuf/Makefile | 6 ++----
regress/unittests/sshkey/Makefile | 4 ++--
regress/unittests/sshsig/Makefile | 4 ++--
regress/unittests/utf8/Makefile | 3 ++-
11 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/regress/unittests/authopt/Makefile b/regress/unittests/authopt/Makefile
index 1860b3fe9..a7b8a867d 100644
--- 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 c38cc7918..22bc00c34 100644
--- 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 f9f5859ac..93dffa553 100644
--- 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 a07e924f6..2e154e12f 100644
--- 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 fe871d628..7a53978f1 100644
--- 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 7b17e5689..558e10bd4 100644
--- 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 77575061d..c2d39244d 100644
--- 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 a8ddfaf7e..27106247e 100644
--- 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 e592b012f..083175cbf 100644
--- 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 a982ccc7f..54abd8499 100644
--- 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 e89536500..a54957359 100644
--- 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}
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list