diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 06:17:49 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-03-05 06:17:49 +0000 |
commit | 5699c5f9acb09d8e210856c3dd3cdeb4078d41a4 (patch) | |
tree | d865640d602faefb7f1b8e26648d1938c2caa224 /sshconnect2.c | |
parent | 7fbd455c780e96065dc2bd8d96d21f0c017c0f99 (diff) |
- markus@cvs.openbsd.org 2001/02/28 09:57:07
[packet.c packet.h sshconnect2.c]
in ssh protocol v2 use ignore messages for padding (instead of
trailing \0).
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 12335e80e..8b523232f 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.48 2001/02/15 23:19:59 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.49 2001/02/28 09:57:07 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/md5.h> | 29 | #include <openssl/md5.h> |
@@ -658,9 +658,10 @@ userauth_passwd(Authctxt *authctxt) | |||
658 | packet_put_cstring(authctxt->service); | 658 | packet_put_cstring(authctxt->service); |
659 | packet_put_cstring(authctxt->method->name); | 659 | packet_put_cstring(authctxt->method->name); |
660 | packet_put_char(0); | 660 | packet_put_char(0); |
661 | ssh_put_password(password); | 661 | packet_put_cstring(password); |
662 | memset(password, 0, strlen(password)); | 662 | memset(password, 0, strlen(password)); |
663 | xfree(password); | 663 | xfree(password); |
664 | packet_inject_ignore(64); | ||
664 | packet_send(); | 665 | packet_send(); |
665 | packet_write_wait(); | 666 | packet_write_wait(); |
666 | return 1; | 667 | return 1; |
@@ -928,13 +929,14 @@ input_userauth_info_req(int type, int plen, void *ctxt) | |||
928 | 929 | ||
929 | response = cli_prompt(prompt, echo); | 930 | response = cli_prompt(prompt, echo); |
930 | 931 | ||
931 | ssh_put_password(response); | 932 | packet_put_cstring(response); |
932 | memset(response, 0, strlen(response)); | 933 | memset(response, 0, strlen(response)); |
933 | xfree(response); | 934 | xfree(response); |
934 | xfree(prompt); | 935 | xfree(prompt); |
935 | } | 936 | } |
936 | packet_done(); /* done with parsing incoming message. */ | 937 | packet_done(); /* done with parsing incoming message. */ |
937 | 938 | ||
939 | packet_inject_ignore(64); | ||
938 | packet_send(); | 940 | packet_send(); |
939 | packet_write_wait(); | 941 | packet_write_wait(); |
940 | } | 942 | } |