diff --git a/cmdgen.c b/cmdgen.c index 9d9d011a..774a42c7 100644 --- a/cmdgen.c +++ b/cmdgen.c @@ -46,7 +46,7 @@ char *get_random_data(int len, const char *device) #define console_get_userpass_input console_get_userpass_input_diagnostic int nprompts, promptsgot; const char *prompts[3]; -int console_get_userpass_input(prompts_t *p, unsigned char *in, int inlen) +int console_get_userpass_input(prompts_t *p) { size_t i; int ret = 1; @@ -785,7 +785,7 @@ int main(int argc, char **argv) p->to_server = FALSE; p->name = dupstr("SSH key passphrase"); add_prompt(p, dupstr("Enter passphrase to load key: "), FALSE); - ret = console_get_userpass_input(p, NULL, 0); + ret = console_get_userpass_input(p); assert(ret >= 0); if (!ret) { free_prompts(p); @@ -932,7 +932,7 @@ int main(int argc, char **argv) p->name = dupstr("New SSH key passphrase"); add_prompt(p, dupstr("Enter passphrase to save key: "), FALSE); add_prompt(p, dupstr("Re-enter passphrase to verify: "), FALSE); - ret = console_get_userpass_input(p, NULL, 0); + ret = console_get_userpass_input(p); assert(ret >= 0); if (!ret) { free_prompts(p); diff --git a/putty.h b/putty.h index 98a23591..12499e87 100644 --- a/putty.h +++ b/putty.h @@ -1367,8 +1367,7 @@ int askappend(void *frontend, Filename *filename, * that aren't equivalents to things in windlg.c et al. */ extern int console_batch_mode; -int console_get_userpass_input(prompts_t *p, const unsigned char *in, - int inlen); +int console_get_userpass_input(prompts_t *p); void console_provide_logctx(void *logctx); int is_interactive(void); diff --git a/unix/uxcons.c b/unix/uxcons.c index 716f3fc5..d0fe986b 100644 --- a/unix/uxcons.c +++ b/unix/uxcons.c @@ -456,8 +456,7 @@ static void console_prompt_text(FILE *outfp, const char *data, int len) fflush(outfp); } -int console_get_userpass_input(prompts_t *p, const unsigned char *in, - int inlen) +int console_get_userpass_input(prompts_t *p) { size_t curr_prompt; FILE *outfp = NULL; diff --git a/unix/uxpgnt.c b/unix/uxpgnt.c index 63605fb6..d3f5648e 100644 --- a/unix/uxpgnt.c +++ b/unix/uxpgnt.c @@ -351,7 +351,7 @@ static char *askpass_tty(const char *prompt) p->to_server = FALSE; p->name = dupstr("Pageant passphrase prompt"); add_prompt(p, dupcat(prompt, ": ", (const char *)NULL), FALSE); - ret = console_get_userpass_input(p, NULL, 0); + ret = console_get_userpass_input(p); assert(ret >= 0); if (!ret) { diff --git a/unix/uxplink.c b/unix/uxplink.c index 93c12b22..765aadcc 100644 --- a/unix/uxplink.c +++ b/unix/uxplink.c @@ -437,7 +437,7 @@ int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen) int ret; ret = cmdline_get_passwd_input(p, in, inlen); if (ret == -1) - ret = console_get_userpass_input(p, in, inlen); + ret = console_get_userpass_input(p); return ret; } diff --git a/unix/uxsftp.c b/unix/uxsftp.c index 56f7a136..8576d436 100644 --- a/unix/uxsftp.c +++ b/unix/uxsftp.c @@ -73,7 +73,7 @@ int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen) int ret; ret = cmdline_get_passwd_input(p, in, inlen); if (ret == -1) - ret = console_get_userpass_input(p, in, inlen); + ret = console_get_userpass_input(p); return ret; } diff --git a/windows/wincons.c b/windows/wincons.c index efdecd58..5c493773 100644 --- a/windows/wincons.c +++ b/windows/wincons.c @@ -355,8 +355,7 @@ static void console_data_untrusted(HANDLE hout, const char *data, int len) WriteFile(hout, data, len, &dummy, NULL); } -int console_get_userpass_input(prompts_t *p, - const unsigned char *in, int inlen) +int console_get_userpass_input(prompts_t *p) { HANDLE hin, hout; size_t curr_prompt;