diff options
| author | Damien Miller <djm@mindrot.org> | 2024-12-04 22:47:02 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2024-12-05 09:25:05 +0100 |
| commit | d23a23aaeeabc228792e3fd7eb5f2fa6ae13c482 (patch) | |
| tree | b5152a7890ae9f804b62841cb70caa5988f20e08 | |
| parent | upstream: De-magic the x11 base port number into a define. ok djm@ (diff) | |
| download | openssh-d23a23aaeeabc228792e3fd7eb5f2fa6ae13c482.tar.xz openssh-d23a23aaeeabc228792e3fd7eb5f2fa6ae13c482.zip | |
add a Makefile target for ssh-verify-attestation
Not built by default, but easier than doing it by hand
| -rw-r--r-- | Makefile.in | 16 | ||||
| -rw-r--r-- | regress/misc/ssh-verify-attestation/ssh-verify-attestation.c | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 1e9299378..1f2542ddf 100644 --- 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 4cada3568..f12306a90 100644 --- 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> |