diff options
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 126 |
1 files changed, 63 insertions, 63 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index c5e3fb988..fca5ffe50 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.7 2002/05/15 15:47:49 mouring Exp $"); | 28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.8 2002/06/04 23:05:49 markus Exp $"); |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
@@ -65,14 +65,14 @@ mm_request_send(int socket, enum monitor_reqtype type, Buffer *m) | |||
65 | u_char buf[5]; | 65 | u_char buf[5]; |
66 | u_int mlen = buffer_len(m); | 66 | u_int mlen = buffer_len(m); |
67 | 67 | ||
68 | debug3("%s entering: type %d", __FUNCTION__, type); | 68 | debug3("%s entering: type %d", __func__, type); |
69 | 69 | ||
70 | PUT_32BIT(buf, mlen + 1); | 70 | PUT_32BIT(buf, mlen + 1); |
71 | buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ | 71 | buf[4] = (u_char) type; /* 1st byte of payload is mesg-type */ |
72 | if (atomicio(write, socket, buf, sizeof(buf)) != sizeof(buf)) | 72 | if (atomicio(write, socket, buf, sizeof(buf)) != sizeof(buf)) |
73 | fatal("%s: write", __FUNCTION__); | 73 | fatal("%s: write", __func__); |
74 | if (atomicio(write, socket, buffer_ptr(m), mlen) != mlen) | 74 | if (atomicio(write, socket, buffer_ptr(m), mlen) != mlen) |
75 | fatal("%s: write", __FUNCTION__); | 75 | fatal("%s: write", __func__); |
76 | } | 76 | } |
77 | 77 | ||
78 | void | 78 | void |
@@ -82,22 +82,22 @@ mm_request_receive(int socket, Buffer *m) | |||
82 | ssize_t res; | 82 | ssize_t res; |
83 | u_int msg_len; | 83 | u_int msg_len; |
84 | 84 | ||
85 | debug3("%s entering", __FUNCTION__); | 85 | debug3("%s entering", __func__); |
86 | 86 | ||
87 | res = atomicio(read, socket, buf, sizeof(buf)); | 87 | res = atomicio(read, socket, buf, sizeof(buf)); |
88 | if (res != sizeof(buf)) { | 88 | if (res != sizeof(buf)) { |
89 | if (res == 0) | 89 | if (res == 0) |
90 | fatal_cleanup(); | 90 | fatal_cleanup(); |
91 | fatal("%s: read: %ld", __FUNCTION__, (long)res); | 91 | fatal("%s: read: %ld", __func__, (long)res); |
92 | } | 92 | } |
93 | msg_len = GET_32BIT(buf); | 93 | msg_len = GET_32BIT(buf); |
94 | if (msg_len > 256 * 1024) | 94 | if (msg_len > 256 * 1024) |
95 | fatal("%s: read: bad msg_len %d", __FUNCTION__, msg_len); | 95 | fatal("%s: read: bad msg_len %d", __func__, msg_len); |
96 | buffer_clear(m); | 96 | buffer_clear(m); |
97 | buffer_append_space(m, msg_len); | 97 | buffer_append_space(m, msg_len); |
98 | res = atomicio(read, socket, buffer_ptr(m), msg_len); | 98 | res = atomicio(read, socket, buffer_ptr(m), msg_len); |
99 | if (res != msg_len) | 99 | if (res != msg_len) |
100 | fatal("%s: read: %ld != msg_len", __FUNCTION__, (long)res); | 100 | fatal("%s: read: %ld != msg_len", __func__, (long)res); |
101 | } | 101 | } |
102 | 102 | ||
103 | void | 103 | void |
@@ -105,12 +105,12 @@ mm_request_receive_expect(int socket, enum monitor_reqtype type, Buffer *m) | |||
105 | { | 105 | { |
106 | u_char rtype; | 106 | u_char rtype; |
107 | 107 | ||
108 | debug3("%s entering: type %d", __FUNCTION__, type); | 108 | debug3("%s entering: type %d", __func__, type); |
109 | 109 | ||
110 | mm_request_receive(socket, m); | 110 | mm_request_receive(socket, m); |
111 | rtype = buffer_get_char(m); | 111 | rtype = buffer_get_char(m); |
112 | if (rtype != type) | 112 | if (rtype != type) |
113 | fatal("%s: read: rtype %d != type %d", __FUNCTION__, | 113 | fatal("%s: read: rtype %d != type %d", __func__, |
114 | rtype, type); | 114 | rtype, type); |
115 | } | 115 | } |
116 | 116 | ||
@@ -128,21 +128,21 @@ mm_choose_dh(int min, int nbits, int max) | |||
128 | 128 | ||
129 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_MODULI, &m); | 129 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_MODULI, &m); |
130 | 130 | ||
131 | debug3("%s: waiting for MONITOR_ANS_MODULI", __FUNCTION__); | 131 | debug3("%s: waiting for MONITOR_ANS_MODULI", __func__); |
132 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_MODULI, &m); | 132 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_MODULI, &m); |
133 | 133 | ||
134 | success = buffer_get_char(&m); | 134 | success = buffer_get_char(&m); |
135 | if (success == 0) | 135 | if (success == 0) |
136 | fatal("%s: MONITOR_ANS_MODULI failed", __FUNCTION__); | 136 | fatal("%s: MONITOR_ANS_MODULI failed", __func__); |
137 | 137 | ||
138 | if ((p = BN_new()) == NULL) | 138 | if ((p = BN_new()) == NULL) |
139 | fatal("%s: BN_new failed", __FUNCTION__); | 139 | fatal("%s: BN_new failed", __func__); |
140 | if ((g = BN_new()) == NULL) | 140 | if ((g = BN_new()) == NULL) |
141 | fatal("%s: BN_new failed", __FUNCTION__); | 141 | fatal("%s: BN_new failed", __func__); |
142 | buffer_get_bignum2(&m, p); | 142 | buffer_get_bignum2(&m, p); |
143 | buffer_get_bignum2(&m, g); | 143 | buffer_get_bignum2(&m, g); |
144 | 144 | ||
145 | debug3("%s: remaining %d", __FUNCTION__, buffer_len(&m)); | 145 | debug3("%s: remaining %d", __func__, buffer_len(&m)); |
146 | buffer_free(&m); | 146 | buffer_free(&m); |
147 | 147 | ||
148 | return (dh_new_group(g, p)); | 148 | return (dh_new_group(g, p)); |
@@ -154,7 +154,7 @@ mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) | |||
154 | Kex *kex = *pmonitor->m_pkex; | 154 | Kex *kex = *pmonitor->m_pkex; |
155 | Buffer m; | 155 | Buffer m; |
156 | 156 | ||
157 | debug3("%s entering", __FUNCTION__); | 157 | debug3("%s entering", __func__); |
158 | 158 | ||
159 | buffer_init(&m); | 159 | buffer_init(&m); |
160 | buffer_put_int(&m, kex->host_key_index(key)); | 160 | buffer_put_int(&m, kex->host_key_index(key)); |
@@ -162,7 +162,7 @@ mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) | |||
162 | 162 | ||
163 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m); | 163 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m); |
164 | 164 | ||
165 | debug3("%s: waiting for MONITOR_ANS_SIGN", __FUNCTION__); | 165 | debug3("%s: waiting for MONITOR_ANS_SIGN", __func__); |
166 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SIGN, &m); | 166 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SIGN, &m); |
167 | *sigp = buffer_get_string(&m, lenp); | 167 | *sigp = buffer_get_string(&m, lenp); |
168 | buffer_free(&m); | 168 | buffer_free(&m); |
@@ -177,14 +177,14 @@ mm_getpwnamallow(const char *login) | |||
177 | struct passwd *pw; | 177 | struct passwd *pw; |
178 | u_int pwlen; | 178 | u_int pwlen; |
179 | 179 | ||
180 | debug3("%s entering", __FUNCTION__); | 180 | debug3("%s entering", __func__); |
181 | 181 | ||
182 | buffer_init(&m); | 182 | buffer_init(&m); |
183 | buffer_put_cstring(&m, login); | 183 | buffer_put_cstring(&m, login); |
184 | 184 | ||
185 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m); | 185 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PWNAM, &m); |
186 | 186 | ||
187 | debug3("%s: waiting for MONITOR_ANS_PWNAM", __FUNCTION__); | 187 | debug3("%s: waiting for MONITOR_ANS_PWNAM", __func__); |
188 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PWNAM, &m); | 188 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PWNAM, &m); |
189 | 189 | ||
190 | if (buffer_get_char(&m) == 0) { | 190 | if (buffer_get_char(&m) == 0) { |
@@ -193,7 +193,7 @@ mm_getpwnamallow(const char *login) | |||
193 | } | 193 | } |
194 | pw = buffer_get_string(&m, &pwlen); | 194 | pw = buffer_get_string(&m, &pwlen); |
195 | if (pwlen != sizeof(struct passwd)) | 195 | if (pwlen != sizeof(struct passwd)) |
196 | fatal("%s: struct passwd size mismatch", __FUNCTION__); | 196 | fatal("%s: struct passwd size mismatch", __func__); |
197 | pw->pw_name = buffer_get_string(&m, NULL); | 197 | pw->pw_name = buffer_get_string(&m, NULL); |
198 | pw->pw_passwd = buffer_get_string(&m, NULL); | 198 | pw->pw_passwd = buffer_get_string(&m, NULL); |
199 | pw->pw_gecos = buffer_get_string(&m, NULL); | 199 | pw->pw_gecos = buffer_get_string(&m, NULL); |
@@ -212,7 +212,7 @@ char* mm_auth2_read_banner(void) | |||
212 | Buffer m; | 212 | Buffer m; |
213 | char *banner; | 213 | char *banner; |
214 | 214 | ||
215 | debug3("%s entering", __FUNCTION__); | 215 | debug3("%s entering", __func__); |
216 | 216 | ||
217 | buffer_init(&m); | 217 | buffer_init(&m); |
218 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTH2_READ_BANNER, &m); | 218 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTH2_READ_BANNER, &m); |
@@ -232,7 +232,7 @@ mm_inform_authserv(char *service, char *style) | |||
232 | { | 232 | { |
233 | Buffer m; | 233 | Buffer m; |
234 | 234 | ||
235 | debug3("%s entering", __FUNCTION__); | 235 | debug3("%s entering", __func__); |
236 | 236 | ||
237 | buffer_init(&m); | 237 | buffer_init(&m); |
238 | buffer_put_cstring(&m, service); | 238 | buffer_put_cstring(&m, service); |
@@ -250,13 +250,13 @@ mm_auth_password(Authctxt *authctxt, char *password) | |||
250 | Buffer m; | 250 | Buffer m; |
251 | int authenticated = 0; | 251 | int authenticated = 0; |
252 | 252 | ||
253 | debug3("%s entering", __FUNCTION__); | 253 | debug3("%s entering", __func__); |
254 | 254 | ||
255 | buffer_init(&m); | 255 | buffer_init(&m); |
256 | buffer_put_cstring(&m, password); | 256 | buffer_put_cstring(&m, password); |
257 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHPASSWORD, &m); | 257 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHPASSWORD, &m); |
258 | 258 | ||
259 | debug3("%s: waiting for MONITOR_ANS_AUTHPASSWORD", __FUNCTION__); | 259 | debug3("%s: waiting for MONITOR_ANS_AUTHPASSWORD", __func__); |
260 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUTHPASSWORD, &m); | 260 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_AUTHPASSWORD, &m); |
261 | 261 | ||
262 | authenticated = buffer_get_int(&m); | 262 | authenticated = buffer_get_int(&m); |
@@ -264,7 +264,7 @@ mm_auth_password(Authctxt *authctxt, char *password) | |||
264 | buffer_free(&m); | 264 | buffer_free(&m); |
265 | 265 | ||
266 | debug3("%s: user %sauthenticated", | 266 | debug3("%s: user %sauthenticated", |
267 | __FUNCTION__, authenticated ? "" : "not "); | 267 | __func__, authenticated ? "" : "not "); |
268 | return (authenticated); | 268 | return (authenticated); |
269 | } | 269 | } |
270 | 270 | ||
@@ -300,7 +300,7 @@ mm_send_debug(Buffer *m) | |||
300 | 300 | ||
301 | while (buffer_len(m)) { | 301 | while (buffer_len(m)) { |
302 | msg = buffer_get_string(m, NULL); | 302 | msg = buffer_get_string(m, NULL); |
303 | debug3("%s: Sending debug: %s", __FUNCTION__, msg); | 303 | debug3("%s: Sending debug: %s", __func__, msg); |
304 | packet_send_debug("%s", msg); | 304 | packet_send_debug("%s", msg); |
305 | xfree(msg); | 305 | xfree(msg); |
306 | } | 306 | } |
@@ -314,7 +314,7 @@ mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key) | |||
314 | u_int len; | 314 | u_int len; |
315 | int allowed = 0; | 315 | int allowed = 0; |
316 | 316 | ||
317 | debug3("%s entering", __FUNCTION__); | 317 | debug3("%s entering", __func__); |
318 | 318 | ||
319 | /* Convert the key to a blob and the pass it over */ | 319 | /* Convert the key to a blob and the pass it over */ |
320 | if (!key_to_blob(key, &blob, &len)) | 320 | if (!key_to_blob(key, &blob, &len)) |
@@ -329,7 +329,7 @@ mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key) | |||
329 | 329 | ||
330 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m); | 330 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m); |
331 | 331 | ||
332 | debug3("%s: waiting for MONITOR_ANS_KEYALLOWED", __FUNCTION__); | 332 | debug3("%s: waiting for MONITOR_ANS_KEYALLOWED", __func__); |
333 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KEYALLOWED, &m); | 333 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KEYALLOWED, &m); |
334 | 334 | ||
335 | allowed = buffer_get_int(&m); | 335 | allowed = buffer_get_int(&m); |
@@ -356,7 +356,7 @@ mm_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) | |||
356 | u_int len; | 356 | u_int len; |
357 | int verified = 0; | 357 | int verified = 0; |
358 | 358 | ||
359 | debug3("%s entering", __FUNCTION__); | 359 | debug3("%s entering", __func__); |
360 | 360 | ||
361 | /* Convert the key to a blob and the pass it over */ | 361 | /* Convert the key to a blob and the pass it over */ |
362 | if (!key_to_blob(key, &blob, &len)) | 362 | if (!key_to_blob(key, &blob, &len)) |
@@ -370,7 +370,7 @@ mm_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen) | |||
370 | 370 | ||
371 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m); | 371 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYVERIFY, &m); |
372 | 372 | ||
373 | debug3("%s: waiting for MONITOR_ANS_KEYVERIFY", __FUNCTION__); | 373 | debug3("%s: waiting for MONITOR_ANS_KEYVERIFY", __func__); |
374 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KEYVERIFY, &m); | 374 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_KEYVERIFY, &m); |
375 | 375 | ||
376 | verified = buffer_get_int(&m); | 376 | verified = buffer_get_int(&m); |
@@ -391,7 +391,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) | |||
391 | Mac *mac; | 391 | Mac *mac; |
392 | Comp *comp; | 392 | Comp *comp; |
393 | 393 | ||
394 | debug3("%s: %p(%d)", __FUNCTION__, blob, blen); | 394 | debug3("%s: %p(%d)", __func__, blob, blen); |
395 | #ifdef DEBUG_PK | 395 | #ifdef DEBUG_PK |
396 | dump_base64(stderr, blob, blen); | 396 | dump_base64(stderr, blob, blen); |
397 | #endif | 397 | #endif |
@@ -411,21 +411,21 @@ mm_newkeys_from_blob(u_char *blob, int blen) | |||
411 | enc->key = buffer_get_string(&b, &enc->key_len); | 411 | enc->key = buffer_get_string(&b, &enc->key_len); |
412 | enc->iv = buffer_get_string(&b, &len); | 412 | enc->iv = buffer_get_string(&b, &len); |
413 | if (len != enc->block_size) | 413 | if (len != enc->block_size) |
414 | fatal("%s: bad ivlen: expected %d != %d", __FUNCTION__, | 414 | fatal("%s: bad ivlen: expected %d != %d", __func__, |
415 | enc->block_size, len); | 415 | enc->block_size, len); |
416 | 416 | ||
417 | if (enc->name == NULL || cipher_by_name(enc->name) != enc->cipher) | 417 | if (enc->name == NULL || cipher_by_name(enc->name) != enc->cipher) |
418 | fatal("%s: bad cipher name %s or pointer %p", __FUNCTION__, | 418 | fatal("%s: bad cipher name %s or pointer %p", __func__, |
419 | enc->name, enc->cipher); | 419 | enc->name, enc->cipher); |
420 | 420 | ||
421 | /* Mac structure */ | 421 | /* Mac structure */ |
422 | mac->name = buffer_get_string(&b, NULL); | 422 | mac->name = buffer_get_string(&b, NULL); |
423 | if (mac->name == NULL || mac_init(mac, mac->name) == -1) | 423 | if (mac->name == NULL || mac_init(mac, mac->name) == -1) |
424 | fatal("%s: can not init mac %s", __FUNCTION__, mac->name); | 424 | fatal("%s: can not init mac %s", __func__, mac->name); |
425 | mac->enabled = buffer_get_int(&b); | 425 | mac->enabled = buffer_get_int(&b); |
426 | mac->key = buffer_get_string(&b, &len); | 426 | mac->key = buffer_get_string(&b, &len); |
427 | if (len > mac->key_len) | 427 | if (len > mac->key_len) |
428 | fatal("%s: bad mac key lenght: %d > %d", __FUNCTION__, len, | 428 | fatal("%s: bad mac key lenght: %d > %d", __func__, len, |
429 | mac->key_len); | 429 | mac->key_len); |
430 | mac->key_len = len; | 430 | mac->key_len = len; |
431 | 431 | ||
@@ -452,10 +452,10 @@ mm_newkeys_to_blob(int mode, u_char **blobp, u_int *lenp) | |||
452 | Comp *comp; | 452 | Comp *comp; |
453 | Newkeys *newkey = newkeys[mode]; | 453 | Newkeys *newkey = newkeys[mode]; |
454 | 454 | ||
455 | debug3("%s: converting %p", __FUNCTION__, newkey); | 455 | debug3("%s: converting %p", __func__, newkey); |
456 | 456 | ||
457 | if (newkey == NULL) { | 457 | if (newkey == NULL) { |
458 | error("%s: newkey == NULL", __FUNCTION__); | 458 | error("%s: newkey == NULL", __func__); |
459 | return 0; | 459 | return 0; |
460 | } | 460 | } |
461 | enc = &newkey->enc; | 461 | enc = &newkey->enc; |
@@ -526,7 +526,7 @@ mm_send_keystate(struct monitor *pmonitor) | |||
526 | 526 | ||
527 | buffer_put_int(&m, packet_get_ssh1_cipher()); | 527 | buffer_put_int(&m, packet_get_ssh1_cipher()); |
528 | 528 | ||
529 | debug3("%s: Sending ssh1 IV", __FUNCTION__); | 529 | debug3("%s: Sending ssh1 IV", __func__); |
530 | ivlen = packet_get_keyiv_len(MODE_OUT); | 530 | ivlen = packet_get_keyiv_len(MODE_OUT); |
531 | packet_get_keyiv(MODE_OUT, iv, ivlen); | 531 | packet_get_keyiv(MODE_OUT, iv, ivlen); |
532 | buffer_put_string(&m, iv, ivlen); | 532 | buffer_put_string(&m, iv, ivlen); |
@@ -540,17 +540,17 @@ mm_send_keystate(struct monitor *pmonitor) | |||
540 | } | 540 | } |
541 | 541 | ||
542 | debug3("%s: Sending new keys: %p %p", | 542 | debug3("%s: Sending new keys: %p %p", |
543 | __FUNCTION__, newkeys[MODE_OUT], newkeys[MODE_IN]); | 543 | __func__, newkeys[MODE_OUT], newkeys[MODE_IN]); |
544 | 544 | ||
545 | /* Keys from Kex */ | 545 | /* Keys from Kex */ |
546 | if (!mm_newkeys_to_blob(MODE_OUT, &blob, &bloblen)) | 546 | if (!mm_newkeys_to_blob(MODE_OUT, &blob, &bloblen)) |
547 | fatal("%s: conversion of newkeys failed", __FUNCTION__); | 547 | fatal("%s: conversion of newkeys failed", __func__); |
548 | 548 | ||
549 | buffer_put_string(&m, blob, bloblen); | 549 | buffer_put_string(&m, blob, bloblen); |
550 | xfree(blob); | 550 | xfree(blob); |
551 | 551 | ||
552 | if (!mm_newkeys_to_blob(MODE_IN, &blob, &bloblen)) | 552 | if (!mm_newkeys_to_blob(MODE_IN, &blob, &bloblen)) |
553 | fatal("%s: conversion of newkeys failed", __FUNCTION__); | 553 | fatal("%s: conversion of newkeys failed", __func__); |
554 | 554 | ||
555 | buffer_put_string(&m, blob, bloblen); | 555 | buffer_put_string(&m, blob, bloblen); |
556 | xfree(blob); | 556 | xfree(blob); |
@@ -558,7 +558,7 @@ mm_send_keystate(struct monitor *pmonitor) | |||
558 | buffer_put_int(&m, packet_get_seqnr(MODE_OUT)); | 558 | buffer_put_int(&m, packet_get_seqnr(MODE_OUT)); |
559 | buffer_put_int(&m, packet_get_seqnr(MODE_IN)); | 559 | buffer_put_int(&m, packet_get_seqnr(MODE_IN)); |
560 | 560 | ||
561 | debug3("%s: New keys have been sent", __FUNCTION__); | 561 | debug3("%s: New keys have been sent", __func__); |
562 | skip: | 562 | skip: |
563 | /* More key context */ | 563 | /* More key context */ |
564 | plen = packet_get_keycontext(MODE_OUT, NULL); | 564 | plen = packet_get_keycontext(MODE_OUT, NULL); |
@@ -574,7 +574,7 @@ mm_send_keystate(struct monitor *pmonitor) | |||
574 | xfree(p); | 574 | xfree(p); |
575 | 575 | ||
576 | /* Compression state */ | 576 | /* Compression state */ |
577 | debug3("%s: Sending compression state", __FUNCTION__); | 577 | debug3("%s: Sending compression state", __func__); |
578 | buffer_put_string(&m, &outgoing_stream, sizeof(outgoing_stream)); | 578 | buffer_put_string(&m, &outgoing_stream, sizeof(outgoing_stream)); |
579 | buffer_put_string(&m, &incoming_stream, sizeof(incoming_stream)); | 579 | buffer_put_string(&m, &incoming_stream, sizeof(incoming_stream)); |
580 | 580 | ||
@@ -583,7 +583,7 @@ mm_send_keystate(struct monitor *pmonitor) | |||
583 | buffer_put_string(&m, buffer_ptr(&output), buffer_len(&output)); | 583 | buffer_put_string(&m, buffer_ptr(&output), buffer_len(&output)); |
584 | 584 | ||
585 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m); | 585 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYEXPORT, &m); |
586 | debug3("%s: Finished sending state", __FUNCTION__); | 586 | debug3("%s: Finished sending state", __func__); |
587 | 587 | ||
588 | buffer_free(&m); | 588 | buffer_free(&m); |
589 | } | 589 | } |
@@ -598,12 +598,12 @@ mm_pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) | |||
598 | buffer_init(&m); | 598 | buffer_init(&m); |
599 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PTY, &m); | 599 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PTY, &m); |
600 | 600 | ||
601 | debug3("%s: waiting for MONITOR_ANS_PTY", __FUNCTION__); | 601 | debug3("%s: waiting for MONITOR_ANS_PTY", __func__); |
602 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PTY, &m); | 602 | mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PTY, &m); |
603 | 603 | ||
604 | success = buffer_get_int(&m); | 604 | success = buffer_get_int(&m); |
605 | if (success == 0) { | 605 | if (success == 0) { |
606 | debug3("%s: pty alloc failed", __FUNCTION__); | 606 | debug3("%s: pty alloc failed", __func__); |
607 | buffer_free(&m); | 607 | buffer_free(&m); |
608 | return (0); | 608 | return (0); |
609 | } | 609 | } |
@@ -647,7 +647,7 @@ mm_start_pam(char *user) | |||
647 | { | 647 | { |
648 | Buffer m; | 648 | Buffer m; |
649 | 649 | ||
650 | debug3("%s entering", __FUNCTION__); | 650 | debug3("%s entering", __func__); |
651 | 651 | ||
652 | buffer_init(&m); | 652 | buffer_init(&m); |
653 | buffer_put_cstring(&m, user); | 653 | buffer_put_cstring(&m, user); |
@@ -710,7 +710,7 @@ mm_bsdauth_query(void *ctx, char **name, char **infotxt, | |||
710 | int res; | 710 | int res; |
711 | char *challenge; | 711 | char *challenge; |
712 | 712 | ||
713 | debug3("%s: entering", __FUNCTION__); | 713 | debug3("%s: entering", __func__); |
714 | 714 | ||
715 | buffer_init(&m); | 715 | buffer_init(&m); |
716 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_BSDAUTHQUERY, &m); | 716 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_BSDAUTHQUERY, &m); |
@@ -719,7 +719,7 @@ mm_bsdauth_query(void *ctx, char **name, char **infotxt, | |||
719 | &m); | 719 | &m); |
720 | res = buffer_get_int(&m); | 720 | res = buffer_get_int(&m); |
721 | if (res == -1) { | 721 | if (res == -1) { |
722 | debug3("%s: no challenge", __FUNCTION__); | 722 | debug3("%s: no challenge", __func__); |
723 | buffer_free(&m); | 723 | buffer_free(&m); |
724 | return (-1); | 724 | return (-1); |
725 | } | 725 | } |
@@ -731,7 +731,7 @@ mm_bsdauth_query(void *ctx, char **name, char **infotxt, | |||
731 | mm_chall_setup(name, infotxt, numprompts, prompts, echo_on); | 731 | mm_chall_setup(name, infotxt, numprompts, prompts, echo_on); |
732 | (*prompts)[0] = challenge; | 732 | (*prompts)[0] = challenge; |
733 | 733 | ||
734 | debug3("%s: received challenge: %s", __FUNCTION__, challenge); | 734 | debug3("%s: received challenge: %s", __func__, challenge); |
735 | 735 | ||
736 | return (0); | 736 | return (0); |
737 | } | 737 | } |
@@ -742,7 +742,7 @@ mm_bsdauth_respond(void *ctx, u_int numresponses, char **responses) | |||
742 | Buffer m; | 742 | Buffer m; |
743 | int authok; | 743 | int authok; |
744 | 744 | ||
745 | debug3("%s: entering", __FUNCTION__); | 745 | debug3("%s: entering", __func__); |
746 | if (numresponses != 1) | 746 | if (numresponses != 1) |
747 | return (-1); | 747 | return (-1); |
748 | 748 | ||
@@ -767,7 +767,7 @@ mm_skey_query(void *ctx, char **name, char **infotxt, | |||
767 | int len, res; | 767 | int len, res; |
768 | char *p, *challenge; | 768 | char *p, *challenge; |
769 | 769 | ||
770 | debug3("%s: entering", __FUNCTION__); | 770 | debug3("%s: entering", __func__); |
771 | 771 | ||
772 | buffer_init(&m); | 772 | buffer_init(&m); |
773 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SKEYQUERY, &m); | 773 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SKEYQUERY, &m); |
@@ -776,7 +776,7 @@ mm_skey_query(void *ctx, char **name, char **infotxt, | |||
776 | &m); | 776 | &m); |
777 | res = buffer_get_int(&m); | 777 | res = buffer_get_int(&m); |
778 | if (res == -1) { | 778 | if (res == -1) { |
779 | debug3("%s: no challenge", __FUNCTION__); | 779 | debug3("%s: no challenge", __func__); |
780 | buffer_free(&m); | 780 | buffer_free(&m); |
781 | return (-1); | 781 | return (-1); |
782 | } | 782 | } |
@@ -785,7 +785,7 @@ mm_skey_query(void *ctx, char **name, char **infotxt, | |||
785 | challenge = buffer_get_string(&m, NULL); | 785 | challenge = buffer_get_string(&m, NULL); |
786 | buffer_free(&m); | 786 | buffer_free(&m); |
787 | 787 | ||
788 | debug3("%s: received challenge: %s", __FUNCTION__, challenge); | 788 | debug3("%s: received challenge: %s", __func__, challenge); |
789 | 789 | ||
790 | mm_chall_setup(name, infotxt, numprompts, prompts, echo_on); | 790 | mm_chall_setup(name, infotxt, numprompts, prompts, echo_on); |
791 | 791 | ||
@@ -805,7 +805,7 @@ mm_skey_respond(void *ctx, u_int numresponses, char **responses) | |||
805 | Buffer m; | 805 | Buffer m; |
806 | int authok; | 806 | int authok; |
807 | 807 | ||
808 | debug3("%s: entering", __FUNCTION__); | 808 | debug3("%s: entering", __func__); |
809 | if (numresponses != 1) | 809 | if (numresponses != 1) |
810 | return (-1); | 810 | return (-1); |
811 | 811 | ||
@@ -828,7 +828,7 @@ mm_ssh1_session_id(u_char session_id[16]) | |||
828 | Buffer m; | 828 | Buffer m; |
829 | int i; | 829 | int i; |
830 | 830 | ||
831 | debug3("%s entering", __FUNCTION__); | 831 | debug3("%s entering", __func__); |
832 | 832 | ||
833 | buffer_init(&m); | 833 | buffer_init(&m); |
834 | for (i = 0; i < 16; i++) | 834 | for (i = 0; i < 16; i++) |
@@ -847,7 +847,7 @@ mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
847 | u_int blen; | 847 | u_int blen; |
848 | int allowed = 0; | 848 | int allowed = 0; |
849 | 849 | ||
850 | debug3("%s entering", __FUNCTION__); | 850 | debug3("%s entering", __func__); |
851 | 851 | ||
852 | buffer_init(&m); | 852 | buffer_init(&m); |
853 | buffer_put_bignum2(&m, client_n); | 853 | buffer_put_bignum2(&m, client_n); |
@@ -860,7 +860,7 @@ mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
860 | if (allowed && rkey != NULL) { | 860 | if (allowed && rkey != NULL) { |
861 | blob = buffer_get_string(&m, &blen); | 861 | blob = buffer_get_string(&m, &blen); |
862 | if ((key = key_from_blob(blob, blen)) == NULL) | 862 | if ((key = key_from_blob(blob, blen)) == NULL) |
863 | fatal("%s: key_from_blob failed", __FUNCTION__); | 863 | fatal("%s: key_from_blob failed", __func__); |
864 | *rkey = key; | 864 | *rkey = key; |
865 | xfree(blob); | 865 | xfree(blob); |
866 | } | 866 | } |
@@ -878,14 +878,14 @@ mm_auth_rsa_generate_challenge(Key *key) | |||
878 | u_char *blob; | 878 | u_char *blob; |
879 | u_int blen; | 879 | u_int blen; |
880 | 880 | ||
881 | debug3("%s entering", __FUNCTION__); | 881 | debug3("%s entering", __func__); |
882 | 882 | ||
883 | if ((challenge = BN_new()) == NULL) | 883 | if ((challenge = BN_new()) == NULL) |
884 | fatal("%s: BN_new failed", __FUNCTION__); | 884 | fatal("%s: BN_new failed", __func__); |
885 | 885 | ||
886 | key->type = KEY_RSA; /* XXX cheat for key_to_blob */ | 886 | key->type = KEY_RSA; /* XXX cheat for key_to_blob */ |
887 | if (key_to_blob(key, &blob, &blen) == 0) | 887 | if (key_to_blob(key, &blob, &blen) == 0) |
888 | fatal("%s: key_to_blob failed", __FUNCTION__); | 888 | fatal("%s: key_to_blob failed", __func__); |
889 | key->type = KEY_RSA1; | 889 | key->type = KEY_RSA1; |
890 | 890 | ||
891 | buffer_init(&m); | 891 | buffer_init(&m); |
@@ -909,11 +909,11 @@ mm_auth_rsa_verify_response(Key *key, BIGNUM *p, u_char response[16]) | |||
909 | u_int blen; | 909 | u_int blen; |
910 | int success = 0; | 910 | int success = 0; |
911 | 911 | ||
912 | debug3("%s entering", __FUNCTION__); | 912 | debug3("%s entering", __func__); |
913 | 913 | ||
914 | key->type = KEY_RSA; /* XXX cheat for key_to_blob */ | 914 | key->type = KEY_RSA; /* XXX cheat for key_to_blob */ |
915 | if (key_to_blob(key, &blob, &blen) == 0) | 915 | if (key_to_blob(key, &blob, &blen) == 0) |
916 | fatal("%s: key_to_blob failed", __FUNCTION__); | 916 | fatal("%s: key_to_blob failed", __func__); |
917 | key->type = KEY_RSA1; | 917 | key->type = KEY_RSA1; |
918 | 918 | ||
919 | buffer_init(&m); | 919 | buffer_init(&m); |