diff options
author | Colin Watson <cjwatson@debian.org> | 2016-08-06 10:49:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2016-08-06 10:49:58 +0100 |
commit | a8ed8d256b2e2c05b0c15565a7938028c5192277 (patch) | |
tree | 87abbdc914a38b43e4e5bb9581ad1f46eabbf88e /Makefile.in | |
parent | f0329aac23c61e1a5197d6d57349a63f459bccb0 (diff) | |
parent | 99522ba7ec6963a05c04a156bf20e3ba3605987c (diff) |
Import openssh_7.3p1.orig.tar.gz
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index d401787db..12991cd9f 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -82,7 +82,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ | |||
82 | compat.o crc32.o deattack.o fatal.o hostfile.o \ | 82 | compat.o crc32.o deattack.o fatal.o hostfile.o \ |
83 | log.o match.o md-sha256.o moduli.o nchan.o packet.o opacket.o \ | 83 | log.o match.o md-sha256.o moduli.o nchan.o packet.o opacket.o \ |
84 | readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ | 84 | readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ |
85 | atomicio.o key.o dispatch.o mac.o uidswap.o uuencode.o misc.o \ | 85 | atomicio.o key.o dispatch.o mac.o uidswap.o uuencode.o misc.o utf8.o \ |
86 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ | 86 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ |
87 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ | 87 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ |
88 | ssh-pkcs11.o smult_curve25519_ref.o \ | 88 | ssh-pkcs11.o smult_curve25519_ref.o \ |
@@ -92,7 +92,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ | |||
92 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ | 92 | kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \ |
93 | kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \ | 93 | kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \ |
94 | kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \ | 94 | kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \ |
95 | platform-pledge.o | 95 | platform-pledge.o platform-tracing.o |
96 | 96 | ||
97 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ | 97 | SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ |
98 | sshconnect.o sshconnect1.o sshconnect2.o mux.o | 98 | sshconnect.o sshconnect1.o sshconnect2.o mux.o |
@@ -223,7 +223,7 @@ umac128.o: umac.c | |||
223 | $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \ | 223 | $(CC) $(CFLAGS) $(CPPFLAGS) -o umac128.o -c $(srcdir)/umac.c \ |
224 | -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \ | 224 | -DUMAC_OUTPUT_LEN=16 -Dumac_new=umac128_new \ |
225 | -Dumac_update=umac128_update -Dumac_final=umac128_final \ | 225 | -Dumac_update=umac128_update -Dumac_final=umac128_final \ |
226 | -Dumac_delete=umac128_delete | 226 | -Dumac_delete=umac128_delete -Dumac_ctx=umac128_ctx |
227 | 227 | ||
228 | clean: regressclean | 228 | clean: regressclean |
229 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log | 229 | rm -f *.o *.a $(TARGETS) logintest config.cache config.log |
@@ -240,6 +240,8 @@ clean: regressclean | |||
240 | rm -f regress/unittests/hostkeys/test_hostkeys | 240 | rm -f regress/unittests/hostkeys/test_hostkeys |
241 | rm -f regress/unittests/kex/*.o | 241 | rm -f regress/unittests/kex/*.o |
242 | rm -f regress/unittests/kex/test_kex | 242 | rm -f regress/unittests/kex/test_kex |
243 | rm -f regress/misc/kexfuzz/*.o | ||
244 | rm -f regress/misc/kexfuzz/kexfuzz | ||
243 | (cd openbsd-compat && $(MAKE) clean) | 245 | (cd openbsd-compat && $(MAKE) clean) |
244 | 246 | ||
245 | distclean: regressclean | 247 | distclean: regressclean |
@@ -260,6 +262,7 @@ distclean: regressclean | |||
260 | rm -f regress/unittests/hostkeys/test_hostkeys | 262 | rm -f regress/unittests/hostkeys/test_hostkeys |
261 | rm -f regress/unittests/kex/*.o | 263 | rm -f regress/unittests/kex/*.o |
262 | rm -f regress/unittests/kex/test_kex | 264 | rm -f regress/unittests/kex/test_kex |
265 | rm -f regress/unittests/misc/kexfuzz | ||
263 | (cd openbsd-compat && $(MAKE) distclean) | 266 | (cd openbsd-compat && $(MAKE) distclean) |
264 | if test -d pkg ; then \ | 267 | if test -d pkg ; then \ |
265 | rm -fr pkg ; \ | 268 | rm -fr pkg ; \ |
@@ -419,23 +422,27 @@ regress-prep: | |||
419 | mkdir -p `pwd`/regress/unittests/hostkeys | 422 | mkdir -p `pwd`/regress/unittests/hostkeys |
420 | [ -d `pwd`/regress/unittests/kex ] || \ | 423 | [ -d `pwd`/regress/unittests/kex ] || \ |
421 | mkdir -p `pwd`/regress/unittests/kex | 424 | mkdir -p `pwd`/regress/unittests/kex |
425 | [ -d `pwd`/regress/misc/kexfuzz ] || \ | ||
426 | mkdir -p `pwd`/regress/misc/kexfuzz | ||
422 | [ -f `pwd`/regress/Makefile ] || \ | 427 | [ -f `pwd`/regress/Makefile ] || \ |
423 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile | 428 | ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile |
424 | 429 | ||
425 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c | 430 | REGRESSLIBS=libssh.a $(LIBCOMPAT) |
426 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ | 431 | |
432 | regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c $(REGRESSLIBS) | ||
433 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/modpipe.c \ | ||
427 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 434 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
428 | 435 | ||
429 | regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c | 436 | regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c $(REGRESSLIBS) |
430 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ | 437 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/setuid-allowed.c \ |
431 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 438 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
432 | 439 | ||
433 | regress/netcat$(EXEEXT): $(srcdir)/regress/netcat.c | 440 | regress/netcat$(EXEEXT): $(srcdir)/regress/netcat.c $(REGRESSLIBS) |
434 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ | 441 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/netcat.c \ |
435 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 442 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
436 | 443 | ||
437 | regress/check-perm$(EXEEXT): $(srcdir)/regress/check-perm.c | 444 | regress/check-perm$(EXEEXT): $(srcdir)/regress/check-perm.c $(REGRESSLIBS) |
438 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \ | 445 | $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(srcdir)/regress/check-perm.c \ |
439 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 446 | $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
440 | 447 | ||
441 | UNITTESTS_TEST_HELPER_OBJS=\ | 448 | UNITTESTS_TEST_HELPER_OBJS=\ |
@@ -505,8 +512,14 @@ regress/unittests/hostkeys/test_hostkeys$(EXEEXT): \ | |||
505 | regress/unittests/test_helper/libtest_helper.a \ | 512 | regress/unittests/test_helper/libtest_helper.a \ |
506 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 513 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
507 | 514 | ||
508 | REGRESS_BINARIES=\ | 515 | MISC_KEX_FUZZ_OBJS=\ |
509 | regress/modpipe$(EXEEXT) \ | 516 | regress/misc/kexfuzz/kexfuzz.o |
517 | |||
518 | regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a | ||
519 | $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ | ||
520 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | ||
521 | |||
522 | regress-binaries: regress/modpipe$(EXEEXT) \ | ||
510 | regress/setuid-allowed$(EXEEXT) \ | 523 | regress/setuid-allowed$(EXEEXT) \ |
511 | regress/netcat$(EXEEXT) \ | 524 | regress/netcat$(EXEEXT) \ |
512 | regress/check-perm$(EXEEXT) \ | 525 | regress/check-perm$(EXEEXT) \ |
@@ -514,9 +527,10 @@ REGRESS_BINARIES=\ | |||
514 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ | 527 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ |
515 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ | 528 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ |
516 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ | 529 | regress/unittests/hostkeys/test_hostkeys$(EXEEXT) \ |
517 | regress/unittests/kex/test_kex$(EXEEXT) | 530 | regress/unittests/kex/test_kex$(EXEEXT) \ |
531 | regress/misc/kexfuzz/kexfuzz$(EXEEXT) | ||
518 | 532 | ||
519 | tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) | 533 | tests interop-tests t-exec: regress-prep regress-binaries $(TARGETS) |
520 | BUILDDIR=`pwd`; \ | 534 | BUILDDIR=`pwd`; \ |
521 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ | 535 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ |
522 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 536 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
@@ -541,6 +555,7 @@ tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) | |||
541 | OBJ="$${BUILDDIR}/regress/" \ | 555 | OBJ="$${BUILDDIR}/regress/" \ |
542 | PATH="$${BUILDDIR}:$${PATH}" \ | 556 | PATH="$${BUILDDIR}:$${PATH}" \ |
543 | TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ | 557 | TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ |
558 | TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ | ||
544 | TEST_SSH_SCP="$${TEST_SSH_SCP}" \ | 559 | TEST_SSH_SCP="$${TEST_SSH_SCP}" \ |
545 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ | 560 | TEST_SSH_SSH="$${TEST_SSH_SSH}" \ |
546 | TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ | 561 | TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ |