diff options
author | Colin Watson <cjwatson@debian.org> | 2020-02-21 11:57:14 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-02-21 11:57:14 +0000 |
commit | f0de78bd4f29fa688c5df116f3f9cd43543a76d0 (patch) | |
tree | 856b0dee3f2764c13a32dad5ffe2424fab7fef41 /Makefile.in | |
parent | 4213eec74e74de6310c27a40c3e9759a08a73996 (diff) | |
parent | 8aa3455b16fddea4c0144a7c4a1edb10ec67dcc8 (diff) |
Import openssh_8.2p1.orig.tar.gz
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 137 |
1 files changed, 102 insertions, 35 deletions
diff --git a/Makefile.in b/Makefile.in index adb1977e2..e7549470c 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -24,6 +24,7 @@ ASKPASS_PROGRAM=$(libexecdir)/ssh-askpass | |||
24 | SFTP_SERVER=$(libexecdir)/sftp-server | 24 | SFTP_SERVER=$(libexecdir)/sftp-server |
25 | SSH_KEYSIGN=$(libexecdir)/ssh-keysign | 25 | SSH_KEYSIGN=$(libexecdir)/ssh-keysign |
26 | SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper | 26 | SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper |
27 | SSH_SK_HELPER=$(libexecdir)/ssh-sk-helper | ||
27 | PRIVSEP_PATH=@PRIVSEP_PATH@ | 28 | PRIVSEP_PATH=@PRIVSEP_PATH@ |
28 | SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ | 29 | SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ |
29 | STRIP_OPT=@STRIP_OPT@ | 30 | STRIP_OPT=@STRIP_OPT@ |
@@ -35,19 +36,23 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ | |||
35 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ | 36 | -D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \ |
36 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ | 37 | -D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ |
37 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ | 38 | -D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ |
39 | -D_PATH_SSH_SK_HELPER=\"$(SSH_SK_HELPER)\" \ | ||
38 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ | 40 | -D_PATH_SSH_PIDDIR=\"$(piddir)\" \ |
39 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" | 41 | -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" |
40 | 42 | ||
41 | CC=@CC@ | 43 | CC=@CC@ |
42 | LD=@LD@ | 44 | LD=@LD@ |
43 | CFLAGS=@CFLAGS@ | 45 | CFLAGS=@CFLAGS@ |
46 | CFLAGS_NOPIE=@CFLAGS_NOPIE@ | ||
44 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ | 47 | CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
48 | PICFLAG=@PICFLAG@ | ||
45 | LIBS=@LIBS@ | 49 | LIBS=@LIBS@ |
46 | K5LIBS=@K5LIBS@ | 50 | K5LIBS=@K5LIBS@ |
47 | GSSLIBS=@GSSLIBS@ | 51 | GSSLIBS=@GSSLIBS@ |
48 | SSHLIBS=@SSHLIBS@ | 52 | SSHLIBS=@SSHLIBS@ |
49 | SSHDLIBS=@SSHDLIBS@ | 53 | SSHDLIBS=@SSHDLIBS@ |
50 | LIBEDIT=@LIBEDIT@ | 54 | LIBEDIT=@LIBEDIT@ |
55 | LIBFIDO2=@LIBFIDO2@ | ||
51 | AR=@AR@ | 56 | AR=@AR@ |
52 | AWK=@AWK@ | 57 | AWK=@AWK@ |
53 | RANLIB=@RANLIB@ | 58 | RANLIB=@RANLIB@ |
@@ -56,11 +61,14 @@ SED=@SED@ | |||
56 | ENT=@ENT@ | 61 | ENT=@ENT@ |
57 | XAUTH_PATH=@XAUTH_PATH@ | 62 | XAUTH_PATH=@XAUTH_PATH@ |
58 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ | 63 | LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ |
64 | LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDFLAGS_NOPIE@ | ||
59 | EXEEXT=@EXEEXT@ | 65 | EXEEXT=@EXEEXT@ |
60 | MANFMT=@MANFMT@ | 66 | MANFMT=@MANFMT@ |
61 | MKDIR_P=@MKDIR_P@ | 67 | MKDIR_P=@MKDIR_P@ |
62 | 68 | ||
63 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) | 69 | .SUFFIXES: .lo |
70 | |||
71 | TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-pkcs11-helper$(EXEEXT) ssh-agent$(EXEEXT) scp$(EXEEXT) sftp-server$(EXEEXT) sftp$(EXEEXT) ssh-sk-helper$(EXEEXT) | ||
64 | 72 | ||
65 | XMSS_OBJS=\ | 73 | XMSS_OBJS=\ |
66 | ssh-xmss.o \ | 74 | ssh-xmss.o \ |
@@ -91,20 +99,23 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ | |||
91 | log.o match.o moduli.o nchan.o packet.o \ | 99 | log.o match.o moduli.o nchan.o packet.o \ |
92 | readpass.o ttymodes.o xmalloc.o addrmatch.o \ | 100 | readpass.o ttymodes.o xmalloc.o addrmatch.o \ |
93 | atomicio.o dispatch.o mac.o misc.o utf8.o \ | 101 | atomicio.o dispatch.o mac.o misc.o utf8.o \ |
94 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ | 102 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-ecdsa-sk.o \ |
103 | ssh-ed25519-sk.o ssh-rsa.o dh.o \ | ||
95 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ | 104 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ |
96 | ssh-pkcs11.o smult_curve25519_ref.o \ | 105 | ssh-pkcs11.o smult_curve25519_ref.o \ |
97 | poly1305.o chacha.o cipher-chachapoly.o \ | 106 | poly1305.o chacha.o cipher-chachapoly.o \ |
98 | ssh-ed25519.o digest-openssl.o digest-libc.o hmac.o \ | 107 | ssh-ed25519.o digest-openssl.o digest-libc.o \ |
99 | sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \ | 108 | hmac.o sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \ |
100 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ | 109 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ |
101 | kexgexc.o kexgexs.o \ | 110 | kexgexc.o kexgexs.o \ |
102 | sntrup4591761.o kexsntrup4591761x25519.o kexgen.o \ | 111 | sntrup4591761.o kexsntrup4591761x25519.o kexgen.o \ |
103 | platform-pledge.o platform-tracing.o platform-misc.o | 112 | sftp-realpath.o platform-pledge.o platform-tracing.o platform-misc.o \ |
113 | sshbuf-io.o | ||
104 | 114 | ||
115 | SKOBJS= ssh-sk-client.o | ||
105 | 116 | ||
106 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 117 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
107 | sshconnect.o sshconnect2.o mux.o | 118 | sshconnect.o sshconnect2.o mux.o $(SKOBJS) |
108 | 119 | ||
109 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \ | 120 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \ |
110 | audit.o audit-bsm.o audit-linux.o platform.o \ | 121 | audit.o audit-bsm.o audit-linux.o platform.o \ |
@@ -116,13 +127,33 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \ | |||
116 | monitor.o monitor_wrap.o auth-krb5.o \ | 127 | monitor.o monitor_wrap.o auth-krb5.o \ |
117 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ | 128 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ |
118 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ | 129 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ |
119 | sftp-server.o sftp-common.o sftp-realpath.o \ | 130 | sftp-server.o sftp-common.o \ |
120 | sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ | 131 | sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ |
121 | sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \ | 132 | sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \ |
122 | sandbox-solaris.o uidswap.o | 133 | sandbox-solaris.o uidswap.o $(SKOBJS) |
134 | |||
135 | SCP_OBJS= scp.o progressmeter.o | ||
136 | |||
137 | SSHADD_OBJS= ssh-add.o $(SKOBJS) | ||
138 | |||
139 | SSHAGENT_OBJS= ssh-agent.o ssh-pkcs11-client.o $(SKOBJS) | ||
140 | |||
141 | SSHKEYGEN_OBJS= ssh-keygen.o sshsig.o $(SKOBJS) | ||
142 | |||
143 | SSHKEYSIGN_OBJS=ssh-keysign.o readconf.o uidswap.o $(SKOBJS) | ||
144 | |||
145 | P11HELPER_OBJS= ssh-pkcs11-helper.o ssh-pkcs11.o $(SKOBJS) | ||
146 | |||
147 | SKHELPER_OBJS= ssh-sk-helper.o ssh-sk.o sk-usbhid.o | ||
148 | |||
149 | SSHKEYSCAN_OBJS=ssh-keyscan.o $(SKOBJS) | ||
123 | 150 | ||
124 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out | 151 | SFTPSERVER_OBJS=sftp-common.o sftp-server.o sftp-server-main.o |
125 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 | 152 | |
153 | SFTP_OBJS= sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o | ||
154 | |||
155 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out ssh-sk-helper.8.out sshd_config.5.out ssh_config.5.out | ||
156 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 ssh-sk-helper.8 sshd_config.5 ssh_config.5 | ||
126 | MANTYPE = @MANTYPE@ | 157 | MANTYPE = @MANTYPE@ |
127 | 158 | ||
128 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out | 159 | CONFIGFILES=sshd_config.out ssh_config.out moduli.out |
@@ -180,32 +211,35 @@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) | |||
180 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | 211 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
181 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) | 212 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) |
182 | 213 | ||
183 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o | 214 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a $(SCP_OBJS) |
184 | $(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 215 | $(LD) -o $@ $(SCP_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
216 | |||
217 | ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHADD_OBJS) | ||
218 | $(LD) -o $@ $(SSHADD_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | ||
185 | 219 | ||
186 | ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o | 220 | ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHAGENT_OBJS) |
187 | $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 221 | $(LD) -o $@ $(SSHAGENT_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
188 | 222 | ||
189 | ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o ssh-pkcs11-client.o | 223 | ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYGEN_OBJS) |
190 | $(LD) -o $@ ssh-agent.o ssh-pkcs11-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 224 | $(LD) -o $@ $(SSHKEYGEN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
191 | 225 | ||
192 | ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o sshsig.o | 226 | ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSIGN_OBJS) |
193 | $(LD) -o $@ ssh-keygen.o sshsig.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 227 | $(LD) -o $@ $(SSHKEYSIGN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
194 | 228 | ||
195 | ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o uidswap.o compat.o | 229 | ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(P11HELPER_OBJS) |
196 | $(LD) -o $@ ssh-keysign.o readconf.o uidswap.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 230 | $(LD) -o $@ $(P11HELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
197 | 231 | ||
198 | ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o | 232 | ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(SKHELPER_OBJS) |
199 | $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 233 | $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) $(LIBFIDO2) |
200 | 234 | ||
201 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o | 235 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS) |
202 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) | 236 | $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |
203 | 237 | ||
204 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-realpath.o sftp-server-main.o | 238 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a $(SFTPSERVER_OBJS) |
205 | $(LD) -o $@ sftp-server.o sftp-common.o sftp-realpath.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 239 | $(LD) -o $@ $(SFTPSERVER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
206 | 240 | ||
207 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o | 241 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a $(SFTP_OBJS) |
208 | $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) | 242 | $(LD) -o $@ $(SFTP_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) |
209 | 243 | ||
210 | # test driver for the loginrec code - not built by default | 244 | # test driver for the loginrec code - not built by default |
211 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o | 245 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o |
@@ -233,7 +267,7 @@ moduli: | |||
233 | echo | 267 | echo |
234 | 268 | ||
235 | clean: regressclean | 269 | clean: regressclean |
236 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 270 | rm -f *.o *.lo *.a $(TARGETS) logintest config.cache config.log |
237 | rm -f *.out core survey | 271 | rm -f *.out core survey |
238 | rm -f regress/check-perm$(EXEEXT) | 272 | rm -f regress/check-perm$(EXEEXT) |
239 | rm -f regress/mkdtemp$(EXEEXT) | 273 | rm -f regress/mkdtemp$(EXEEXT) |
@@ -257,6 +291,9 @@ clean: regressclean | |||
257 | rm -f regress/unittests/utf8/test_utf8$(EXEEXT) | 291 | rm -f regress/unittests/utf8/test_utf8$(EXEEXT) |
258 | rm -f regress/misc/kexfuzz/*.o | 292 | rm -f regress/misc/kexfuzz/*.o |
259 | rm -f regress/misc/kexfuzz/kexfuzz$(EXEEXT) | 293 | rm -f regress/misc/kexfuzz/kexfuzz$(EXEEXT) |
294 | rm -f regress/misc/sk-dummy/*.o | ||
295 | rm -f regress/misc/sk-dummy/*.lo | ||
296 | rm -f regress/misc/sk-dummy/sk-dummy.so | ||
260 | (cd openbsd-compat && $(MAKE) clean) | 297 | (cd openbsd-compat && $(MAKE) clean) |
261 | 298 | ||
262 | distclean: regressclean | 299 | distclean: regressclean |
@@ -316,6 +353,8 @@ depend-rebuild: | |||
316 | rm -f config.h | 353 | rm -f config.h |
317 | touch config.h | 354 | touch config.h |
318 | makedepend -w1000 -Y. -f .depend *.c 2>/dev/null | 355 | makedepend -w1000 -Y. -f .depend *.c 2>/dev/null |
356 | (head -2 .depend; tail +3 .depend | sort) >.depend.tmp | ||
357 | mv .depend.tmp .depend | ||
319 | rm -f config.h | 358 | rm -f config.h |
320 | 359 | ||
321 | depend-check: depend-rebuild | 360 | depend-check: depend-rebuild |
@@ -349,6 +388,7 @@ install-files: | |||
349 | $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) | 388 | $(INSTALL) -m 0755 $(STRIP_OPT) sshd$(EXEEXT) $(DESTDIR)$(sbindir)/sshd$(EXEEXT) |
350 | $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) | 389 | $(INSTALL) -m 4711 $(STRIP_OPT) ssh-keysign$(EXEEXT) $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) |
351 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) | 390 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-pkcs11-helper$(EXEEXT) $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) |
391 | $(INSTALL) -m 0755 $(STRIP_OPT) ssh-sk-helper$(EXEEXT) $(DESTDIR)$(SSH_SK_HELPER)$(EXEEXT) | ||
352 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) | 392 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp$(EXEEXT) $(DESTDIR)$(bindir)/sftp$(EXEEXT) |
353 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 393 | $(INSTALL) -m 0755 $(STRIP_OPT) sftp-server$(EXEEXT) $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
354 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 394 | $(INSTALL) -m 644 ssh.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
@@ -365,6 +405,7 @@ install-files: | |||
365 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 405 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
366 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 406 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
367 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 407 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
408 | $(INSTALL) -m 644 ssh-sk-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-sk-helper.8 | ||
368 | 409 | ||
369 | install-sysconf: | 410 | install-sysconf: |
370 | $(MKDIR_P) $(DESTDIR)$(sysconfdir) | 411 | $(MKDIR_P) $(DESTDIR)$(sysconfdir) |
@@ -425,6 +466,7 @@ uninstall: | |||
425 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) | 466 | -rm -r $(DESTDIR)$(SFTP_SERVER)$(EXEEXT) |
426 | -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) | 467 | -rm -f $(DESTDIR)$(SSH_KEYSIGN)$(EXEEXT) |
427 | -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) | 468 | -rm -f $(DESTDIR)$(SSH_PKCS11_HELPER)$(EXEEXT) |
469 | -rm -f $(DESTDIR)$(SSH_SK_HELPER)$(EXEEXT) | ||
428 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 | 470 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 |
429 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 | 471 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 |
430 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 | 472 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 |
@@ -436,6 +478,7 @@ uninstall: | |||
436 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | 478 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 |
437 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | 479 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 |
438 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | 480 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 |
481 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-sk-helper.8 | ||
439 | 482 | ||
440 | regress-prep: | 483 | regress-prep: |
441 | $(MKDIR_P) `pwd`/regress/unittests/test_helper | 484 | $(MKDIR_P) `pwd`/regress/unittests/test_helper |
@@ -448,6 +491,7 @@ regress-prep: | |||
448 | $(MKDIR_P) `pwd`/regress/unittests/match | 491 | $(MKDIR_P) `pwd`/regress/unittests/match |
449 | $(MKDIR_P) `pwd`/regress/unittests/utf8 | 492 | $(MKDIR_P) `pwd`/regress/unittests/utf8 |
450 | $(MKDIR_P) `pwd`/regress/misc/kexfuzz | 493 | $(MKDIR_P) `pwd`/regress/misc/kexfuzz |
494 | $(MKDIR_P) `pwd`/regress/misc/sk-dummy | ||
451 | [ -f `pwd`/regress/Makefile ] || \ | 495 | [ -f `pwd`/regress/Makefile ] || \ |
452 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile | 496 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile |
453 | 497 | ||
@@ -502,7 +546,8 @@ UNITTESTS_TEST_SSHKEY_OBJS=\ | |||
502 | regress/unittests/sshkey/tests.o \ | 546 | regress/unittests/sshkey/tests.o \ |
503 | regress/unittests/sshkey/common.o \ | 547 | regress/unittests/sshkey/common.o \ |
504 | regress/unittests/sshkey/test_file.o \ | 548 | regress/unittests/sshkey/test_file.o \ |
505 | regress/unittests/sshkey/test_sshkey.o | 549 | regress/unittests/sshkey/test_sshkey.o \ |
550 | $(SKOBJS) | ||
506 | 551 | ||
507 | regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ | 552 | regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ |
508 | regress/unittests/test_helper/libtest_helper.a libssh.a | 553 | regress/unittests/test_helper/libtest_helper.a libssh.a |
@@ -531,7 +576,8 @@ regress/unittests/conversion/test_conversion$(EXEEXT): \ | |||
531 | 576 | ||
532 | UNITTESTS_TEST_KEX_OBJS=\ | 577 | UNITTESTS_TEST_KEX_OBJS=\ |
533 | regress/unittests/kex/tests.o \ | 578 | regress/unittests/kex/tests.o \ |
534 | regress/unittests/kex/test_kex.o | 579 | regress/unittests/kex/test_kex.o \ |
580 | $(SKOBJS) | ||
535 | 581 | ||
536 | regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ | 582 | regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ |
537 | regress/unittests/test_helper/libtest_helper.a libssh.a | 583 | regress/unittests/test_helper/libtest_helper.a libssh.a |
@@ -541,7 +587,8 @@ regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ | |||
541 | 587 | ||
542 | UNITTESTS_TEST_HOSTKEYS_OBJS=\ | 588 | UNITTESTS_TEST_HOSTKEYS_OBJS=\ |
543 | regress/unittests/hostkeys/tests.o \ | 589 | regress/unittests/hostkeys/tests.o \ |
544 | regress/unittests/hostkeys/test_iterate.o | 590 | regress/unittests/hostkeys/test_iterate.o \ |
591 | $(SKOBJS) | ||
545 | 592 | ||
546 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ | 593 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ |
547 | ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ | 594 | ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ |
@@ -571,18 +618,33 @@ regress/unittests/utf8/test_utf8$(EXEEXT): \ | |||
571 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 618 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
572 | 619 | ||
573 | MISC_KEX_FUZZ_OBJS=\ | 620 | MISC_KEX_FUZZ_OBJS=\ |
574 | regress/misc/kexfuzz/kexfuzz.o | 621 | regress/misc/kexfuzz/kexfuzz.o \ |
622 | $(SKOBJS) | ||
575 | 623 | ||
576 | regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a | 624 | regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a |
577 | $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ | 625 | $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ |
578 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 626 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
579 | 627 | ||
628 | # These all need to be compiled -fPIC, so they are treated differently. | ||
629 | SK_DUMMY_OBJS=\ | ||
630 | regress/misc/sk-dummy/sk-dummy.lo \ | ||
631 | regress/misc/sk-dummy/fatal.lo \ | ||
632 | ed25519.lo hash.lo ge25519.lo fe25519.lo sc25519.lo verify.lo | ||
633 | |||
634 | .c.lo: Makefile.in config.h | ||
635 | $(CC) $(CFLAGS_NOPIE) $(PICFLAG) $(CPPFLAGS) -c $< -o $@ | ||
636 | |||
637 | regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS) | ||
638 | $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \ | ||
639 | -L. -Lopenbsd-compat -lopenbsd-compat $(LDFLAGS_NOPIE) $(LIBS) | ||
640 | |||
580 | regress-binaries: regress-prep $(LIBCOMPAT) \ | 641 | regress-binaries: regress-prep $(LIBCOMPAT) \ |
581 | regress/modpipe$(EXEEXT) \ | 642 | regress/modpipe$(EXEEXT) \ |
582 | regress/setuid-allowed$(EXEEXT) \ | 643 | regress/setuid-allowed$(EXEEXT) \ |
583 | regress/netcat$(EXEEXT) \ | 644 | regress/netcat$(EXEEXT) \ |
584 | regress/check-perm$(EXEEXT) \ | 645 | regress/check-perm$(EXEEXT) \ |
585 | regress/mkdtemp$(EXEEXT) | 646 | regress/mkdtemp$(EXEEXT) \ |
647 | regress/misc/sk-dummy/sk-dummy.so | ||
586 | 648 | ||
587 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ | 649 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ |
588 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ | 650 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
@@ -615,10 +677,13 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) | |||
615 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ | 677 | TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add"; \ |
616 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ | 678 | TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \ |
617 | TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ | 679 | TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ |
680 | TEST_SSH_SSHSKHELPER="$${BUILDDIR}/ssh-sk-helper"; \ | ||
618 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ | 681 | TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \ |
619 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ | 682 | TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \ |
620 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | 683 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ |
621 | TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ | 684 | TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper"; \ |
685 | TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper"; \ | ||
686 | TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \ | ||
622 | TEST_SSH_PLINK="plink"; \ | 687 | TEST_SSH_PLINK="plink"; \ |
623 | TEST_SSH_PUTTYGEN="puttygen"; \ | 688 | TEST_SSH_PUTTYGEN="puttygen"; \ |
624 | TEST_SSH_CONCH="conch"; \ | 689 | TEST_SSH_CONCH="conch"; \ |
@@ -643,6 +708,8 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) | |||
643 | TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ | 708 | TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ |
644 | TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ | 709 | TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ |
645 | TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ | 710 | TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ |
711 | TEST_SSH_PKCS11_HELPER="$${TEST_SSH_PKCS11_HELPER}" \ | ||
712 | TEST_SSH_SK_HELPER="$${TEST_SSH_SK_HELPER}" \ | ||
646 | TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ | 713 | TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ |
647 | TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ | 714 | TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ |
648 | TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ | 715 | TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ |