diff options
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 1f57c3a9f..5f4943ba8 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.76 2001/06/23 15:12:21 itojun Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.77 2001/06/24 05:35:34 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/md5.h> | 29 | #include <openssl/md5.h> |
@@ -45,7 +45,6 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.76 2001/06/23 15:12:21 itojun Exp $"); | |||
45 | #include "key.h" | 45 | #include "key.h" |
46 | #include "sshconnect.h" | 46 | #include "sshconnect.h" |
47 | #include "authfile.h" | 47 | #include "authfile.h" |
48 | #include "cli.h" | ||
49 | #include "dh.h" | 48 | #include "dh.h" |
50 | #include "authfd.h" | 49 | #include "authfd.h" |
51 | #include "log.h" | 50 | #include "log.h" |
@@ -770,9 +769,9 @@ input_userauth_info_req(int type, int plen, void *ctxt) | |||
770 | inst = packet_get_string(NULL); | 769 | inst = packet_get_string(NULL); |
771 | lang = packet_get_string(NULL); | 770 | lang = packet_get_string(NULL); |
772 | if (strlen(name) > 0) | 771 | if (strlen(name) > 0) |
773 | cli_mesg(name); | 772 | log(name); |
774 | if (strlen(inst) > 0) | 773 | if (strlen(inst) > 0) |
775 | cli_mesg(inst); | 774 | log(inst); |
776 | xfree(name); | 775 | xfree(name); |
777 | xfree(inst); | 776 | xfree(inst); |
778 | xfree(lang); | 777 | xfree(lang); |
@@ -792,7 +791,7 @@ input_userauth_info_req(int type, int plen, void *ctxt) | |||
792 | prompt = packet_get_string(NULL); | 791 | prompt = packet_get_string(NULL); |
793 | echo = packet_get_char(); | 792 | echo = packet_get_char(); |
794 | 793 | ||
795 | response = cli_prompt(prompt, echo); | 794 | response = read_passphrase(prompt, echo ? RP_ECHO : 0); |
796 | 795 | ||
797 | packet_put_cstring(response); | 796 | packet_put_cstring(response); |
798 | memset(response, 0, strlen(response)); | 797 | memset(response, 0, strlen(response)); |