diff options
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.25 2002/09/09 06:48:06 itojun Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.26 2002/09/09 14:54:15 markus Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -131,8 +131,8 @@ static BIGNUM *ssh1_challenge = NULL; /* used for ssh1 rsa auth */ | |||
131 | static u_char *key_blob = NULL; | 131 | static u_char *key_blob = NULL; |
132 | static u_int key_bloblen = 0; | 132 | static u_int key_bloblen = 0; |
133 | static int key_blobtype = MM_NOKEY; | 133 | static int key_blobtype = MM_NOKEY; |
134 | static u_char *hostbased_cuser = NULL; | 134 | static char *hostbased_cuser = NULL; |
135 | static u_char *hostbased_chost = NULL; | 135 | static char *hostbased_chost = NULL; |
136 | static char *auth_method = "unknown"; | 136 | static char *auth_method = "unknown"; |
137 | static int session_id2_len = 0; | 137 | static int session_id2_len = 0; |
138 | static u_char *session_id2 = NULL; | 138 | static u_char *session_id2 = NULL; |
@@ -758,7 +758,8 @@ int | |||
758 | mm_answer_keyallowed(int socket, Buffer *m) | 758 | mm_answer_keyallowed(int socket, Buffer *m) |
759 | { | 759 | { |
760 | Key *key; | 760 | Key *key; |
761 | u_char *cuser, *chost, *blob; | 761 | char *cuser, *chost; |
762 | u_char *blob; | ||
762 | u_int bloblen; | 763 | u_int bloblen; |
763 | enum mm_keytype type = 0; | 764 | enum mm_keytype type = 0; |
764 | int allowed = 0; | 765 | int allowed = 0; |
@@ -834,7 +835,7 @@ static int | |||
834 | monitor_valid_userblob(u_char *data, u_int datalen) | 835 | monitor_valid_userblob(u_char *data, u_int datalen) |
835 | { | 836 | { |
836 | Buffer b; | 837 | Buffer b; |
837 | u_char *p; | 838 | char *p; |
838 | u_int len; | 839 | u_int len; |
839 | int fail = 0; | 840 | int fail = 0; |
840 | 841 | ||
@@ -887,11 +888,11 @@ monitor_valid_userblob(u_char *data, u_int datalen) | |||
887 | } | 888 | } |
888 | 889 | ||
889 | static int | 890 | static int |
890 | monitor_valid_hostbasedblob(u_char *data, u_int datalen, u_char *cuser, | 891 | monitor_valid_hostbasedblob(u_char *data, u_int datalen, char *cuser, |
891 | u_char *chost) | 892 | char *chost) |
892 | { | 893 | { |
893 | Buffer b; | 894 | Buffer b; |
894 | u_char *p; | 895 | char *p; |
895 | u_int len; | 896 | u_int len; |
896 | int fail = 0; | 897 | int fail = 0; |
897 | 898 | ||