diff options
| author | mouring <mouring> | 2001-06-25 05:20:31 +0000 |
|---|---|---|
| committer | mouring <mouring> | 2001-06-25 05:20:31 +0000 |
| commit | 6ec2e22a7939a66e4bcf6440fd15b4b921fb65e7 (patch) | |
| tree | 56e28ec2e4939ffa05ad66611a3a9293cc2c0743 /sshconnect2.c | |
| parent | d1baa2127a6e33fbcf175fa2f2b791ca2b13e982 (diff) | |
| download | openssh-6ec2e22a7939a66e4bcf6440fd15b4b921fb65e7.tar.gz | |
- markus@cvs.openbsd.org 2001/06/24 05:35:33
[readpass.c readpass.h ssh-add.c sshconnect2.c ssh-keygen.c]
switch to readpassphrase(3)
2.7/8-stable needs readpassphrase.[ch] from libc
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 1f57c3a9..5f4943ba 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.76 2001/06/23 15:12:21 itojun Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.77 2001/06/24 05:35:34 markus Exp $"); #include <openssl/bn.h> #include <openssl/md5.h> @@ -45,7 +45,6 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.76 2001/06/23 15:12:21 itojun Exp $"); #include "key.h" #include "sshconnect.h" #include "authfile.h" -#include "cli.h" #include "dh.h" #include "authfd.h" #include "log.h" @@ -770,9 +769,9 @@ input_userauth_info_req(int type, int plen, void *ctxt) inst = packet_get_string(NULL); lang = packet_get_string(NULL); if (strlen(name) > 0) - cli_mesg(name); + log(name); if (strlen(inst) > 0) - cli_mesg(inst); + log(inst); xfree(name); xfree(inst); xfree(lang); @@ -792,7 +791,7 @@ input_userauth_info_req(int type, int plen, void *ctxt) prompt = packet_get_string(NULL); echo = packet_get_char(); - response = cli_prompt(prompt, echo); + response = read_passphrase(prompt, echo ? RP_ECHO : 0); packet_put_cstring(response); memset(response, 0, strlen(response)); |