From 9a2cdc299fc749e4d8259adb70daa1f3701f48ae Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Tue, 11 Sep 2007 12:00:18 +0000 Subject: Make sure declarations of variables are at the top of function, pointed out by Alexey Rusakov. --HG-- extra : convert_revision : 6c4d376f9c88f94c3c9b23e32f9135c132e26fa8 --- cli-runopts.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cli-runopts.c b/cli-runopts.c index 68990fa..42c5a9f 100644 --- a/cli-runopts.c +++ b/cli-runopts.c @@ -89,6 +89,9 @@ void cli_getopts(int argc, char ** argv) { #endif char* dummy = NULL; /* Not used for anything real */ + char* recv_window_arg = NULL; + char* keepalive_arg = NULL; + /* see printhelp() for options */ cli_opts.progname = argv[0]; cli_opts.remotehost = NULL; @@ -114,8 +117,6 @@ void cli_getopts(int argc, char ** argv) { opts.ipv6 = 1; */ opts.recv_window = DEFAULT_RECV_WINDOW; - char* recv_window_arg = NULL; - char* keepalive_arg = NULL; /* Iterate all the arguments */ for (i = 1; i < (unsigned int)argc; i++) { -- cgit v1.2.3 From a018260fe996d089b6e42d63739c0620d542dca5 Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Fri, 14 Sep 2007 00:19:44 +0000 Subject: Add support for SSH_ASKPASS_ALWAYS env variable for dbclient. If it (and also SSH_ASKPASS) is set then dbclient will use an external askpass program regardless of whether DISPLAY is set or stdin is a TTY. Suggested by Davyd Madeley for handheld devices. --HG-- extra : convert_revision : c62bdee8427eb452cca38d188affe881d9fadee8 --- cli-authpasswd.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cli-authpasswd.c b/cli-authpasswd.c index 2500a25..1e0bd41 100644 --- a/cli-authpasswd.c +++ b/cli-authpasswd.c @@ -38,7 +38,9 @@ static int want_askpass() char* askpass_prog = NULL; askpass_prog = getenv("SSH_ASKPASS"); - return askpass_prog && !isatty(STDIN_FILENO) && getenv("DISPLAY"); + return askpass_prog && + ((!isatty(STDIN_FILENO) && getenv("DISPLAY") ) + || getenv("SSH_ASKPASS_ALWAYS")); } /* returns a statically allocated password from a helper app, or NULL @@ -125,10 +127,16 @@ void cli_auth_password() { cli_opts.username, cli_opts.remotehost); #ifdef ENABLE_CLI_ASKPASS_HELPER if (want_askpass()) + { password = gui_getpass(prompt); - else + if (!password) { + dropbear_exit("No password"); + } + } else #endif + { password = getpass_or_cancel(prompt); + } buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST); -- cgit v1.2.3 From 25554bc331cc684c3521b3c3ed4c0659c454d5df Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Thu, 18 Oct 2007 12:18:44 +0000 Subject: Fix to allow building from a separate directory, patch from Ricardo Martins --HG-- extra : convert_revision : fb7080ca6e254faaf7cfaee93b0ab6ab6de4ed59 --- configure.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.in b/configure.in index 4370b91..52a75e0 100644 --- a/configure.in +++ b/configure.in @@ -635,6 +635,9 @@ AS_MKDIR_P(libtomcrypt/src/mac/hmac) AS_MKDIR_P(libtomcrypt/src/mac/omac) AS_MKDIR_P(libtomcrypt/src/mac/pelican) AS_MKDIR_P(libtomcrypt/src/mac/pmac) +AS_MKDIR_P(libtomcrypt/src/mac/f9) +AS_MKDIR_P(libtomcrypt/src/mac/xcbc) +AS_MKDIR_P(libtomcrypt/src/math/fp) AS_MKDIR_P(libtomcrypt/src/misc/base64) AS_MKDIR_P(libtomcrypt/src/misc/crypt) AS_MKDIR_P(libtomcrypt/src/misc/mpi) @@ -644,6 +647,8 @@ AS_MKDIR_P(libtomcrypt/src/modes/cfb) AS_MKDIR_P(libtomcrypt/src/modes/ctr) AS_MKDIR_P(libtomcrypt/src/modes/ecb) AS_MKDIR_P(libtomcrypt/src/modes/ofb) +AS_MKDIR_P(libtomcrypt/src/modes/f8) +AS_MKDIR_P(libtomcrypt/src/modes/lrw) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/bit) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/choice) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/ia5) -- cgit v1.2.3