diff options
author | Damien Miller <djm@mindrot.org> | 2019-12-14 08:20:52 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-12-14 08:40:58 +1100 |
commit | 7b47b40b170db4d6f41da0479575f6d99dd7228a (patch) | |
tree | 875fdeafec0fb2d0ebff866ea5e8d2d38fb9e8d1 /Makefile.in | |
parent | f45f3a8a12e2bee601046b916e6c5cd6eae08048 (diff) |
adapt Makefile to ssh-sk-client everywhere
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 79 |
1 files changed, 52 insertions, 27 deletions
diff --git a/Makefile.in b/Makefile.in index eeadf07b1..e9655e747 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -104,16 +104,17 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ | |||
104 | 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 \ |
105 | ssh-pkcs11.o smult_curve25519_ref.o \ | 105 | ssh-pkcs11.o smult_curve25519_ref.o \ |
106 | poly1305.o chacha.o cipher-chachapoly.o \ | 106 | poly1305.o chacha.o cipher-chachapoly.o \ |
107 | ssh-ed25519.o ssh-sk.o sk-usbhid.o digest-openssl.o digest-libc.o \ | 107 | ssh-ed25519.o digest-openssl.o digest-libc.o \ |
108 | hmac.o 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 \ |
109 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ | 109 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ |
110 | kexgexc.o kexgexs.o \ | 110 | kexgexc.o kexgexs.o \ |
111 | sntrup4591761.o kexsntrup4591761x25519.o kexgen.o \ | 111 | sntrup4591761.o kexsntrup4591761x25519.o kexgen.o \ |
112 | sftp-realpath.o platform-pledge.o platform-tracing.o platform-misc.o | 112 | sftp-realpath.o platform-pledge.o platform-tracing.o platform-misc.o |
113 | 113 | ||
114 | SKOBJS= ssh-sk-client.o | ||
114 | 115 | ||
115 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 116 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
116 | sshconnect.o sshconnect2.o mux.o | 117 | sshconnect.o sshconnect2.o mux.o $(SKOBJS) |
117 | 118 | ||
118 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \ | 119 | SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \ |
119 | audit.o audit-bsm.o audit-linux.o platform.o \ | 120 | audit.o audit-bsm.o audit-linux.o platform.o \ |
@@ -128,7 +129,27 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \ | |||
128 | sftp-server.o sftp-common.o \ | 129 | sftp-server.o sftp-common.o \ |
129 | sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ | 130 | sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ |
130 | sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \ | 131 | sandbox-seccomp-filter.o sandbox-capsicum.o sandbox-pledge.o \ |
131 | sandbox-solaris.o uidswap.o | 132 | sandbox-solaris.o uidswap.o $(SKOBJS) |
133 | |||
134 | SCP_OBJS= scp.o progressmeter.o | ||
135 | |||
136 | SSHADD_OBJS= ssh-add.o $(SKOBJS) | ||
137 | |||
138 | SSHAGENT_OBJS= ssh-agent.o ssh-pkcs11-client.o $(SKOBJS) | ||
139 | |||
140 | SSHKEYGEN_OBJS= ssh-keygen.o sshsig.o $(SKOBJS) | ||
141 | |||
142 | SSHKEYSIGN_OBJS=ssh-keysign.o readconf.o uidswap.o $(SKOBJS) | ||
143 | |||
144 | P11HELPER_OBJS= ssh-pkcs11-helper.o ssh-pkcs11.o $(SKOBJS) | ||
145 | |||
146 | SKHELPER_OBJS= ssh-sk-helper.o ssh-sk.o sk-usbhid.o | ||
147 | |||
148 | SSHKEYSCAN_OBJS=ssh-keyscan.o $(SKOBJS) | ||
149 | |||
150 | SFTPSERVER_OBJS=sftp-common.o sftp-server.o sftp-server-main.o | ||
151 | |||
152 | SFTP_OBJS= sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o | ||
132 | 153 | ||
133 | 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 | 154 | 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 |
134 | 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 | 155 | 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 |
@@ -189,35 +210,35 @@ ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS) | |||
189 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) | 210 | sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) |
190 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) | 211 | $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS) |
191 | 212 | ||
192 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o | 213 | scp$(EXEEXT): $(LIBCOMPAT) libssh.a $(SCP_OBJS) |
193 | $(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 214 | $(LD) -o $@ $(SCP_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
194 | 215 | ||
195 | ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o | 216 | ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHADD_OBJS) |
196 | $(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 217 | $(LD) -o $@ $(SSHADD_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
197 | 218 | ||
198 | ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o ssh-pkcs11-client.o | 219 | ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHAGENT_OBJS) |
199 | $(LD) -o $@ ssh-agent.o ssh-pkcs11-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 220 | $(LD) -o $@ $(SSHAGENT_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
200 | 221 | ||
201 | ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o sshsig.o | 222 | ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYGEN_OBJS) |
202 | $(LD) -o $@ ssh-keygen.o sshsig.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 223 | $(LD) -o $@ $(SSHKEYGEN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
203 | 224 | ||
204 | ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o readconf.o uidswap.o compat.o | 225 | ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSIGN_OBJS) |
205 | $(LD) -o $@ ssh-keysign.o readconf.o uidswap.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 226 | $(LD) -o $@ $(SSHKEYSIGN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
206 | 227 | ||
207 | ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o | 228 | ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(P11HELPER_OBJS) |
208 | $(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 229 | $(LD) -o $@ $(P11HELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
209 | 230 | ||
210 | ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-sk-helper.o | 231 | ssh-sk-helper$(EXEEXT): $(LIBCOMPAT) libssh.a $(SKHELPER_OBJS) |
211 | $(LD) -o $@ ssh-sk-helper.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 232 | $(LD) -o $@ $(SKHELPER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
212 | 233 | ||
213 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o | 234 | ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHKEYSCAN_OBJS) |
214 | $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) | 235 | $(LD) -o $@ $(SSHKEYSCAN_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) |
215 | 236 | ||
216 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o | 237 | sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a $(SFTPSERVER_OBJS) |
217 | $(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) | 238 | $(LD) -o $@ $(SFTPSERVER_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) |
218 | 239 | ||
219 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o | 240 | sftp$(EXEEXT): $(LIBCOMPAT) libssh.a $(SFTP_OBJS) |
220 | $(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) | 241 | $(LD) -o $@ $(SFTP_OBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT) |
221 | 242 | ||
222 | # test driver for the loginrec code - not built by default | 243 | # test driver for the loginrec code - not built by default |
223 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o | 244 | logintest: logintest.o $(LIBCOMPAT) libssh.a loginrec.o |
@@ -524,7 +545,8 @@ UNITTESTS_TEST_SSHKEY_OBJS=\ | |||
524 | regress/unittests/sshkey/tests.o \ | 545 | regress/unittests/sshkey/tests.o \ |
525 | regress/unittests/sshkey/common.o \ | 546 | regress/unittests/sshkey/common.o \ |
526 | regress/unittests/sshkey/test_file.o \ | 547 | regress/unittests/sshkey/test_file.o \ |
527 | regress/unittests/sshkey/test_sshkey.o | 548 | regress/unittests/sshkey/test_sshkey.o \ |
549 | $(SKOBJS) | ||
528 | 550 | ||
529 | regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ | 551 | regress/unittests/sshkey/test_sshkey$(EXEEXT): ${UNITTESTS_TEST_SSHKEY_OBJS} \ |
530 | regress/unittests/test_helper/libtest_helper.a libssh.a | 552 | regress/unittests/test_helper/libtest_helper.a libssh.a |
@@ -553,7 +575,8 @@ regress/unittests/conversion/test_conversion$(EXEEXT): \ | |||
553 | 575 | ||
554 | UNITTESTS_TEST_KEX_OBJS=\ | 576 | UNITTESTS_TEST_KEX_OBJS=\ |
555 | regress/unittests/kex/tests.o \ | 577 | regress/unittests/kex/tests.o \ |
556 | regress/unittests/kex/test_kex.o | 578 | regress/unittests/kex/test_kex.o \ |
579 | $(SKOBJS) | ||
557 | 580 | ||
558 | regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ | 581 | regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ |
559 | regress/unittests/test_helper/libtest_helper.a libssh.a | 582 | regress/unittests/test_helper/libtest_helper.a libssh.a |
@@ -563,7 +586,8 @@ regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \ | |||
563 | 586 | ||
564 | UNITTESTS_TEST_HOSTKEYS_OBJS=\ | 587 | UNITTESTS_TEST_HOSTKEYS_OBJS=\ |
565 | regress/unittests/hostkeys/tests.o \ | 588 | regress/unittests/hostkeys/tests.o \ |
566 | regress/unittests/hostkeys/test_iterate.o | 589 | regress/unittests/hostkeys/test_iterate.o \ |
590 | $(SKOBJS) | ||
567 | 591 | ||
568 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ | 592 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ |
569 | ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ | 593 | ${UNITTESTS_TEST_HOSTKEYS_OBJS} \ |
@@ -593,7 +617,8 @@ regress/unittests/utf8/test_utf8$(EXEEXT): \ | |||
593 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 617 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
594 | 618 | ||
595 | MISC_KEX_FUZZ_OBJS=\ | 619 | MISC_KEX_FUZZ_OBJS=\ |
596 | regress/misc/kexfuzz/kexfuzz.o | 620 | regress/misc/kexfuzz/kexfuzz.o \ |
621 | $(SKOBJS) | ||
597 | 622 | ||
598 | regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a | 623 | regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a |
599 | $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ | 624 | $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ |