diff options
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 726 |
1 files changed, 384 insertions, 342 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index 9666bda4b..732fb3476 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.99 2018/03/03 03:15:51 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.107 2018/07/20 03:46:34 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -50,8 +50,8 @@ | |||
50 | #ifdef WITH_OPENSSL | 50 | #ifdef WITH_OPENSSL |
51 | #include "dh.h" | 51 | #include "dh.h" |
52 | #endif | 52 | #endif |
53 | #include "buffer.h" | 53 | #include "sshbuf.h" |
54 | #include "key.h" | 54 | #include "sshkey.h" |
55 | #include "cipher.h" | 55 | #include "cipher.h" |
56 | #include "kex.h" | 56 | #include "kex.h" |
57 | #include "hostfile.h" | 57 | #include "hostfile.h" |
@@ -61,13 +61,6 @@ | |||
61 | #include "mac.h" | 61 | #include "mac.h" |
62 | #include "log.h" | 62 | #include "log.h" |
63 | #include "auth-pam.h" | 63 | #include "auth-pam.h" |
64 | #ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ | ||
65 | #undef TARGET_OS_MAC | ||
66 | #include "zlib.h" | ||
67 | #define TARGET_OS_MAC 1 | ||
68 | #else | ||
69 | #include "zlib.h" | ||
70 | #endif | ||
71 | #include "monitor.h" | 64 | #include "monitor.h" |
72 | #ifdef GSSAPI | 65 | #ifdef GSSAPI |
73 | #include "ssh-gss.h" | 66 | #include "ssh-gss.h" |
@@ -84,36 +77,35 @@ | |||
84 | #include "ssherr.h" | 77 | #include "ssherr.h" |
85 | 78 | ||
86 | /* Imports */ | 79 | /* Imports */ |
87 | extern z_stream incoming_stream; | ||
88 | extern z_stream outgoing_stream; | ||
89 | extern struct monitor *pmonitor; | 80 | extern struct monitor *pmonitor; |
90 | extern Buffer loginmsg; | 81 | extern struct sshbuf *loginmsg; |
91 | extern ServerOptions options; | 82 | extern ServerOptions options; |
92 | 83 | ||
93 | void | 84 | void |
94 | mm_log_handler(LogLevel level, const char *msg, void *ctx) | 85 | mm_log_handler(LogLevel level, const char *msg, void *ctx) |
95 | { | 86 | { |
96 | Buffer log_msg; | 87 | struct sshbuf *log_msg; |
97 | struct monitor *mon = (struct monitor *)ctx; | 88 | struct monitor *mon = (struct monitor *)ctx; |
89 | int r; | ||
90 | size_t len; | ||
98 | 91 | ||
99 | if (mon->m_log_sendfd == -1) | 92 | if (mon->m_log_sendfd == -1) |
100 | fatal("%s: no log channel", __func__); | 93 | fatal("%s: no log channel", __func__); |
101 | 94 | ||
102 | buffer_init(&log_msg); | 95 | if ((log_msg = sshbuf_new()) == NULL) |
103 | /* | 96 | fatal("%s: sshbuf_new failed", __func__); |
104 | * Placeholder for packet length. Will be filled in with the actual | ||
105 | * packet length once the packet has been constucted. This saves | ||
106 | * fragile math. | ||
107 | */ | ||
108 | buffer_put_int(&log_msg, 0); | ||
109 | 97 | ||
110 | buffer_put_int(&log_msg, level); | 98 | if ((r = sshbuf_put_u32(log_msg, 0)) != 0 || /* length; filled below */ |
111 | buffer_put_cstring(&log_msg, msg); | 99 | (r = sshbuf_put_u32(log_msg, level)) != 0 || |
112 | put_u32(buffer_ptr(&log_msg), buffer_len(&log_msg) - 4); | 100 | (r = sshbuf_put_cstring(log_msg, msg)) != 0) |
113 | if (atomicio(vwrite, mon->m_log_sendfd, buffer_ptr(&log_msg), | 101 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
114 | buffer_len(&log_msg)) != buffer_len(&log_msg)) | 102 | if ((len = sshbuf_len(log_msg)) < 4 || len > 0xffffffff) |
103 | fatal("%s: bad length %zu", __func__, len); | ||
104 | POKE_U32(sshbuf_mutable_ptr(log_msg), len - 4); | ||
105 | if (atomicio(vwrite, mon->m_log_sendfd, | ||
106 | sshbuf_mutable_ptr(log_msg), len) != len) | ||
115 | fatal("%s: write: %s", __func__, strerror(errno)); | 107 | fatal("%s: write: %s", __func__, strerror(errno)); |
116 | buffer_free(&log_msg); | 108 | sshbuf_free(log_msg); |
117 | } | 109 | } |
118 | 110 | ||
119 | int | 111 | int |
@@ -127,26 +119,29 @@ mm_is_monitor(void) | |||
127 | } | 119 | } |
128 | 120 | ||
129 | void | 121 | void |
130 | mm_request_send(int sock, enum monitor_reqtype type, Buffer *m) | 122 | mm_request_send(int sock, enum monitor_reqtype type, struct sshbuf *m) |
131 | { | 123 | { |
132 | u_int mlen = buffer_len(m); | 124 | size_t mlen = sshbuf_len(m); |
133 | u_char buf[5]; | 125 | u_char buf[5]; |
134 | 126 | ||
135 | debug3("%s entering: type %d", __func__, type); | 127 | debug3("%s entering: type %d", __func__, type); |
136 | 128 | ||
137 | put_u32(buf, mlen + 1); | 129 | if (mlen >= 0xffffffff) |
130 | fatal("%s: bad length %zu", __func__, mlen); | ||
131 | POKE_U32(buf, mlen + 1); | ||
138 | buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ | 132 | buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ |
139 | if (atomicio(vwrite, sock, buf, sizeof(buf)) != sizeof(buf)) | 133 | if (atomicio(vwrite, sock, buf, sizeof(buf)) != sizeof(buf)) |
140 | fatal("%s: write: %s", __func__, strerror(errno)); | 134 | fatal("%s: write: %s", __func__, strerror(errno)); |
141 | if (atomicio(vwrite, sock, buffer_ptr(m), mlen) != mlen) | 135 | if (atomicio(vwrite, sock, sshbuf_mutable_ptr(m), mlen) != mlen) |
142 | fatal("%s: write: %s", __func__, strerror(errno)); | 136 | fatal("%s: write: %s", __func__, strerror(errno)); |
143 | } | 137 | } |
144 | 138 | ||
145 | void | 139 | void |
146 | mm_request_receive(int sock, Buffer *m) | 140 | mm_request_receive(int sock, struct sshbuf *m) |
147 | { | 141 | { |
148 | u_char buf[4]; | 142 | u_char buf[4], *p = NULL; |
149 | u_int msg_len; | 143 | u_int msg_len; |
144 | int r; | ||
150 | 145 | ||
151 | debug3("%s entering", __func__); | 146 | debug3("%s entering", __func__); |
152 | 147 | ||
@@ -155,24 +150,27 @@ mm_request_receive(int sock, Buffer *m) | |||
155 | cleanup_exit(255); | 150 | cleanup_exit(255); |
156 | fatal("%s: read: %s", __func__, strerror(errno)); | 151 | fatal("%s: read: %s", __func__, strerror(errno)); |
157 | } | 152 | } |
158 | msg_len = get_u32(buf); | 153 | msg_len = PEEK_U32(buf); |
159 | if (msg_len > 256 * 1024) | 154 | if (msg_len > 256 * 1024) |
160 | fatal("%s: read: bad msg_len %d", __func__, msg_len); | 155 | fatal("%s: read: bad msg_len %d", __func__, msg_len); |
161 | buffer_clear(m); | 156 | sshbuf_reset(m); |
162 | buffer_append_space(m, msg_len); | 157 | if ((r = sshbuf_reserve(m, msg_len, &p)) != 0) |
163 | if (atomicio(read, sock, buffer_ptr(m), msg_len) != msg_len) | 158 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
159 | if (atomicio(read, sock, p, msg_len) != msg_len) | ||
164 | fatal("%s: read: %s", __func__, strerror(errno)); | 160 | fatal("%s: read: %s", __func__, strerror(errno)); |
165 | } | 161 | } |
166 | 162 | ||
167 | void | 163 | void |
168 | mm_request_receive_expect(int sock, enum monitor_reqtype type, Buffer *m) | 164 | mm_request_receive_expect(int sock, enum monitor_reqtype type, struct sshbuf *m) |
169 | { | 165 | { |
170 | u_char rtype; | 166 | u_char rtype; |
167 | int r; | ||
171 | 168 | ||
172 | debug3("%s entering: type %d", __func__, type); | 169 | debug3("%s entering: type %d", __func__, type); |
173 | 170 | ||
174 | mm_request_receive(sock, m); | 171 | mm_request_receive(sock, m); |
175 | rtype = buffer_get_char(m); | 172 | if ((r = sshbuf_get_u8(m, &rtype)) != 0) |
173 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
176 | if (rtype != type) | 174 | if (rtype != type) |
177 | fatal("%s: read: rtype %d != type %d", __func__, | 175 | fatal("%s: read: rtype %d != type %d", __func__, |
178 | rtype, type); | 176 | rtype, type); |
@@ -183,20 +181,24 @@ DH * | |||
183 | mm_choose_dh(int min, int nbits, int max) | 181 | mm_choose_dh(int min, int nbits, int max) |
184 | { | 182 | { |
185 | BIGNUM *p, *g; | 183 | BIGNUM *p, *g; |
186 | int success = 0; | 184 | int r; |
187 | Buffer m; | 185 | u_char success = 0; |
186 | struct sshbuf *m; | ||
188 | 187 | ||
189 | buffer_init(&m); | 188 | if ((m = sshbuf_new()) == NULL) |
190 | buffer_put_int(&m, min); | 189 | fatal("%s: sshbuf_new failed", __func__); |
191 | buffer_put_int(&m, nbits); | 190 | if ((r = sshbuf_put_u32(m, min)) != 0 || |
192 | buffer_put_int(&m, max); | 191 | (r = sshbuf_put_u32(m, nbits)) != 0 || |
192 | (r = sshbuf_put_u32(m, max)) != 0) | ||
193 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
193 | 194 | ||
194 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_MODULI, &m); | 195 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_MODULI, m); |
195 | 196 | ||
196 | debug3("%s: waiting for MONITOR_ANS_MODULI", __func__); | 197 | debug3("%s: waiting for MONITOR_ANS_MODULI", __func__); |
197 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_MODULI, &m); | 198 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_MODULI, m); |
198 | 199 | ||
199 | success = buffer_get_char(&m); | 200 | if ((r = sshbuf_get_u8(m, &success)) != 0) |
201 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
200 | if (success == 0) | 202 | if (success == 0) |
201 | fatal("%s: MONITOR_ANS_MODULI failed", __func__); | 203 | fatal("%s: MONITOR_ANS_MODULI failed", __func__); |
202 | 204 | ||
@@ -204,36 +206,43 @@ mm_choose_dh(int min, int nbits, int max) | |||
204 | fatal("%s: BN_new failed", __func__); | 206 | fatal("%s: BN_new failed", __func__); |
205 | if ((g = BN_new()) == NULL) | 207 | if ((g = BN_new()) == NULL) |
206 | fatal("%s: BN_new failed", __func__); | 208 | fatal("%s: BN_new failed", __func__); |
207 | buffer_get_bignum2(&m, p); | 209 | if ((r = sshbuf_get_bignum2(m, p)) != 0 || |
208 | buffer_get_bignum2(&m, g); | 210 | (r = sshbuf_get_bignum2(m, g)) != 0) |
211 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
209 | 212 | ||
210 | debug3("%s: remaining %d", __func__, buffer_len(&m)); | 213 | debug3("%s: remaining %zu", __func__, sshbuf_len(m)); |
211 | buffer_free(&m); | 214 | sshbuf_free(m); |
212 | 215 | ||
213 | return (dh_new_group(g, p)); | 216 | return (dh_new_group(g, p)); |
214 | } | 217 | } |
215 | #endif | 218 | #endif |
216 | 219 | ||
217 | int | 220 | int |
218 | mm_key_sign(struct sshkey *key, u_char **sigp, u_int *lenp, | 221 | mm_sshkey_sign(struct sshkey *key, u_char **sigp, size_t *lenp, |
219 | const u_char *data, u_int datalen, const char *hostkey_alg) | 222 | const u_char *data, size_t datalen, const char *hostkey_alg, u_int compat) |
220 | { | 223 | { |
221 | struct kex *kex = *pmonitor->m_pkex; | 224 | struct kex *kex = *pmonitor->m_pkex; |
222 | Buffer m; | 225 | struct sshbuf *m; |
226 | u_int ndx = kex->host_key_index(key, 0, active_state); | ||
227 | int r; | ||
223 | 228 | ||
224 | debug3("%s entering", __func__); | 229 | debug3("%s entering", __func__); |
225 | 230 | ||
226 | buffer_init(&m); | 231 | if ((m = sshbuf_new()) == NULL) |
227 | buffer_put_int(&m, kex->host_key_index(key, 0, active_state)); | 232 | fatal("%s: sshbuf_new failed", __func__); |
228 | buffer_put_string(&m, data, datalen); | 233 | if ((r = sshbuf_put_u32(m, ndx)) != 0 || |
229 | buffer_put_cstring(&m, hostkey_alg); | 234 | (r = sshbuf_put_string(m, data, datalen)) != 0 || |
235 | (r = sshbuf_put_cstring(m, hostkey_alg)) != 0 || | ||
236 | (r = sshbuf_put_u32(m, compat)) != 0) | ||
237 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
230 | 238 | ||
231 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m); | 239 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, m); |
232 | 240 | ||
233 | debug3("%s: waiting for MONITOR_ANS_SIGN", __func__); | 241 | debug3("%s: waiting for MONITOR_ANS_SIGN", __func__); |
234 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SIGN, &m); | 242 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SIGN, m); |
235 | *sigp = buffer_get_string(&m, lenp); | 243 | if ((r = sshbuf_get_string(m, sigp, lenp)) != 0) |
236 | buffer_free(&m); | 244 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
245 | sshbuf_free(m); | ||
237 | 246 | ||
238 | return (0); | 247 | return (0); |
239 | } | 248 | } |
@@ -242,54 +251,80 @@ struct passwd * | |||
242 | mm_getpwnamallow(const char *username) | 251 | mm_getpwnamallow(const char *username) |
243 | { | 252 | { |
244 | struct ssh *ssh = active_state; /* XXX */ | 253 | struct ssh *ssh = active_state; /* XXX */ |
245 | Buffer m; | 254 | struct sshbuf *m; |
246 | struct passwd *pw; | 255 | struct passwd *pw; |
247 | u_int len, i; | 256 | size_t len; |
257 | u_int i; | ||
248 | ServerOptions *newopts; | 258 | ServerOptions *newopts; |
259 | int r; | ||
260 | u_char ok; | ||
261 | const u_char *p; | ||
249 | 262 | ||
250 | debug3("%s entering", __func__); | 263 | debug3("%s entering", __func__); |
251 | 264 | ||
252 | buffer_init(&m); | 265 | if ((m = sshbuf_new()) == NULL) |
253 | buffer_put_cstring(&m, username); | 266 | fatal("%s: sshbuf_new failed", __func__); |
267 | if ((r = sshbuf_put_cstring(m, username)) != 0) | ||
268 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
254 | 269 | ||
255 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m); | 270 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, m); |
256 | 271 | ||
257 | debug3("%s: waiting for MONITOR_ANS_PWNAM", __func__); | 272 | debug3("%s: waiting for MONITOR_ANS_PWNAM", __func__); |
258 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PWNAM, &m); | 273 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PWNAM, m); |
259 | 274 | ||
260 | if (buffer_get_char(&m) == 0) { | 275 | if ((r = sshbuf_get_u8(m, &ok)) != 0) |
276 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
277 | if (ok == 0) { | ||
261 | pw = NULL; | 278 | pw = NULL; |
262 | goto out; | 279 | goto out; |
263 | } | 280 | } |
264 | pw = buffer_get_string(&m, &len); | 281 | |
265 | if (len != sizeof(struct passwd)) | 282 | /* XXX don't like passing struct passwd like this */ |
283 | pw = xcalloc(sizeof(*pw), 1); | ||
284 | if ((r = sshbuf_get_string_direct(m, &p, &len)) != 0) | ||
285 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
286 | if (len != sizeof(*pw)) | ||
266 | fatal("%s: struct passwd size mismatch", __func__); | 287 | fatal("%s: struct passwd size mismatch", __func__); |
267 | pw->pw_name = buffer_get_string(&m, NULL); | 288 | memcpy(pw, p, sizeof(*pw)); |
268 | pw->pw_passwd = buffer_get_string(&m, NULL); | 289 | |
290 | if ((r = sshbuf_get_cstring(m, &pw->pw_name, NULL)) != 0 || | ||
291 | (r = sshbuf_get_cstring(m, &pw->pw_passwd, NULL)) != 0 || | ||
269 | #ifdef HAVE_STRUCT_PASSWD_PW_GECOS | 292 | #ifdef HAVE_STRUCT_PASSWD_PW_GECOS |
270 | pw->pw_gecos = buffer_get_string(&m, NULL); | 293 | (r = sshbuf_get_cstring(m, &pw->pw_gecos, NULL)) != 0 || |
271 | #endif | 294 | #endif |
272 | #ifdef HAVE_STRUCT_PASSWD_PW_CLASS | 295 | #ifdef HAVE_STRUCT_PASSWD_PW_CLASS |
273 | pw->pw_class = buffer_get_string(&m, NULL); | 296 | (r = sshbuf_get_cstring(m, &pw->pw_class, NULL)) != 0 || |
274 | #endif | 297 | #endif |
275 | pw->pw_dir = buffer_get_string(&m, NULL); | 298 | (r = sshbuf_get_cstring(m, &pw->pw_dir, NULL)) != 0 || |
276 | pw->pw_shell = buffer_get_string(&m, NULL); | 299 | (r = sshbuf_get_cstring(m, &pw->pw_shell, NULL)) != 0) |
300 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
277 | 301 | ||
278 | out: | 302 | out: |
279 | /* copy options block as a Match directive may have changed some */ | 303 | /* copy options block as a Match directive may have changed some */ |
280 | newopts = buffer_get_string(&m, &len); | 304 | if ((r = sshbuf_get_string_direct(m, &p, &len)) != 0) |
305 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
281 | if (len != sizeof(*newopts)) | 306 | if (len != sizeof(*newopts)) |
282 | fatal("%s: option block size mismatch", __func__); | 307 | fatal("%s: option block size mismatch", __func__); |
308 | newopts = xcalloc(sizeof(*newopts), 1); | ||
309 | memcpy(newopts, p, sizeof(*newopts)); | ||
283 | 310 | ||
284 | #define M_CP_STROPT(x) do { \ | 311 | #define M_CP_STROPT(x) do { \ |
285 | if (newopts->x != NULL) \ | 312 | if (newopts->x != NULL) { \ |
286 | newopts->x = buffer_get_string(&m, NULL); \ | 313 | if ((r = sshbuf_get_cstring(m, \ |
314 | &newopts->x, NULL)) != 0) \ | ||
315 | fatal("%s: buffer error: %s", \ | ||
316 | __func__, ssh_err(r)); \ | ||
317 | } \ | ||
287 | } while (0) | 318 | } while (0) |
288 | #define M_CP_STRARRAYOPT(x, nx) do { \ | 319 | #define M_CP_STRARRAYOPT(x, nx) do { \ |
289 | newopts->x = newopts->nx == 0 ? \ | 320 | newopts->x = newopts->nx == 0 ? \ |
290 | NULL : xcalloc(newopts->nx, sizeof(*newopts->x)); \ | 321 | NULL : xcalloc(newopts->nx, sizeof(*newopts->x)); \ |
291 | for (i = 0; i < newopts->nx; i++) \ | 322 | for (i = 0; i < newopts->nx; i++) { \ |
292 | newopts->x[i] = buffer_get_string(&m, NULL); \ | 323 | if ((r = sshbuf_get_cstring(m, \ |
324 | &newopts->x[i], NULL)) != 0) \ | ||
325 | fatal("%s: buffer error: %s", \ | ||
326 | __func__, ssh_err(r)); \ | ||
327 | } \ | ||
293 | } while (0) | 328 | } while (0) |
294 | /* See comment in servconf.h */ | 329 | /* See comment in servconf.h */ |
295 | COPY_MATCH_STRING_OPTS(); | 330 | COPY_MATCH_STRING_OPTS(); |
@@ -301,7 +336,7 @@ out: | |||
301 | process_permitopen(ssh, &options); | 336 | process_permitopen(ssh, &options); |
302 | free(newopts); | 337 | free(newopts); |
303 | 338 | ||
304 | buffer_free(&m); | 339 | sshbuf_free(m); |
305 | 340 | ||
306 | return (pw); | 341 | return (pw); |
307 | } | 342 | } |
@@ -309,19 +344,22 @@ out: | |||
309 | char * | 344 | char * |
310 | mm_auth2_read_banner(void) | 345 | mm_auth2_read_banner(void) |
311 | { | 346 | { |
312 | Buffer m; | 347 | struct sshbuf *m; |
313 | char *banner; | 348 | char *banner; |
349 | int r; | ||
314 | 350 | ||
315 | debug3("%s entering", __func__); | 351 | debug3("%s entering", __func__); |
316 | 352 | ||
317 | buffer_init(&m); | 353 | if ((m = sshbuf_new()) == NULL) |
318 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTH2_READ_BANNER, &m); | 354 | fatal("%s: sshbuf_new failed", __func__); |
319 | buffer_clear(&m); | 355 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTH2_READ_BANNER, m); |
356 | sshbuf_reset(m); | ||
320 | 357 | ||
321 | mm_request_receive_expect(pmonitor->m_recvfd, | 358 | mm_request_receive_expect(pmonitor->m_recvfd, |
322 | MONITOR_ANS_AUTH2_READ_BANNER, &m); | 359 | MONITOR_ANS_AUTH2_READ_BANNER, m); |
323 | banner = buffer_get_string(&m, NULL); | 360 | if ((r = sshbuf_get_cstring(m, &banner, NULL)) != 0) |
324 | buffer_free(&m); | 361 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
362 | sshbuf_free(m); | ||
325 | 363 | ||
326 | /* treat empty banner as missing banner */ | 364 | /* treat empty banner as missing banner */ |
327 | if (strlen(banner) == 0) { | 365 | if (strlen(banner) == 0) { |
@@ -336,41 +374,55 @@ mm_auth2_read_banner(void) | |||
336 | void | 374 | void |
337 | mm_inform_authserv(char *service, char *style) | 375 | mm_inform_authserv(char *service, char *style) |
338 | { | 376 | { |
339 | Buffer m; | 377 | struct sshbuf *m; |
378 | int r; | ||
340 | 379 | ||
341 | debug3("%s entering", __func__); | 380 | debug3("%s entering", __func__); |
342 | 381 | ||
343 | buffer_init(&m); | 382 | if ((m = sshbuf_new()) == NULL) |
344 | buffer_put_cstring(&m, service); | 383 | fatal("%s: sshbuf_new failed", __func__); |
345 | buffer_put_cstring(&m, style ? style : ""); | 384 | if ((r = sshbuf_put_cstring(m, service)) != 0 || |
385 | (r = sshbuf_put_cstring(m, style ? style : "")) != 0) | ||
386 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
346 | 387 | ||
347 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHSERV, &m); | 388 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHSERV, m); |
348 | 389 | ||
349 | buffer_free(&m); | 390 | sshbuf_free(m); |
350 | } | 391 | } |
351 | 392 | ||
352 | /* Do the password authentication */ | 393 | /* Do the password authentication */ |
353 | int | 394 | int |
354 | mm_auth_password(struct ssh *ssh, char *password) | 395 | mm_auth_password(struct ssh *ssh, char *password) |
355 | { | 396 | { |
356 | Buffer m; | 397 | struct sshbuf *m; |
357 | int authenticated = 0; | 398 | int r, authenticated = 0; |
399 | #ifdef USE_PAM | ||
400 | u_int maxtries = 0; | ||
401 | #endif | ||
358 | 402 | ||
359 | debug3("%s entering", __func__); | 403 | debug3("%s entering", __func__); |
360 | 404 | ||
361 | buffer_init(&m); | 405 | if ((m = sshbuf_new()) == NULL) |
362 | buffer_put_cstring(&m, password); | 406 | fatal("%s: sshbuf_new failed", __func__); |
363 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHPASSWORD, &m); | 407 | if ((r = sshbuf_put_cstring(m, password)) != 0) |
408 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
409 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHPASSWORD, m); | ||
364 | 410 | ||
365 | debug3("%s: waiting for MONITOR_ANS_AUTHPASSWORD", __func__); | 411 | debug3("%s: waiting for MONITOR_ANS_AUTHPASSWORD", __func__); |
366 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUTHPASSWORD, &m); | 412 | mm_request_receive_expect(pmonitor->m_recvfd, |
413 | MONITOR_ANS_AUTHPASSWORD, m); | ||
367 | 414 | ||
368 | authenticated = buffer_get_int(&m); | 415 | if ((r = sshbuf_get_u32(m, &authenticated)) != 0) |
416 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
369 | #ifdef USE_PAM | 417 | #ifdef USE_PAM |
370 | sshpam_set_maxtries_reached(buffer_get_int(&m)); | 418 | if ((r = sshbuf_get_u32(m, &maxtries)) != 0) |
419 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
420 | if (maxtries > INT_MAX) | ||
421 | fatal("%s: bad maxtries %u", __func__, maxtries); | ||
422 | sshpam_set_maxtries_reached(maxtries); | ||
371 | #endif | 423 | #endif |
372 | 424 | ||
373 | buffer_free(&m); | 425 | sshbuf_free(m); |
374 | 426 | ||
375 | debug3("%s: user %sauthenticated", | 427 | debug3("%s: user %sauthenticated", |
376 | __func__, authenticated ? "" : "not "); | 428 | __func__, authenticated ? "" : "not "); |
@@ -396,9 +448,7 @@ int | |||
396 | mm_key_allowed(enum mm_keytype type, const char *user, const char *host, | 448 | mm_key_allowed(enum mm_keytype type, const char *user, const char *host, |
397 | struct sshkey *key, int pubkey_auth_attempt, struct sshauthopt **authoptp) | 449 | struct sshkey *key, int pubkey_auth_attempt, struct sshauthopt **authoptp) |
398 | { | 450 | { |
399 | Buffer m; | 451 | struct sshbuf *m; |
400 | u_char *blob; | ||
401 | u_int len; | ||
402 | int r, allowed = 0; | 452 | int r, allowed = 0; |
403 | struct sshauthopt *opts = NULL; | 453 | struct sshauthopt *opts = NULL; |
404 | 454 | ||
@@ -407,31 +457,29 @@ mm_key_allowed(enum mm_keytype type, const char *user, const char *host, | |||
407 | if (authoptp != NULL) | 457 | if (authoptp != NULL) |
408 | *authoptp = NULL; | 458 | *authoptp = NULL; |
409 | 459 | ||
410 | /* Convert the key to a blob and the pass it over */ | 460 | if ((m = sshbuf_new()) == NULL) |
411 | if (!key_to_blob(key, &blob, &len)) | 461 | fatal("%s: sshbuf_new failed", __func__); |
412 | return 0; | 462 | if ((r = sshbuf_put_u32(m, type)) != 0 || |
413 | 463 | (r = sshbuf_put_cstring(m, user ? user : "")) != 0 || | |
414 | buffer_init(&m); | 464 | (r = sshbuf_put_cstring(m, host ? host : "")) != 0 || |
415 | buffer_put_int(&m, type); | 465 | (r = sshkey_puts(key, m)) != 0 || |
416 | buffer_put_cstring(&m, user ? user : ""); | 466 | (r = sshbuf_put_u32(m, pubkey_auth_attempt)) != 0) |
417 | buffer_put_cstring(&m, host ? host : ""); | 467 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
418 | buffer_put_string(&m, blob, len); | ||
419 | buffer_put_int(&m, pubkey_auth_attempt); | ||
420 | free(blob); | ||
421 | 468 | ||
422 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m); | 469 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, m); |
423 | 470 | ||
424 | debug3("%s: waiting for MONITOR_ANS_KEYALLOWED", __func__); | 471 | debug3("%s: waiting for MONITOR_ANS_KEYALLOWED", __func__); |
425 | mm_request_receive_expect(pmonitor->m_recvfd, | 472 | mm_request_receive_expect(pmonitor->m_recvfd, |
426 | MONITOR_ANS_KEYALLOWED, &m); | 473 | MONITOR_ANS_KEYALLOWED, m); |
427 | 474 | ||
428 | allowed = buffer_get_int(&m); | 475 | if ((r = sshbuf_get_u32(m, &allowed)) != 0) |
476 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
429 | if (allowed && type == MM_USERKEY) { | 477 | if (allowed && type == MM_USERKEY) { |
430 | if ((r = sshauthopt_deserialise(&m, &opts)) != 0) | 478 | if ((r = sshauthopt_deserialise(m, &opts)) != 0) |
431 | fatal("%s: sshauthopt_deserialise: %s", | 479 | fatal("%s: sshauthopt_deserialise: %s", |
432 | __func__, ssh_err(r)); | 480 | __func__, ssh_err(r)); |
433 | } | 481 | } |
434 | buffer_free(&m); | 482 | sshbuf_free(m); |
435 | 483 | ||
436 | if (authoptp != NULL) { | 484 | if (authoptp != NULL) { |
437 | *authoptp = opts; | 485 | *authoptp = opts; |
@@ -452,32 +500,31 @@ int | |||
452 | mm_sshkey_verify(const struct sshkey *key, const u_char *sig, size_t siglen, | 500 | mm_sshkey_verify(const struct sshkey *key, const u_char *sig, size_t siglen, |
453 | const u_char *data, size_t datalen, const char *sigalg, u_int compat) | 501 | const u_char *data, size_t datalen, const char *sigalg, u_int compat) |
454 | { | 502 | { |
455 | Buffer m; | 503 | struct sshbuf *m; |
456 | u_char *blob; | ||
457 | u_int len; | ||
458 | u_int encoded_ret = 0; | 504 | u_int encoded_ret = 0; |
505 | int r; | ||
459 | 506 | ||
460 | debug3("%s entering", __func__); | 507 | debug3("%s entering", __func__); |
461 | 508 | ||
462 | /* Convert the key to a blob and the pass it over */ | ||
463 | if (!key_to_blob(key, &blob, &len)) | ||
464 | return (0); | ||
465 | 509 | ||
466 | buffer_init(&m); | 510 | if ((m = sshbuf_new()) == NULL) |
467 | buffer_put_string(&m, blob, len); | 511 | fatal("%s: sshbuf_new failed", __func__); |
468 | buffer_put_string(&m, sig, siglen); | 512 | if ((r = sshkey_puts(key, m)) != 0 || |
469 | buffer_put_string(&m, data, datalen); | 513 | (r = sshbuf_put_string(m, sig, siglen)) != 0 || |
470 | buffer_put_cstring(&m, sigalg == NULL ? "" : sigalg); | 514 | (r = sshbuf_put_string(m, data, datalen)) != 0 || |
471 | free(blob); | 515 | (r = sshbuf_put_cstring(m, sigalg == NULL ? "" : sigalg)) != 0) |
516 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
472 | 517 | ||
473 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m); | 518 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, m); |
474 | 519 | ||
475 | debug3("%s: waiting for MONITOR_ANS_KEYVERIFY", __func__); | 520 | debug3("%s: waiting for MONITOR_ANS_KEYVERIFY", __func__); |
476 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KEYVERIFY, &m); | 521 | mm_request_receive_expect(pmonitor->m_recvfd, |
522 | MONITOR_ANS_KEYVERIFY, m); | ||
477 | 523 | ||
478 | encoded_ret = buffer_get_int(&m); | 524 | if ((r = sshbuf_get_u32(m, &encoded_ret)) != 0) |
525 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
479 | 526 | ||
480 | buffer_free(&m); | 527 | sshbuf_free(m); |
481 | 528 | ||
482 | if (encoded_ret != 0) | 529 | if (encoded_ret != 0) |
483 | return SSH_ERR_SIGNATURE_INVALID; | 530 | return SSH_ERR_SIGNATURE_INVALID; |
@@ -504,9 +551,9 @@ mm_send_keystate(struct monitor *monitor) | |||
504 | int | 551 | int |
505 | mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen) | 552 | mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen) |
506 | { | 553 | { |
507 | Buffer m; | 554 | struct sshbuf *m; |
508 | char *p, *msg; | 555 | char *p, *msg; |
509 | int success = 0, tmp1 = -1, tmp2 = -1; | 556 | int success = 0, tmp1 = -1, tmp2 = -1, r; |
510 | 557 | ||
511 | /* Kludge: ensure there are fds free to receive the pty/tty */ | 558 | /* Kludge: ensure there are fds free to receive the pty/tty */ |
512 | if ((tmp1 = dup(pmonitor->m_recvfd)) == -1 || | 559 | if ((tmp1 = dup(pmonitor->m_recvfd)) == -1 || |
@@ -521,26 +568,30 @@ mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen) | |||
521 | close(tmp1); | 568 | close(tmp1); |
522 | close(tmp2); | 569 | close(tmp2); |
523 | 570 | ||
524 | buffer_init(&m); | 571 | if ((m = sshbuf_new()) == NULL) |
525 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PTY, &m); | 572 | fatal("%s: sshbuf_new failed", __func__); |
573 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PTY, m); | ||
526 | 574 | ||
527 | debug3("%s: waiting for MONITOR_ANS_PTY", __func__); | 575 | debug3("%s: waiting for MONITOR_ANS_PTY", __func__); |
528 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PTY, &m); | 576 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PTY, m); |
529 | 577 | ||
530 | success = buffer_get_int(&m); | 578 | if ((r = sshbuf_get_u32(m, &success)) != 0) |
579 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
531 | if (success == 0) { | 580 | if (success == 0) { |
532 | debug3("%s: pty alloc failed", __func__); | 581 | debug3("%s: pty alloc failed", __func__); |
533 | buffer_free(&m); | 582 | sshbuf_free(m); |
534 | return (0); | 583 | return (0); |
535 | } | 584 | } |
536 | p = buffer_get_string(&m, NULL); | 585 | if ((r = sshbuf_get_cstring(m, &p, NULL)) != 0 || |
537 | msg = buffer_get_string(&m, NULL); | 586 | (r = sshbuf_get_cstring(m, &msg, NULL)) != 0) |
538 | buffer_free(&m); | 587 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
588 | sshbuf_free(m); | ||
539 | 589 | ||
540 | strlcpy(namebuf, p, namebuflen); /* Possible truncation */ | 590 | strlcpy(namebuf, p, namebuflen); /* Possible truncation */ |
541 | free(p); | 591 | free(p); |
542 | 592 | ||
543 | buffer_append(&loginmsg, msg, strlen(msg)); | 593 | if ((r = sshbuf_put(loginmsg, msg, strlen(msg))) != 0) |
594 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
544 | free(msg); | 595 | free(msg); |
545 | 596 | ||
546 | if ((*ptyfd = mm_receive_fd(pmonitor->m_recvfd)) == -1 || | 597 | if ((*ptyfd = mm_receive_fd(pmonitor->m_recvfd)) == -1 || |
@@ -554,14 +605,17 @@ mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen) | |||
554 | void | 605 | void |
555 | mm_session_pty_cleanup2(Session *s) | 606 | mm_session_pty_cleanup2(Session *s) |
556 | { | 607 | { |
557 | Buffer m; | 608 | struct sshbuf *m; |
609 | int r; | ||
558 | 610 | ||
559 | if (s->ttyfd == -1) | 611 | if (s->ttyfd == -1) |
560 | return; | 612 | return; |
561 | buffer_init(&m); | 613 | if ((m = sshbuf_new()) == NULL) |
562 | buffer_put_cstring(&m, s->tty); | 614 | fatal("%s: sshbuf_new failed", __func__); |
563 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PTYCLEANUP, &m); | 615 | if ((r = sshbuf_put_cstring(m, s->tty)) != 0) |
564 | buffer_free(&m); | 616 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
617 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PTYCLEANUP, m); | ||
618 | sshbuf_free(m); | ||
565 | 619 | ||
566 | /* closed dup'ed master */ | 620 | /* closed dup'ed master */ |
567 | if (s->ptymaster != -1 && close(s->ptymaster) < 0) | 621 | if (s->ptymaster != -1 && close(s->ptymaster) < 0) |
@@ -576,40 +630,44 @@ mm_session_pty_cleanup2(Session *s) | |||
576 | void | 630 | void |
577 | mm_start_pam(Authctxt *authctxt) | 631 | mm_start_pam(Authctxt *authctxt) |
578 | { | 632 | { |
579 | Buffer m; | 633 | struct sshbuf *m; |
580 | 634 | ||
581 | debug3("%s entering", __func__); | 635 | debug3("%s entering", __func__); |
582 | if (!options.use_pam) | 636 | if (!options.use_pam) |
583 | fatal("UsePAM=no, but ended up in %s anyway", __func__); | 637 | fatal("UsePAM=no, but ended up in %s anyway", __func__); |
638 | if ((m = sshbuf_new()) == NULL) | ||
639 | fatal("%s: sshbuf_new failed", __func__); | ||
640 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_START, m); | ||
584 | 641 | ||
585 | buffer_init(&m); | 642 | sshbuf_free(m); |
586 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_START, &m); | ||
587 | |||
588 | buffer_free(&m); | ||
589 | } | 643 | } |
590 | 644 | ||
591 | u_int | 645 | u_int |
592 | mm_do_pam_account(void) | 646 | mm_do_pam_account(void) |
593 | { | 647 | { |
594 | Buffer m; | 648 | struct sshbuf *m; |
595 | u_int ret; | 649 | u_int ret; |
596 | char *msg; | 650 | char *msg; |
651 | size_t msglen; | ||
652 | int r; | ||
597 | 653 | ||
598 | debug3("%s entering", __func__); | 654 | debug3("%s entering", __func__); |
599 | if (!options.use_pam) | 655 | if (!options.use_pam) |
600 | fatal("UsePAM=no, but ended up in %s anyway", __func__); | 656 | fatal("UsePAM=no, but ended up in %s anyway", __func__); |
601 | 657 | ||
602 | buffer_init(&m); | 658 | if ((m = sshbuf_new()) == NULL) |
603 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_ACCOUNT, &m); | 659 | fatal("%s: sshbuf_new failed", __func__); |
660 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_ACCOUNT, m); | ||
604 | 661 | ||
605 | mm_request_receive_expect(pmonitor->m_recvfd, | 662 | mm_request_receive_expect(pmonitor->m_recvfd, |
606 | MONITOR_ANS_PAM_ACCOUNT, &m); | 663 | MONITOR_ANS_PAM_ACCOUNT, m); |
607 | ret = buffer_get_int(&m); | 664 | if ((r = sshbuf_get_u32(m, &ret)) != 0 || |
608 | msg = buffer_get_string(&m, NULL); | 665 | (r = sshbuf_get_cstring(m, &msg, &msglen)) != 0 || |
609 | buffer_append(&loginmsg, msg, strlen(msg)); | 666 | (r = sshbuf_put(loginmsg, msg, msglen)) != 0) |
610 | free(msg); | 667 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
611 | 668 | ||
612 | buffer_free(&m); | 669 | free(msg); |
670 | sshbuf_free(m); | ||
613 | 671 | ||
614 | debug3("%s returning %d", __func__, ret); | 672 | debug3("%s returning %d", __func__, ret); |
615 | 673 | ||
@@ -619,21 +677,24 @@ mm_do_pam_account(void) | |||
619 | void * | 677 | void * |
620 | mm_sshpam_init_ctx(Authctxt *authctxt) | 678 | mm_sshpam_init_ctx(Authctxt *authctxt) |
621 | { | 679 | { |
622 | Buffer m; | 680 | struct sshbuf *m; |
623 | int success; | 681 | int r, success; |
624 | 682 | ||
625 | debug3("%s", __func__); | 683 | debug3("%s", __func__); |
626 | buffer_init(&m); | 684 | if ((m = sshbuf_new()) == NULL) |
627 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m); | 685 | fatal("%s: sshbuf_new failed", __func__); |
686 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, m); | ||
628 | debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__); | 687 | debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__); |
629 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m); | 688 | mm_request_receive_expect(pmonitor->m_recvfd, |
630 | success = buffer_get_int(&m); | 689 | MONITOR_ANS_PAM_INIT_CTX, m); |
690 | if ((r = sshbuf_get_u32(m, &success)) != 0) | ||
691 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
631 | if (success == 0) { | 692 | if (success == 0) { |
632 | debug3("%s: pam_init_ctx failed", __func__); | 693 | debug3("%s: pam_init_ctx failed", __func__); |
633 | buffer_free(&m); | 694 | sshbuf_free(m); |
634 | return (NULL); | 695 | return (NULL); |
635 | } | 696 | } |
636 | buffer_free(&m); | 697 | sshbuf_free(m); |
637 | return (authctxt); | 698 | return (authctxt); |
638 | } | 699 | } |
639 | 700 | ||
@@ -641,66 +702,79 @@ int | |||
641 | mm_sshpam_query(void *ctx, char **name, char **info, | 702 | mm_sshpam_query(void *ctx, char **name, char **info, |
642 | u_int *num, char ***prompts, u_int **echo_on) | 703 | u_int *num, char ***prompts, u_int **echo_on) |
643 | { | 704 | { |
644 | Buffer m; | 705 | struct sshbuf *m; |
645 | u_int i; | 706 | u_int i, n; |
646 | int ret; | 707 | int r, ret; |
647 | 708 | ||
648 | debug3("%s", __func__); | 709 | debug3("%s", __func__); |
649 | buffer_init(&m); | 710 | if ((m = sshbuf_new()) == NULL) |
650 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_QUERY, &m); | 711 | fatal("%s: sshbuf_new failed", __func__); |
712 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_QUERY, m); | ||
651 | debug3("%s: waiting for MONITOR_ANS_PAM_QUERY", __func__); | 713 | debug3("%s: waiting for MONITOR_ANS_PAM_QUERY", __func__); |
652 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_QUERY, &m); | 714 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_QUERY, m); |
653 | ret = buffer_get_int(&m); | 715 | if ((r = sshbuf_get_u32(m, &ret)) != 0 || |
716 | (r = sshbuf_get_cstring(m, name, NULL)) != 0 || | ||
717 | (r = sshbuf_get_cstring(m, info, NULL)) != 0 || | ||
718 | (r = sshbuf_get_u32(m, &n)) != 0 || | ||
719 | (r = sshbuf_get_u32(m, num)) != 0) | ||
720 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
654 | debug3("%s: pam_query returned %d", __func__, ret); | 721 | debug3("%s: pam_query returned %d", __func__, ret); |
655 | *name = buffer_get_string(&m, NULL); | 722 | sshpam_set_maxtries_reached(n); |
656 | *info = buffer_get_string(&m, NULL); | ||
657 | sshpam_set_maxtries_reached(buffer_get_int(&m)); | ||
658 | *num = buffer_get_int(&m); | ||
659 | if (*num > PAM_MAX_NUM_MSG) | 723 | if (*num > PAM_MAX_NUM_MSG) |
660 | fatal("%s: recieved %u PAM messages, expected <= %u", | 724 | fatal("%s: received %u PAM messages, expected <= %u", |
661 | __func__, *num, PAM_MAX_NUM_MSG); | 725 | __func__, *num, PAM_MAX_NUM_MSG); |
662 | *prompts = xcalloc((*num + 1), sizeof(char *)); | 726 | *prompts = xcalloc((*num + 1), sizeof(char *)); |
663 | *echo_on = xcalloc((*num + 1), sizeof(u_int)); | 727 | *echo_on = xcalloc((*num + 1), sizeof(u_int)); |
664 | for (i = 0; i < *num; ++i) { | 728 | for (i = 0; i < *num; ++i) { |
665 | (*prompts)[i] = buffer_get_string(&m, NULL); | 729 | if ((r = sshbuf_get_cstring(m, &((*prompts)[i]), NULL)) != 0 || |
666 | (*echo_on)[i] = buffer_get_int(&m); | 730 | (r = sshbuf_get_u32(m, &((*echo_on)[i]))) != 0) |
731 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
667 | } | 732 | } |
668 | buffer_free(&m); | 733 | sshbuf_free(m); |
669 | return (ret); | 734 | return (ret); |
670 | } | 735 | } |
671 | 736 | ||
672 | int | 737 | int |
673 | mm_sshpam_respond(void *ctx, u_int num, char **resp) | 738 | mm_sshpam_respond(void *ctx, u_int num, char **resp) |
674 | { | 739 | { |
675 | Buffer m; | 740 | struct sshbuf *m; |
676 | u_int i; | 741 | u_int n, i; |
677 | int ret; | 742 | int r, ret; |
678 | 743 | ||
679 | debug3("%s", __func__); | 744 | debug3("%s", __func__); |
680 | buffer_init(&m); | 745 | if ((m = sshbuf_new()) == NULL) |
681 | buffer_put_int(&m, num); | 746 | fatal("%s: sshbuf_new failed", __func__); |
682 | for (i = 0; i < num; ++i) | 747 | if ((r = sshbuf_put_u32(m, num)) != 0) |
683 | buffer_put_cstring(&m, resp[i]); | 748 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
684 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_RESPOND, &m); | 749 | for (i = 0; i < num; ++i) { |
750 | if ((r = sshbuf_put_cstring(m, resp[i])) != 0) | ||
751 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
752 | } | ||
753 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_RESPOND, m); | ||
685 | debug3("%s: waiting for MONITOR_ANS_PAM_RESPOND", __func__); | 754 | debug3("%s: waiting for MONITOR_ANS_PAM_RESPOND", __func__); |
686 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_RESPOND, &m); | 755 | mm_request_receive_expect(pmonitor->m_recvfd, |
687 | ret = buffer_get_int(&m); | 756 | MONITOR_ANS_PAM_RESPOND, m); |
757 | if ((r = sshbuf_get_u32(m, &n)) != 0) | ||
758 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
759 | ret = (int)n; /* XXX */ | ||
688 | debug3("%s: pam_respond returned %d", __func__, ret); | 760 | debug3("%s: pam_respond returned %d", __func__, ret); |
689 | buffer_free(&m); | 761 | sshbuf_free(m); |
690 | return (ret); | 762 | return (ret); |
691 | } | 763 | } |
692 | 764 | ||
693 | void | 765 | void |
694 | mm_sshpam_free_ctx(void *ctxtp) | 766 | mm_sshpam_free_ctx(void *ctxtp) |
695 | { | 767 | { |
696 | Buffer m; | 768 | struct sshbuf *m; |
697 | 769 | ||
698 | debug3("%s", __func__); | 770 | debug3("%s", __func__); |
699 | buffer_init(&m); | 771 | if ((m = sshbuf_new()) == NULL) |
700 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_FREE_CTX, &m); | 772 | fatal("%s: sshbuf_new failed", __func__); |
773 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_FREE_CTX, m); | ||
701 | debug3("%s: waiting for MONITOR_ANS_PAM_FREE_CTX", __func__); | 774 | debug3("%s: waiting for MONITOR_ANS_PAM_FREE_CTX", __func__); |
702 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_FREE_CTX, &m); | 775 | mm_request_receive_expect(pmonitor->m_recvfd, |
703 | buffer_free(&m); | 776 | MONITOR_ANS_PAM_FREE_CTX, m); |
777 | sshbuf_free(m); | ||
704 | } | 778 | } |
705 | #endif /* USE_PAM */ | 779 | #endif /* USE_PAM */ |
706 | 780 | ||
@@ -709,11 +783,12 @@ mm_sshpam_free_ctx(void *ctxtp) | |||
709 | void | 783 | void |
710 | mm_terminate(void) | 784 | mm_terminate(void) |
711 | { | 785 | { |
712 | Buffer m; | 786 | struct sshbuf *m; |
713 | 787 | ||
714 | buffer_init(&m); | 788 | if ((m = sshbuf_new()) == NULL) |
715 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_TERM, &m); | 789 | fatal("%s: sshbuf_new failed", __func__); |
716 | buffer_free(&m); | 790 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_TERM, m); |
791 | sshbuf_free(m); | ||
717 | } | 792 | } |
718 | 793 | ||
719 | static void | 794 | static void |
@@ -732,27 +807,31 @@ int | |||
732 | mm_bsdauth_query(void *ctx, char **name, char **infotxt, | 807 | mm_bsdauth_query(void *ctx, char **name, char **infotxt, |
733 | u_int *numprompts, char ***prompts, u_int **echo_on) | 808 | u_int *numprompts, char ***prompts, u_int **echo_on) |
734 | { | 809 | { |
735 | Buffer m; | 810 | struct sshbuf *m; |
736 | u_int success; | 811 | u_int success; |
737 | char *challenge; | 812 | char *challenge; |
813 | int r; | ||
738 | 814 | ||
739 | debug3("%s: entering", __func__); | 815 | debug3("%s: entering", __func__); |
740 | 816 | ||
741 | buffer_init(&m); | 817 | if ((m = sshbuf_new()) == NULL) |
742 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_BSDAUTHQUERY, &m); | 818 | fatal("%s: sshbuf_new failed", __func__); |
819 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_BSDAUTHQUERY, m); | ||
743 | 820 | ||
744 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_BSDAUTHQUERY, | 821 | mm_request_receive_expect(pmonitor->m_recvfd, |
745 | &m); | 822 | MONITOR_ANS_BSDAUTHQUERY, m); |
746 | success = buffer_get_int(&m); | 823 | if ((r = sshbuf_get_u32(m, &success)) != 0) |
824 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
747 | if (success == 0) { | 825 | if (success == 0) { |
748 | debug3("%s: no challenge", __func__); | 826 | debug3("%s: no challenge", __func__); |
749 | buffer_free(&m); | 827 | sshbuf_free(m); |
750 | return (-1); | 828 | return (-1); |
751 | } | 829 | } |
752 | 830 | ||
753 | /* Get the challenge, and format the response */ | 831 | /* Get the challenge, and format the response */ |
754 | challenge = buffer_get_string(&m, NULL); | 832 | if ((r = sshbuf_get_cstring(m, &challenge, NULL)) != 0) |
755 | buffer_free(&m); | 833 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
834 | sshbuf_free(m); | ||
756 | 835 | ||
757 | mm_chall_setup(name, infotxt, numprompts, prompts, echo_on); | 836 | mm_chall_setup(name, infotxt, numprompts, prompts, echo_on); |
758 | (*prompts)[0] = challenge; | 837 | (*prompts)[0] = challenge; |
@@ -765,114 +844,62 @@ mm_bsdauth_query(void *ctx, char **name, char **infotxt, | |||
765 | int | 844 | int |
766 | mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses) | 845 | mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses) |
767 | { | 846 | { |
768 | Buffer m; | 847 | struct sshbuf *m; |
769 | int authok; | 848 | int r, authok; |
770 | |||
771 | debug3("%s: entering", __func__); | ||
772 | if (numresponses != 1) | ||
773 | return (-1); | ||
774 | |||
775 | buffer_init(&m); | ||
776 | buffer_put_cstring(&m, responses[0]); | ||
777 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_BSDAUTHRESPOND, &m); | ||
778 | |||
779 | mm_request_receive_expect(pmonitor->m_recvfd, | ||
780 | MONITOR_ANS_BSDAUTHRESPOND, &m); | ||
781 | |||
782 | authok = buffer_get_int(&m); | ||
783 | buffer_free(&m); | ||
784 | |||
785 | return ((authok == 0) ? -1 : 0); | ||
786 | } | ||
787 | |||
788 | #ifdef SKEY | ||
789 | int | ||
790 | mm_skey_query(void *ctx, char **name, char **infotxt, | ||
791 | u_int *numprompts, char ***prompts, u_int **echo_on) | ||
792 | { | ||
793 | Buffer m; | ||
794 | u_int success; | ||
795 | char *challenge; | ||
796 | |||
797 | debug3("%s: entering", __func__); | ||
798 | |||
799 | buffer_init(&m); | ||
800 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SKEYQUERY, &m); | ||
801 | |||
802 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SKEYQUERY, | ||
803 | &m); | ||
804 | success = buffer_get_int(&m); | ||
805 | if (success == 0) { | ||
806 | debug3("%s: no challenge", __func__); | ||
807 | buffer_free(&m); | ||
808 | return (-1); | ||
809 | } | ||
810 | |||
811 | /* Get the challenge, and format the response */ | ||
812 | challenge = buffer_get_string(&m, NULL); | ||
813 | buffer_free(&m); | ||
814 | |||
815 | debug3("%s: received challenge: %s", __func__, challenge); | ||
816 | |||
817 | mm_chall_setup(name, infotxt, numprompts, prompts, echo_on); | ||
818 | |||
819 | xasprintf(*prompts, "%s%s", challenge, SKEY_PROMPT); | ||
820 | free(challenge); | ||
821 | |||
822 | return (0); | ||
823 | } | ||
824 | |||
825 | int | ||
826 | mm_skey_respond(void *ctx, u_int numresponses, char **responses) | ||
827 | { | ||
828 | Buffer m; | ||
829 | int authok; | ||
830 | 849 | ||
831 | debug3("%s: entering", __func__); | 850 | debug3("%s: entering", __func__); |
832 | if (numresponses != 1) | 851 | if (numresponses != 1) |
833 | return (-1); | 852 | return (-1); |
834 | 853 | ||
835 | buffer_init(&m); | 854 | if ((m = sshbuf_new()) == NULL) |
836 | buffer_put_cstring(&m, responses[0]); | 855 | fatal("%s: sshbuf_new failed", __func__); |
837 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SKEYRESPOND, &m); | 856 | if ((r = sshbuf_put_cstring(m, responses[0])) != 0) |
857 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
858 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_BSDAUTHRESPOND, m); | ||
838 | 859 | ||
839 | mm_request_receive_expect(pmonitor->m_recvfd, | 860 | mm_request_receive_expect(pmonitor->m_recvfd, |
840 | MONITOR_ANS_SKEYRESPOND, &m); | 861 | MONITOR_ANS_BSDAUTHRESPOND, m); |
841 | 862 | ||
842 | authok = buffer_get_int(&m); | 863 | if ((r = sshbuf_get_u32(m, &authok)) != 0) |
843 | buffer_free(&m); | 864 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
865 | sshbuf_free(m); | ||
844 | 866 | ||
845 | return ((authok == 0) ? -1 : 0); | 867 | return ((authok == 0) ? -1 : 0); |
846 | } | 868 | } |
847 | #endif /* SKEY */ | ||
848 | 869 | ||
849 | #ifdef SSH_AUDIT_EVENTS | 870 | #ifdef SSH_AUDIT_EVENTS |
850 | void | 871 | void |
851 | mm_audit_event(ssh_audit_event_t event) | 872 | mm_audit_event(ssh_audit_event_t event) |
852 | { | 873 | { |
853 | Buffer m; | 874 | struct sshbuf *m; |
875 | int r; | ||
854 | 876 | ||
855 | debug3("%s entering", __func__); | 877 | debug3("%s entering", __func__); |
856 | 878 | ||
857 | buffer_init(&m); | 879 | if ((m = sshbuf_new()) == NULL) |
858 | buffer_put_int(&m, event); | 880 | fatal("%s: sshbuf_new failed", __func__); |
881 | if ((r = sshbuf_put_u32(m, event)) != 0) | ||
882 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
859 | 883 | ||
860 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_EVENT, &m); | 884 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_EVENT, m); |
861 | buffer_free(&m); | 885 | sshbuf_free(m); |
862 | } | 886 | } |
863 | 887 | ||
864 | void | 888 | void |
865 | mm_audit_run_command(const char *command) | 889 | mm_audit_run_command(const char *command) |
866 | { | 890 | { |
867 | Buffer m; | 891 | struct sshbuf *m; |
892 | int r; | ||
868 | 893 | ||
869 | debug3("%s entering command %s", __func__, command); | 894 | debug3("%s entering command %s", __func__, command); |
870 | 895 | ||
871 | buffer_init(&m); | 896 | if ((m = sshbuf_new()) == NULL) |
872 | buffer_put_cstring(&m, command); | 897 | fatal("%s: sshbuf_new failed", __func__); |
898 | if ((r = sshbuf_put_cstring(m, command)) != 0) | ||
899 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
873 | 900 | ||
874 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_COMMAND, &m); | 901 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUDIT_COMMAND, m); |
875 | buffer_free(&m); | 902 | sshbuf_free(m); |
876 | } | 903 | } |
877 | #endif /* SSH_AUDIT_EVENTS */ | 904 | #endif /* SSH_AUDIT_EVENTS */ |
878 | 905 | ||
@@ -880,45 +907,55 @@ mm_audit_run_command(const char *command) | |||
880 | OM_uint32 | 907 | OM_uint32 |
881 | mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID goid) | 908 | mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID goid) |
882 | { | 909 | { |
883 | Buffer m; | 910 | struct sshbuf *m; |
884 | OM_uint32 major; | 911 | OM_uint32 major; |
912 | int r; | ||
885 | 913 | ||
886 | /* Client doesn't get to see the context */ | 914 | /* Client doesn't get to see the context */ |
887 | *ctx = NULL; | 915 | *ctx = NULL; |
888 | 916 | ||
889 | buffer_init(&m); | 917 | if ((m = sshbuf_new()) == NULL) |
890 | buffer_put_string(&m, goid->elements, goid->length); | 918 | fatal("%s: sshbuf_new failed", __func__); |
919 | if ((r = sshbuf_put_string(m, goid->elements, goid->length)) != 0) | ||
920 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
891 | 921 | ||
892 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSETUP, &m); | 922 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSETUP, m); |
893 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSETUP, &m); | 923 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSETUP, m); |
894 | 924 | ||
895 | major = buffer_get_int(&m); | 925 | if ((r = sshbuf_get_u32(m, &major)) != 0) |
926 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
896 | 927 | ||
897 | buffer_free(&m); | 928 | sshbuf_free(m); |
898 | return (major); | 929 | return (major); |
899 | } | 930 | } |
900 | 931 | ||
901 | OM_uint32 | 932 | OM_uint32 |
902 | mm_ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *in, | 933 | mm_ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *in, |
903 | gss_buffer_desc *out, OM_uint32 *flags) | 934 | gss_buffer_desc *out, OM_uint32 *flagsp) |
904 | { | 935 | { |
905 | Buffer m; | 936 | struct sshbuf *m; |
906 | OM_uint32 major; | 937 | OM_uint32 major; |
907 | u_int len; | 938 | u_int flags; |
908 | 939 | int r; | |
909 | buffer_init(&m); | ||
910 | buffer_put_string(&m, in->value, in->length); | ||
911 | |||
912 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSTEP, &m); | ||
913 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSTEP, &m); | ||
914 | 940 | ||
915 | major = buffer_get_int(&m); | 941 | if ((m = sshbuf_new()) == NULL) |
916 | out->value = buffer_get_string(&m, &len); | 942 | fatal("%s: sshbuf_new failed", __func__); |
917 | out->length = len; | 943 | if ((r = sshbuf_put_string(m, in->value, in->length)) != 0) |
918 | if (flags) | 944 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
919 | *flags = buffer_get_int(&m); | 945 | |
946 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSTEP, m); | ||
947 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSTEP, m); | ||
948 | |||
949 | if ((r = sshbuf_get_u32(m, &major)) != 0 || | ||
950 | (r = ssh_gssapi_get_buffer_desc(m, out)) != 0) | ||
951 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
952 | if (flagsp != NULL) { | ||
953 | if ((r = sshbuf_get_u32(m, &flags)) != 0) | ||
954 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
955 | *flagsp = flags; | ||
956 | } | ||
920 | 957 | ||
921 | buffer_free(&m); | 958 | sshbuf_free(m); |
922 | 959 | ||
923 | return (major); | 960 | return (major); |
924 | } | 961 | } |
@@ -926,39 +963,44 @@ mm_ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *in, | |||
926 | OM_uint32 | 963 | OM_uint32 |
927 | mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) | 964 | mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) |
928 | { | 965 | { |
929 | Buffer m; | 966 | struct sshbuf *m; |
930 | OM_uint32 major; | 967 | OM_uint32 major; |
968 | int r; | ||
931 | 969 | ||
932 | buffer_init(&m); | 970 | if ((m = sshbuf_new()) == NULL) |
933 | buffer_put_string(&m, gssbuf->value, gssbuf->length); | 971 | fatal("%s: sshbuf_new failed", __func__); |
934 | buffer_put_string(&m, gssmic->value, gssmic->length); | 972 | if ((r = sshbuf_put_string(m, gssbuf->value, gssbuf->length)) != 0 || |
973 | (r = sshbuf_put_string(m, gssmic->value, gssmic->length)) != 0) | ||
974 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
935 | 975 | ||
936 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSCHECKMIC, &m); | 976 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSCHECKMIC, m); |
937 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSCHECKMIC, | 977 | mm_request_receive_expect(pmonitor->m_recvfd, |
938 | &m); | 978 | MONITOR_ANS_GSSCHECKMIC, m); |
939 | 979 | ||
940 | major = buffer_get_int(&m); | 980 | if ((r = sshbuf_get_u32(m, &major)) != 0) |
941 | buffer_free(&m); | 981 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); |
982 | sshbuf_free(m); | ||
942 | return(major); | 983 | return(major); |
943 | } | 984 | } |
944 | 985 | ||
945 | int | 986 | int |
946 | mm_ssh_gssapi_userok(char *user) | 987 | mm_ssh_gssapi_userok(char *user) |
947 | { | 988 | { |
948 | Buffer m; | 989 | struct sshbuf *m; |
949 | int authenticated = 0; | 990 | int r, authenticated = 0; |
950 | 991 | ||
951 | buffer_init(&m); | 992 | if ((m = sshbuf_new()) == NULL) |
993 | fatal("%s: sshbuf_new failed", __func__); | ||
952 | 994 | ||
953 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUSEROK, &m); | 995 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUSEROK, m); |
954 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUSEROK, | 996 | mm_request_receive_expect(pmonitor->m_recvfd, |
955 | &m); | 997 | MONITOR_ANS_GSSUSEROK, m); |
956 | 998 | ||
957 | authenticated = buffer_get_int(&m); | 999 | if ((r = sshbuf_get_u32(m, &authenticated)) != 0) |
1000 | fatal("%s: buffer error: %s", __func__, ssh_err(r)); | ||
958 | 1001 | ||
959 | buffer_free(&m); | 1002 | sshbuf_free(m); |
960 | debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); | 1003 | debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); |
961 | return (authenticated); | 1004 | return (authenticated); |
962 | } | 1005 | } |
963 | #endif /* GSSAPI */ | 1006 | #endif /* GSSAPI */ |
964 | |||