add a Makefile target for ssh-verify-attestation

Not built by default, but easier than doing it by hand

diff --git a/Makefile.in b/Makefile.in
index 1e92993782a0a38cfcc93aea58f44b770e818420..1f2542ddfde36ae3402c5651e8e334e5d2b3b47a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -335,7 +335,8 @@ clean:      regressclean
        rm -f regress/unittests/utf8/test_utf8$(EXEEXT)
        rm -f regress/misc/sk-dummy/*.o
        rm -f regress/misc/sk-dummy/*.lo
-       rm -f regress/misc/sk-dummy/sk-dummy.so
+       rm -f regress/misc/ssh-verify-attestation/ssh-verify-attestation$(EXEEXT)
+       rm -f regress/misc/ssh-verify-attestation/*.o
        (cd openbsd-compat && $(MAKE) clean)
 
 distclean:     regressclean
@@ -373,6 +374,8 @@ distclean:  regressclean
        rm -f regress/misc/sk-dummy/*.o
        rm -f regress/misc/sk-dummy/*.lo
        rm -f regress/misc/sk-dummy/sk-dummy.so
+       rm -f regress/misc/ssh-verify-attestation/ssh-verify-attestation$(EXEEXT)
+       rm -f regress/misc/ssh-verify-attestation/*.o
        (cd openbsd-compat && $(MAKE) distclean)
        if test -d pkg ; then \
                rm -fr pkg ; \
@@ -549,6 +552,7 @@ regress-prep:
        $(MKDIR_P) `pwd`/regress/unittests/sshsig
        $(MKDIR_P) `pwd`/regress/unittests/utf8
        $(MKDIR_P) `pwd`/regress/misc/sk-dummy
+       $(MKDIR_P) `pwd`/regress/misc/ssh-verify-attestation
        [ -f `pwd`/regress/Makefile ] || \
            ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
 
@@ -735,6 +739,16 @@ regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS)
        $(CC) $(CFLAGS) $(CPPFLAGS) $(PICFLAG) -shared -o $@ $(SK_DUMMY_OBJS) \
            -L. -Lopenbsd-compat -lopenbsd-compat $(LDFLAGS_NOPIE) $(TESTLIBS)
 
+SSH_VERIFY_ATTESTATION_OBJS=\
+       regress/misc/ssh-verify-attestation/ssh-verify-attestation.o \
+       $(SKOBJS)
+
+ssh-verify-attestation: regress/misc/ssh-verify-attestation/ssh-verify-attestation$(EXEEXT)
+
+regress/misc/ssh-verify-attestation/ssh-verify-attestation$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSH_VERIFY_ATTESTATION_OBJS)
+       $(LD) -o $@ $(SSH_VERIFY_ATTESTATION_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(CHANNELLIBS) $(LIBFIDO2)
+
+
 regress-binaries: regress-prep $(LIBCOMPAT) \
        regress/modpipe$(EXEEXT) \
        regress/timestamp$(EXEEXT) \

diff --git a/regress/misc/ssh-verify-attestation/ssh-verify-attestation.c b/regress/misc/ssh-verify-attestation/ssh-verify-attestation.c
index 4cada3568a669f86e57a937e27113dfc506fe64a..f12306a909efcdaa6d736b85451d1671a4079dc3 100644 (file)
--- a/regress/misc/ssh-verify-attestation/ssh-verify-attestation.c
+++ b/regress/misc/ssh-verify-attestation/ssh-verify-attestation.c
@@ -44,6 +44,8 @@
  *
  */
 
+#include "includes.h"
+
 #include <stdint.h>
 #include <inttypes.h>
 #include <stdlib.h>