merge 2017.75
... | ... | @@ -24,6 +24,10 @@ CFLAGS+=-I$(srcdir)/libtomcrypt/src/headers/ |
LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM) | ||
endif | ||
ifneq ($(wildcard localoptions.h),) | ||
CFLAGS+=-DLOCALOPTIONS_H_EXISTS | ||
endif | ||
COMMONOBJS=dbutil.o buffer.o dbhelpers.o \ | ||
dss.o bignum.o \ | ||
signkey.o rsa.o dbrandom.o \ | ||
... | ... | @@ -76,6 +80,8 @@ [email protected]@ |
sbindir=@[email protected] | ||
mandir=@[email protected] | ||
.DELETE_ON_ERROR: | ||
CC=@[email protected] | ||
AR=@[email protected] | ||
RANLIB=@[email protected] | ||
... | ... | @@ -155,7 +161,6 @@ inst_%: % |
inst_dropbearmulti: $(addprefix insmulti, $(PROGRAMS)) | ||
# for some reason the rule further down doesn't like $([email protected]) as a prereq. | ||
dropbear: $(dropbearobjs) | ||
dbclient: $(dbclientobjs) | ||
... | ... | @@ -195,18 +200,18 @@ link%: |
-ln -s dropbearmulti$(EXEEXT) $*$(EXEEXT) | ||
$(STATIC_LTC): options.h | ||
cd libtomcrypt && $(MAKE) | ||
$(MAKE) -C libtomcrypt | ||
$(STATIC_LTM): options.h | ||
cd libtommath && $(MAKE) | ||
$(MAKE) -C libtommath | ||
.PHONY : clean sizes thisclean distclean tidy ltc-clean ltm-clean | ||
ltc-clean: | ||
cd libtomcrypt && $(MAKE) clean | ||
$(MAKE) -C libtomcrypt clean | ||
ltm-clean: | ||
cd libtommath && $(MAKE) clean | ||
$(MAKE) -C libtommath clean | ||
sizes: dropbear | ||
objdump -t dropbear|grep ".text"|cut -d "." -f 2|sort -rn | ||
... | ... | @@ -215,7 +220,7 @@ clean: ltc-clean ltm-clean thisclean |
thisclean: | ||
-rm -f dropbear dbclient dropbearkey dropbearconvert scp scp-progress \ | ||
dropbearmulti *.o *.da *.bb *.bbg *.prof | ||
dropbearmulti *.o *.da *.bb *.bbg *.prof | ||
distclean: clean tidy | ||
-rm -f config.h | ||
... | ... | @@ -223,3 +228,11 @@ distclean: clean tidy |
tidy: | ||
-rm -f *~ *.gcov */*~ | ||
# default_options.h is stored in version control, could not find a workaround | ||
# for parallel "make -j" and dependency rules. | ||
default_options.h: default_options.h.in | ||
echo "# > > > Generated from $^, edit that file instead !" > [email protected].tmp | ||
echo >> [email protected].tmp | ||
$(srcdir)/ifndef_wrapper.sh < $^ > [email protected].tmp | ||
mv [email protected].tmp [email protected] |
... | ... | @@ -29,9 +29,9 @@ |
#include "ssh.h" | ||
#include "runopts.h" | ||
#ifdef ENABLE_CLI_PASSWORD_AUTH | ||
#if DROPBEAR_CLI_PASSWORD_AUTH | ||
#ifdef ENABLE_CLI_ASKPASS_HELPER | ||
#if DROPBEAR_CLI_ASKPASS_HELPER | ||
/* Returns 1 if we want to use the askpass program, 0 otherwise */ | ||
static int want_askpass() | ||
{ | ||
... | ... | @@ -113,7 +113,7 @@ static char *gui_getpass(const char *prompt) { |
TRACE(("leave gui_getpass")) | ||
return(buf); | ||
} | ||
#endif /* ENABLE_CLI_ASKPASS_HELPER */ | ||
#endif /* DROPBEAR_CLI_ASKPASS_HELPER */ | ||
void cli_auth_password() { | ||
... | ... | @@ -125,7 +125,7 @@ void cli_auth_password() { |
snprintf(prompt, sizeof(prompt), "%[email protected]%s's password: ", | ||
cli_opts.username, cli_opts.remotehost); | ||
#ifdef ENABLE_CLI_ASKPASS_HELPER | ||
#if DROPBEAR_CLI_ASKPASS_HELPER | ||
if (want_askpass()) | ||
{ | ||
password = gui_getpass(prompt); | ||
... | ... | @@ -158,4 +158,4 @@ void cli_auth_password() { |
TRACE(("leave cli_auth_password")) | ||
} | ||
#endif /* ENABLE_CLI_PASSWORD_AUTH */ | ||
#endif /* DROPBEAR_CLI_PASSWORD_AUTH */ |