ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-02-07 21:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

propagate from branch 'au.asn.ucc.matt.dropbear' (head fb7080ca6e254faaf7cfaee93b0ab6ab6de4ed59)

Browse Source 
to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head 78d02301ae8310efa2639f15da0ea62dea110e4b)

--HG--
branch : agent-client
extra : convert_revision : 833d0adef6cdbf43ea75283524c665e70b0ee1ee
This commit is contained in:
Matt Johnston 2007-11-29 11:38:06 +00:00
commit bb84e33d99
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli-authpasswd.c
View File

@ -38,7 +38,9 @@ static int want_askpass()
char* askpass_prog = NULL; char* askpass_prog = NULL;
askpass_prog = getenv("SSH_ASKPASS"); 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 /* 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); cli_opts.username, cli_opts.remotehost);
#ifdef ENABLE_CLI_ASKPASS_HELPER #ifdef ENABLE_CLI_ASKPASS_HELPER
if (want_askpass()) if (want_askpass())
{
password = gui_getpass(prompt); password = gui_getpass(prompt);
else if (!password) {
dropbear_exit("No password");
}
} else
#endif #endif
{
password = getpass_or_cancel(prompt); password = getpass_or_cancel(prompt);
}
buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST); buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST);

5
cli-runopts.c
View File

@ -92,6 +92,9 @@ void cli_getopts(int argc, char ** argv) {
#endif #endif
char* dummy = NULL; /* Not used for anything real */ char* dummy = NULL; /* Not used for anything real */
char* recv_window_arg = NULL;
char* keepalive_arg = NULL;
/* see printhelp() for options */ /* see printhelp() for options */
cli_opts.progname = argv[0]; cli_opts.progname = argv[0];
cli_opts.remotehost = NULL; cli_opts.remotehost = NULL;
@ -121,8 +124,6 @@ void cli_getopts(int argc, char ** argv) {
opts.ipv6 = 1; opts.ipv6 = 1;
*/ */
opts.recv_window = DEFAULT_RECV_WINDOW; opts.recv_window = DEFAULT_RECV_WINDOW;
char* recv_window_arg = NULL;
char* keepalive_arg = NULL;
/* Iterate all the arguments */ /* Iterate all the arguments */
for (i = 1; i < (unsigned int)argc; i++) { for (i = 1; i < (unsigned int)argc; i++) {

5
configure.in
View File

@ -635,6 +635,9 @@ AS_MKDIR_P(libtomcrypt/src/mac/hmac)
AS_MKDIR_P(libtomcrypt/src/mac/omac) AS_MKDIR_P(libtomcrypt/src/mac/omac)
AS_MKDIR_P(libtomcrypt/src/mac/pelican) AS_MKDIR_P(libtomcrypt/src/mac/pelican)
AS_MKDIR_P(libtomcrypt/src/mac/pmac) 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/base64)
AS_MKDIR_P(libtomcrypt/src/misc/crypt) AS_MKDIR_P(libtomcrypt/src/misc/crypt)
AS_MKDIR_P(libtomcrypt/src/misc/mpi) 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/ctr)
AS_MKDIR_P(libtomcrypt/src/modes/ecb) AS_MKDIR_P(libtomcrypt/src/modes/ecb)
AS_MKDIR_P(libtomcrypt/src/modes/ofb) 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/bit)
AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/choice) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/choice)
AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/ia5) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/ia5)