upstream: test code now needs to link ssh-pkcs11-client.c any time

sshkey.c is included

OpenBSD-Regress-ID: 9d07188eae9a96801c3150b3433bb220626d4443

diff --git a/Makefile.in b/Makefile.in
index 399c8ae6ec56f7925e51b24d0fceab65cb5ab3cd..9e45d522088baa3d6b2fd131a34f030dc85ee4b4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -613,7 +613,7 @@ UNITTESTS_TEST_SSHKEY_OBJS=\
        regress/unittests/sshkey/common.o \
        regress/unittests/sshkey/test_file.o \
        regress/unittests/sshkey/test_sshkey.o \
-       $(SKOBJS)
+       $(P11OBJS) $(SKOBJS)
 
 regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
     regress/unittests/test_helper/libtest_helper.a libssh.a
@@ -624,7 +624,7 @@ regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \
 UNITTESTS_TEST_SSHSIG_OBJS=\
        sshsig.o \
        regress/unittests/sshsig/tests.o \
-       $(SKOBJS)
+       $(P11OBJS) $(SKOBJS)
 
 regress/unittests/sshsig/test_sshsig$(EXEEXT): ${UNITTESTS_TEST_SSHSIG_OBJS} \
     regress/unittests/test_helper/libtest_helper.a libssh.a
@@ -644,7 +644,7 @@ regress/unittests/bitmap/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \
 UNITTESTS_TEST_AUTHOPT_OBJS=\
        regress/unittests/authopt/tests.o \
        auth-options.o \
-       $(SKOBJS)
+       $(P11OBJS) $(SKOBJS)
 
 regress/unittests/authopt/test_authopt$(EXEEXT): \
     ${UNITTESTS_TEST_AUTHOPT_OBJS} \
@@ -667,7 +667,7 @@ UNITTESTS_TEST_KEX_OBJS=\
        regress/unittests/kex/tests.o \
        regress/unittests/kex/test_kex.o \
        regress/unittests/kex/test_proposal.o \
-       $(SKOBJS)
+       $(P11OBJS) $(SKOBJS)
 
 regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \
     regress/unittests/test_helper/libtest_helper.a libssh.a
@@ -678,7 +678,7 @@ regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \
 UNITTESTS_TEST_HOSTKEYS_OBJS=\
        regress/unittests/hostkeys/tests.o \
        regress/unittests/hostkeys/test_iterate.o \
-       $(SKOBJS)
+       $(P11OBJS) $(SKOBJS)
 
 regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \
     ${UNITTESTS_TEST_HOSTKEYS_OBJS} \
@@ -741,7 +741,7 @@ regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS)
 
 SSH_VERIFY_ATTESTATION_OBJS=\
        regress/misc/ssh-verify-attestation/ssh-verify-attestation.o \
-       $(SKOBJS)
+       $(P11OBJS) $(SKOBJS)
 
 ssh-verify-attestation: regress/misc/ssh-verify-attestation/ssh-verify-attestation$(EXEEXT)
 

diff --git a/regress/unittests/authopt/Makefile b/regress/unittests/authopt/Makefile
index d5ea2c796be153042dc810f82376fc9e376746fd..1ecaa30ce34357e3d4b46ac600c34a4eb45742f3 100644 (file)
--- a/regress/unittests/authopt/Makefile
+++ b/regress/unittests/authopt/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.9 2025/05/06 06:05:48 djm Exp $
+#      $OpenBSD: Makefile,v 1.10 2025/07/24 06:04:47 djm Exp $
 
 PROG=test_authopt
 SRCS=tests.c
@@ -13,7 +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+=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+=ssh-ed25519-sk.c sk-usbhid.c ssh-pkcs11-client.c
 
 SRCS+=digest-openssl.c
 #SRCS+=digest-libc.c

diff --git a/regress/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile
index 142ffa632aad0167ea2de864163a002fac1a6022..76c8e67f8aa1b449173ac5805a9d5bb505bd50f0 100644 (file)
--- a/regress/unittests/hostkeys/Makefile
+++ b/regress/unittests/hostkeys/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.12 2025/05/06 06:05:48 djm Exp $
+#      $OpenBSD: Makefile,v 1.13 2025/07/24 06:04:47 djm Exp $
 
 PROG=test_hostkeys
 SRCS=tests.c test_iterate.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 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
+SRCS+=ssh-ed25519-sk.c sk-usbhid.c ssh-pkcs11-client.c
 
 SRCS+=digest-openssl.c
 #SRCS+=digest-libc.c

diff --git a/regress/unittests/kex/Makefile b/regress/unittests/kex/Makefile
index 645fb060973398ecb91d47a0957169f96cb5b524..5201a35df5bc6061fa11648177c6db2cf0220bfe 100644 (file)
--- a/regress/unittests/kex/Makefile
+++ b/regress/unittests/kex/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.18 2025/05/06 06:05:48 djm Exp $
+#      $OpenBSD: Makefile,v 1.19 2025/07/24 06:04:47 djm 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 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+=ssh-ed25519-sk.c sk-usbhid.c ssh-pkcs11-client.c
 
 SRCS+= kex.c
 SRCS+= kex-names.c

diff --git a/regress/unittests/sshkey/Makefile b/regress/unittests/sshkey/Makefile
index b237ff55c8d3156cc6cc01ab0d5ca99095c39609..77d07d1b550e765f97149c81f6ef974c3fe29559 100644 (file)
--- a/regress/unittests/sshkey/Makefile
+++ b/regress/unittests/sshkey/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.13 2025/05/06 06:05:48 djm Exp $
+#      $OpenBSD: Makefile,v 1.14 2025/07/24 06:04:47 djm 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+=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+=ssh-ed25519-sk.c sk-usbhid.c ssh-pkcs11-client.c
 
 SRCS+=digest-openssl.c
 #SRCS+=digest-libc.c

diff --git a/regress/unittests/sshsig/Makefile b/regress/unittests/sshsig/Makefile
index f8b6560eba18b05be2860ef7dab085cf6099466d..f2f03e843856340303a68fa69161d037e403b2de 100644 (file)
--- a/regress/unittests/sshsig/Makefile
+++ b/regress/unittests/sshsig/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.4 2025/05/06 06:05:48 djm Exp $
+#      $OpenBSD: Makefile,v 1.5 2025/07/24 06:04:47 djm Exp $
 
 PROG=test_sshsig
 SRCS=tests.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 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
+SRCS+=ssh-ed25519-sk.c sk-usbhid.c ssh-pkcs11-client.c
 
 SRCS+=digest-openssl.c
 #SRCS+=digest-libc.c