diff options
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.14 2000/09/07 20:27:49 deraadt Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.15 2000/09/21 11:25:32 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/dsa.h> | 28 | #include <openssl/dsa.h> |
29 | #include <openssl/rsa.h> | 29 | #include <openssl/rsa.h> |
@@ -64,9 +64,9 @@ extern int session_id2_len; | |||
64 | 64 | ||
65 | /* protocol */ | 65 | /* protocol */ |
66 | 66 | ||
67 | void input_service_request(int type, int plen); | 67 | void input_service_request(int type, int plen, void *ctxt); |
68 | void input_userauth_request(int type, int plen); | 68 | void input_userauth_request(int type, int plen, void *ctxt); |
69 | void protocol_error(int type, int plen); | 69 | void protocol_error(int type, int plen, void *ctxt); |
70 | 70 | ||
71 | /* auth */ | 71 | /* auth */ |
72 | int ssh2_auth_none(struct passwd *pw); | 72 | int ssh2_auth_none(struct passwd *pw); |
@@ -104,12 +104,12 @@ do_authentication2() | |||
104 | 104 | ||
105 | dispatch_init(&protocol_error); | 105 | dispatch_init(&protocol_error); |
106 | dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); | 106 | dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); |
107 | dispatch_run(DISPATCH_BLOCK, &userauth_success); | 107 | dispatch_run(DISPATCH_BLOCK, &userauth_success, NULL); |
108 | do_authenticated2(); | 108 | do_authenticated2(); |
109 | } | 109 | } |
110 | 110 | ||
111 | void | 111 | void |
112 | protocol_error(int type, int plen) | 112 | protocol_error(int type, int plen, void *ctxt) |
113 | { | 113 | { |
114 | log("auth: protocol error: type %d plen %d", type, plen); | 114 | log("auth: protocol error: type %d plen %d", type, plen); |
115 | packet_start(SSH2_MSG_UNIMPLEMENTED); | 115 | packet_start(SSH2_MSG_UNIMPLEMENTED); |
@@ -119,7 +119,7 @@ protocol_error(int type, int plen) | |||
119 | } | 119 | } |
120 | 120 | ||
121 | void | 121 | void |
122 | input_service_request(int type, int plen) | 122 | input_service_request(int type, int plen, void *ctxt) |
123 | { | 123 | { |
124 | unsigned int len; | 124 | unsigned int len; |
125 | int accept = 0; | 125 | int accept = 0; |
@@ -148,7 +148,7 @@ input_service_request(int type, int plen) | |||
148 | } | 148 | } |
149 | 149 | ||
150 | void | 150 | void |
151 | input_userauth_request(int type, int plen) | 151 | input_userauth_request(int type, int plen, void *ctxt) |
152 | { | 152 | { |
153 | static void (*authlog) (const char *fmt,...) = verbose; | 153 | static void (*authlog) (const char *fmt,...) = verbose; |
154 | static int attempt = 0; | 154 | static int attempt = 0; |