From: Damien Miller <djm@mindrot.org>
Date: Fri, 13 Dec 2019 21:40:33 +0000 (+1100)
Subject: only link ssh-sk-helper against libfido2
X-Git-Tag: V_8_2_P1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=633778d567ad50b63d2a3bca5e1b97d279d236d9;p=thirdparty%2Fopenssh-portable.git

only link ssh-sk-helper against libfido2
---

diff --git a/Makefile.in b/Makefile.in
index e9655e747..963f99fb5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -229,7 +229,7 @@ ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(P11HELPER_OBJS)
 	$(LD) -o $@ $(P11HELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
 ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(SKHELPER_OBJS)
-	$(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
+	$(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) $(LIBFIDO2)
 
 ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS)
 	$(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
diff --git a/configure.ac b/configure.ac
index 6e70e52c3..2671c4afe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3107,7 +3107,6 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_internal" = "xyes" ; then
 	OTHERLIBS=`echo $LIBFIDO2 | sed 's/-lfido2//'`
 	AC_CHECK_LIB([fido2], [fido_init],
 		[
-			LIBS="$LIBS $LIBFIDO2" # XXX avoid linking to all.
 			AC_SUBST([LIBFIDO2])
 			AC_DEFINE([ENABLE_SK_INTERNAL], [],
 			    [Enable for built-in U2F/FIDO support])