]>
Commit | Line | Data |
---|---|---|
a306f2dd | 1 | /* |
2 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | |
3 | * | |
4 | * Redistribution and use in source and binary forms, with or without | |
5 | * modification, are permitted provided that the following conditions | |
6 | * are met: | |
7 | * 1. Redistributions of source code must retain the above copyright | |
8 | * notice, this list of conditions and the following disclaimer. | |
9 | * 2. Redistributions in binary form must reproduce the above copyright | |
10 | * notice, this list of conditions and the following disclaimer in the | |
11 | * documentation and/or other materials provided with the distribution. | |
a306f2dd | 12 | * |
13 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | |
14 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
15 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
16 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
19 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
20 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
23 | */ | |
24 | ||
25 | #include "includes.h" | |
c3ff311a | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.144 2006/02/07 01:18:09 stevesk Exp $"); |
27 | ||
28 | #include <sys/queue.h> | |
a306f2dd | 29 | |
751092f9 | 30 | #include "openbsd-compat/sys-queue.h" |
31 | ||
a306f2dd | 32 | #include "ssh.h" |
42f11eb2 | 33 | #include "ssh2.h" |
a306f2dd | 34 | #include "xmalloc.h" |
a306f2dd | 35 | #include "buffer.h" |
36 | #include "packet.h" | |
a306f2dd | 37 | #include "compat.h" |
a306f2dd | 38 | #include "bufaux.h" |
42f11eb2 | 39 | #include "cipher.h" |
a306f2dd | 40 | #include "kex.h" |
41 | #include "myproposal.h" | |
a306f2dd | 42 | #include "sshconnect.h" |
43 | #include "authfile.h" | |
db1cd2f3 | 44 | #include "dh.h" |
2e73a022 | 45 | #include "authfd.h" |
42f11eb2 | 46 | #include "log.h" |
47 | #include "readconf.h" | |
58ae9cb8 | 48 | #include "misc.h" |
cab80f75 | 49 | #include "match.h" |
a5c9ffdb | 50 | #include "dispatch.h" |
8002af61 | 51 | #include "canohost.h" |
39c00dc2 | 52 | #include "msg.h" |
53 | #include "pathnames.h" | |
94ec8c6b | 54 | |
7364bd04 | 55 | #ifdef GSSAPI |
56 | #include "ssh-gss.h" | |
57 | #endif | |
58 | ||
a306f2dd | 59 | /* import */ |
60 | extern char *client_version_string; | |
61 | extern char *server_version_string; | |
62 | extern Options options; | |
63 | ||
64 | /* | |
65 | * SSH2 key exchange | |
66 | */ | |
67 | ||
1e3b8b07 | 68 | u_char *session_id2 = NULL; |
a27002e5 | 69 | u_int session_id2_len = 0; |
a306f2dd | 70 | |
a5c9ffdb | 71 | char *xxx_host; |
72 | struct sockaddr *xxx_hostaddr; | |
73 | ||
e092ce67 | 74 | Kex *xxx_kex = NULL; |
75 | ||
396c147e | 76 | static int |
f49bc4f7 | 77 | verify_host_key_callback(Key *hostkey) |
a5c9ffdb | 78 | { |
f49bc4f7 | 79 | if (verify_host_key(xxx_host, xxx_hostaddr, hostkey) == -1) |
01e9ef57 | 80 | fatal("Host key verification failed."); |
a5c9ffdb | 81 | return 0; |
82 | } | |
83 | ||
a306f2dd | 84 | void |
94ec8c6b | 85 | ssh_kex2(char *host, struct sockaddr *hostaddr) |
86 | { | |
94ec8c6b | 87 | Kex *kex; |
a5c9ffdb | 88 | |
89 | xxx_host = host; | |
90 | xxx_hostaddr = hostaddr; | |
94ec8c6b | 91 | |
c523303b | 92 | if (options.ciphers == (char *)-1) { |
bbe88b6d | 93 | logit("No valid ciphers for protocol version 2 given, using defaults."); |
c523303b | 94 | options.ciphers = NULL; |
94ec8c6b | 95 | } |
96 | if (options.ciphers != NULL) { | |
97 | myproposal[PROPOSAL_ENC_ALGS_CTOS] = | |
98 | myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; | |
99 | } | |
1ad64a93 | 100 | myproposal[PROPOSAL_ENC_ALGS_CTOS] = |
101 | compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); | |
102 | myproposal[PROPOSAL_ENC_ALGS_STOC] = | |
103 | compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); | |
94ec8c6b | 104 | if (options.compression) { |
b2552997 | 105 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
07200973 | 106 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none"; |
94ec8c6b | 107 | } else { |
b2552997 | 108 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
07200973 | 109 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib"; |
94ec8c6b | 110 | } |
b2552997 | 111 | if (options.macs != NULL) { |
112 | myproposal[PROPOSAL_MAC_ALGS_CTOS] = | |
113 | myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; | |
114 | } | |
e961a8f9 | 115 | if (options.hostkeyalgorithms != NULL) |
184eed6a | 116 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = |
e961a8f9 | 117 | options.hostkeyalgorithms; |
94ec8c6b | 118 | |
ffd7b36b | 119 | if (options.rekey_limit) |
120 | packet_set_rekey_limit(options.rekey_limit); | |
121 | ||
7a37c112 | 122 | /* start key exchange */ |
d8ee838b | 123 | kex = kex_setup(myproposal); |
98a58eda | 124 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_client; |
41e5bd9a | 125 | kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client; |
98a58eda | 126 | kex->kex[KEX_DH_GEX_SHA1] = kexgex_client; |
a5c9ffdb | 127 | kex->client_version_string=client_version_string; |
128 | kex->server_version_string=server_version_string; | |
f49bc4f7 | 129 | kex->verify_host_key=&verify_host_key_callback; |
94ec8c6b | 130 | |
e092ce67 | 131 | xxx_kex = kex; |
132 | ||
c422989b | 133 | dispatch_run(DISPATCH_BLOCK, &kex->done, kex); |
94ec8c6b | 134 | |
d1ac6175 | 135 | session_id2 = kex->session_id; |
136 | session_id2_len = kex->session_id_len; | |
137 | ||
94ec8c6b | 138 | #ifdef DEBUG_KEXDH |
139 | /* send 1st encrypted/maced/compressed message */ | |
140 | packet_start(SSH2_MSG_IGNORE); | |
141 | packet_put_cstring("markus"); | |
142 | packet_send(); | |
143 | packet_write_wait(); | |
144 | #endif | |
a306f2dd | 145 | } |
71276795 | 146 | |
a306f2dd | 147 | /* |
148 | * Authenticate user | |
149 | */ | |
188adeb2 | 150 | |
151 | typedef struct Authctxt Authctxt; | |
152 | typedef struct Authmethod Authmethod; | |
43348518 | 153 | typedef struct identity Identity; |
154 | typedef struct idlist Idlist; | |
155 | ||
156 | struct identity { | |
157 | TAILQ_ENTRY(identity) next; | |
158 | AuthenticationConnection *ac; /* set if agent supports key */ | |
159 | Key *key; /* public/private key */ | |
160 | char *filename; /* comment for agent-only keys */ | |
161 | int tried; | |
162 | int isprivate; /* key points to the private key */ | |
163 | }; | |
164 | TAILQ_HEAD(idlist, identity); | |
188adeb2 | 165 | |
166 | struct Authctxt { | |
167 | const char *server_user; | |
8002af61 | 168 | const char *local_user; |
188adeb2 | 169 | const char *host; |
170 | const char *service; | |
188adeb2 | 171 | Authmethod *method; |
94ec8c6b | 172 | int success; |
fee56204 | 173 | char *authlist; |
8002af61 | 174 | /* pubkey */ |
43348518 | 175 | Idlist keys; |
8002af61 | 176 | AuthenticationConnection *agent; |
177 | /* hostbased */ | |
39c00dc2 | 178 | Sensitive *sensitive; |
6b759005 | 179 | /* kbd-interactive */ |
180 | int info_req_seen; | |
7364bd04 | 181 | /* generic */ |
182 | void *methoddata; | |
188adeb2 | 183 | }; |
184 | struct Authmethod { | |
185 | char *name; /* string to compare against server's list */ | |
186 | int (*userauth)(Authctxt *authctxt); | |
187 | int *enabled; /* flag in option struct that enables method */ | |
188 | int *batch_flag; /* flag in option struct that disables method */ | |
189 | }; | |
190 | ||
7819b5c3 | 191 | void input_userauth_success(int, u_int32_t, void *); |
192 | void input_userauth_failure(int, u_int32_t, void *); | |
193 | void input_userauth_banner(int, u_int32_t, void *); | |
194 | void input_userauth_error(int, u_int32_t, void *); | |
195 | void input_userauth_info_req(int, u_int32_t, void *); | |
196 | void input_userauth_pk_ok(int, u_int32_t, void *); | |
67ec167d | 197 | void input_userauth_passwd_changereq(int, u_int32_t, void *); |
94ec8c6b | 198 | |
d5bb9418 | 199 | int userauth_none(Authctxt *); |
200 | int userauth_pubkey(Authctxt *); | |
201 | int userauth_passwd(Authctxt *); | |
202 | int userauth_kbdint(Authctxt *); | |
203 | int userauth_hostbased(Authctxt *); | |
802e01b8 | 204 | int userauth_kerberos(Authctxt *); |
188adeb2 | 205 | |
7364bd04 | 206 | #ifdef GSSAPI |
207 | int userauth_gssapi(Authctxt *authctxt); | |
208 | void input_gssapi_response(int type, u_int32_t, void *); | |
209 | void input_gssapi_token(int type, u_int32_t, void *); | |
210 | void input_gssapi_hash(int type, u_int32_t, void *); | |
211 | void input_gssapi_error(int, u_int32_t, void *); | |
212 | void input_gssapi_errtok(int, u_int32_t, void *); | |
213 | #endif | |
214 | ||
d5bb9418 | 215 | void userauth(Authctxt *, char *); |
fee56204 | 216 | |
43348518 | 217 | static int sign_and_send_pubkey(Authctxt *, Identity *); |
43348518 | 218 | static void pubkey_prepare(Authctxt *); |
219 | static void pubkey_cleanup(Authctxt *); | |
220 | static Key *load_identity_file(char *); | |
fee56204 | 221 | |
396c147e | 222 | static Authmethod *authmethod_get(char *authlist); |
223 | static Authmethod *authmethod_lookup(const char *name); | |
224 | static char *authmethods_get(void); | |
188adeb2 | 225 | |
226 | Authmethod authmethods[] = { | |
7364bd04 | 227 | #ifdef GSSAPI |
0789992b | 228 | {"gssapi-with-mic", |
7364bd04 | 229 | userauth_gssapi, |
230 | &options.gss_authentication, | |
231 | NULL}, | |
232 | #endif | |
3398dda9 | 233 | {"hostbased", |
234 | userauth_hostbased, | |
235 | &options.hostbased_authentication, | |
236 | NULL}, | |
9f37c0af | 237 | {"publickey", |
238 | userauth_pubkey, | |
239 | &options.pubkey_authentication, | |
240 | NULL}, | |
94ec8c6b | 241 | {"keyboard-interactive", |
242 | userauth_kbdint, | |
243 | &options.kbd_interactive_authentication, | |
244 | &options.batch_mode}, | |
9f37c0af | 245 | {"password", |
246 | userauth_passwd, | |
247 | &options.password_authentication, | |
248 | &options.batch_mode}, | |
94ec8c6b | 249 | {"none", |
250 | userauth_none, | |
251 | NULL, | |
252 | NULL}, | |
188adeb2 | 253 | {NULL, NULL, NULL, NULL} |
254 | }; | |
255 | ||
256 | void | |
8002af61 | 257 | ssh_userauth2(const char *local_user, const char *server_user, char *host, |
39c00dc2 | 258 | Sensitive *sensitive) |
188adeb2 | 259 | { |
260 | Authctxt authctxt; | |
261 | int type; | |
188adeb2 | 262 | |
5ba55ada | 263 | if (options.challenge_response_authentication) |
d464095c | 264 | options.kbd_interactive_authentication = 1; |
265 | ||
188adeb2 | 266 | packet_start(SSH2_MSG_SERVICE_REQUEST); |
267 | packet_put_cstring("ssh-userauth"); | |
268 | packet_send(); | |
a77673cc | 269 | debug("SSH2_MSG_SERVICE_REQUEST sent"); |
188adeb2 | 270 | packet_write_wait(); |
54a5250f | 271 | type = packet_read(); |
a77673cc | 272 | if (type != SSH2_MSG_SERVICE_ACCEPT) |
273 | fatal("Server denied authentication request: %d", type); | |
188adeb2 | 274 | if (packet_remaining() > 0) { |
54a5250f | 275 | char *reply = packet_get_string(NULL); |
a77673cc | 276 | debug2("service_accept: %s", reply); |
188adeb2 | 277 | xfree(reply); |
188adeb2 | 278 | } else { |
6226a8f8 | 279 | debug2("buggy server: service_accept w/o service"); |
188adeb2 | 280 | } |
95500969 | 281 | packet_check_eom(); |
a77673cc | 282 | debug("SSH2_MSG_SERVICE_ACCEPT received"); |
188adeb2 | 283 | |
cab80f75 | 284 | if (options.preferred_authentications == NULL) |
285 | options.preferred_authentications = authmethods_get(); | |
286 | ||
188adeb2 | 287 | /* setup authentication context */ |
6b759005 | 288 | memset(&authctxt, 0, sizeof(authctxt)); |
43348518 | 289 | pubkey_prepare(&authctxt); |
188adeb2 | 290 | authctxt.server_user = server_user; |
8002af61 | 291 | authctxt.local_user = local_user; |
188adeb2 | 292 | authctxt.host = host; |
293 | authctxt.service = "ssh-connection"; /* service name */ | |
294 | authctxt.success = 0; | |
94ec8c6b | 295 | authctxt.method = authmethod_lookup("none"); |
fee56204 | 296 | authctxt.authlist = NULL; |
7364bd04 | 297 | authctxt.methoddata = NULL; |
39c00dc2 | 298 | authctxt.sensitive = sensitive; |
6b759005 | 299 | authctxt.info_req_seen = 0; |
94ec8c6b | 300 | if (authctxt.method == NULL) |
301 | fatal("ssh_userauth2: internal error: cannot send userauth none request"); | |
188adeb2 | 302 | |
303 | /* initial userauth request */ | |
94ec8c6b | 304 | userauth_none(&authctxt); |
188adeb2 | 305 | |
7a37c112 | 306 | dispatch_init(&input_userauth_error); |
188adeb2 | 307 | dispatch_set(SSH2_MSG_USERAUTH_SUCCESS, &input_userauth_success); |
308 | dispatch_set(SSH2_MSG_USERAUTH_FAILURE, &input_userauth_failure); | |
9616313f | 309 | dispatch_set(SSH2_MSG_USERAUTH_BANNER, &input_userauth_banner); |
188adeb2 | 310 | dispatch_run(DISPATCH_BLOCK, &authctxt.success, &authctxt); /* loop until success */ |
311 | ||
43348518 | 312 | pubkey_cleanup(&authctxt); |
b8c2031b | 313 | dispatch_range(SSH2_MSG_USERAUTH_MIN, SSH2_MSG_USERAUTH_MAX, NULL); |
314 | ||
6226a8f8 | 315 | debug("Authentication succeeded (%s).", authctxt.method->name); |
188adeb2 | 316 | } |
b8c2031b | 317 | |
188adeb2 | 318 | void |
fee56204 | 319 | userauth(Authctxt *authctxt, char *authlist) |
320 | { | |
7364bd04 | 321 | if (authctxt->methoddata) { |
322 | xfree(authctxt->methoddata); | |
323 | authctxt->methoddata = NULL; | |
324 | } | |
fee56204 | 325 | if (authlist == NULL) { |
326 | authlist = authctxt->authlist; | |
327 | } else { | |
328 | if (authctxt->authlist) | |
329 | xfree(authctxt->authlist); | |
330 | authctxt->authlist = authlist; | |
331 | } | |
332 | for (;;) { | |
333 | Authmethod *method = authmethod_get(authlist); | |
334 | if (method == NULL) | |
335 | fatal("Permission denied (%s).", authlist); | |
336 | authctxt->method = method; | |
b8c2031b | 337 | |
338 | /* reset the per method handler */ | |
339 | dispatch_range(SSH2_MSG_USERAUTH_PER_METHOD_MIN, | |
340 | SSH2_MSG_USERAUTH_PER_METHOD_MAX, NULL); | |
341 | ||
342 | /* and try new method */ | |
fee56204 | 343 | if (method->userauth(authctxt) != 0) { |
344 | debug2("we sent a %s packet, wait for reply", method->name); | |
345 | break; | |
346 | } else { | |
347 | debug2("we did not send a packet, disable method"); | |
348 | method->enabled = NULL; | |
349 | } | |
350 | } | |
351 | } | |
d6133f43 | 352 | |
fee56204 | 353 | void |
7819b5c3 | 354 | input_userauth_error(int type, u_int32_t seq, void *ctxt) |
188adeb2 | 355 | { |
9616313f | 356 | fatal("input_userauth_error: bad message during authentication: " |
4e2e5cfd | 357 | "type %d", type); |
9616313f | 358 | } |
d6133f43 | 359 | |
9616313f | 360 | void |
7819b5c3 | 361 | input_userauth_banner(int type, u_int32_t seq, void *ctxt) |
9616313f | 362 | { |
363 | char *msg, *lang; | |
c8f0cf13 | 364 | |
9616313f | 365 | debug3("input_userauth_banner"); |
366 | msg = packet_get_string(NULL); | |
367 | lang = packet_get_string(NULL); | |
19e633e7 | 368 | if (options.log_level > SYSLOG_LEVEL_QUIET) |
369 | fprintf(stderr, "%s", msg); | |
9616313f | 370 | xfree(msg); |
371 | xfree(lang); | |
188adeb2 | 372 | } |
d6133f43 | 373 | |
188adeb2 | 374 | void |
7819b5c3 | 375 | input_userauth_success(int type, u_int32_t seq, void *ctxt) |
188adeb2 | 376 | { |
377 | Authctxt *authctxt = ctxt; | |
378 | if (authctxt == NULL) | |
379 | fatal("input_userauth_success: no authentication context"); | |
c8f0cf13 | 380 | if (authctxt->authlist) { |
fee56204 | 381 | xfree(authctxt->authlist); |
c8f0cf13 | 382 | authctxt->authlist = NULL; |
383 | } | |
384 | if (authctxt->methoddata) { | |
7364bd04 | 385 | xfree(authctxt->methoddata); |
c8f0cf13 | 386 | authctxt->methoddata = NULL; |
387 | } | |
188adeb2 | 388 | authctxt->success = 1; /* break out */ |
389 | } | |
d6133f43 | 390 | |
188adeb2 | 391 | void |
7819b5c3 | 392 | input_userauth_failure(int type, u_int32_t seq, void *ctxt) |
188adeb2 | 393 | { |
188adeb2 | 394 | Authctxt *authctxt = ctxt; |
395 | char *authlist = NULL; | |
396 | int partial; | |
188adeb2 | 397 | |
398 | if (authctxt == NULL) | |
399 | fatal("input_userauth_failure: no authentication context"); | |
400 | ||
94ec8c6b | 401 | authlist = packet_get_string(NULL); |
188adeb2 | 402 | partial = packet_get_char(); |
95500969 | 403 | packet_check_eom(); |
188adeb2 | 404 | |
405 | if (partial != 0) | |
bbe88b6d | 406 | logit("Authenticated with partial success."); |
6226a8f8 | 407 | debug("Authentications that can continue: %s", authlist); |
188adeb2 | 408 | |
fee56204 | 409 | userauth(authctxt, authlist); |
410 | } | |
411 | void | |
7819b5c3 | 412 | input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt) |
fee56204 | 413 | { |
414 | Authctxt *authctxt = ctxt; | |
415 | Key *key = NULL; | |
43348518 | 416 | Identity *id = NULL; |
fee56204 | 417 | Buffer b; |
c66f9d0e | 418 | int pktype, sent = 0; |
419 | u_int alen, blen; | |
420 | char *pkalg, *fp; | |
421 | u_char *pkblob; | |
fee56204 | 422 | |
423 | if (authctxt == NULL) | |
424 | fatal("input_userauth_pk_ok: no authentication context"); | |
425 | if (datafellows & SSH_BUG_PKOK) { | |
426 | /* this is similar to SSH_BUG_PKAUTH */ | |
427 | debug2("input_userauth_pk_ok: SSH_BUG_PKOK"); | |
428 | pkblob = packet_get_string(&blen); | |
429 | buffer_init(&b); | |
430 | buffer_append(&b, pkblob, blen); | |
431 | pkalg = buffer_get_string(&b, &alen); | |
432 | buffer_free(&b); | |
433 | } else { | |
434 | pkalg = packet_get_string(&alen); | |
435 | pkblob = packet_get_string(&blen); | |
436 | } | |
95500969 | 437 | packet_check_eom(); |
fee56204 | 438 | |
43348518 | 439 | debug("Server accepts key: pkalg %s blen %u", pkalg, blen); |
fee56204 | 440 | |
43348518 | 441 | if ((pktype = key_type_from_name(pkalg)) == KEY_UNSPEC) { |
442 | debug("unknown pkalg %s", pkalg); | |
443 | goto done; | |
444 | } | |
445 | if ((key = key_from_blob(pkblob, blen)) == NULL) { | |
446 | debug("no key from blob. pkalg %s", pkalg); | |
447 | goto done; | |
448 | } | |
449 | if (key->type != pktype) { | |
450 | error("input_userauth_pk_ok: type mismatch " | |
451 | "for decoded key (received %d, expected %d)", | |
452 | key->type, pktype); | |
453 | goto done; | |
454 | } | |
455 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); | |
456 | debug2("input_userauth_pk_ok: fp %s", fp); | |
457 | xfree(fp); | |
458 | ||
b56e99e2 | 459 | /* |
460 | * search keys in the reverse order, because last candidate has been | |
461 | * moved to the end of the queue. this also avoids confusion by | |
462 | * duplicate keys | |
463 | */ | |
484b2208 | 464 | TAILQ_FOREACH_REVERSE(id, &authctxt->keys, idlist, next) { |
43348518 | 465 | if (key_equal(key, id->key)) { |
466 | sent = sign_and_send_pubkey(authctxt, id); | |
fee56204 | 467 | break; |
468 | } | |
43348518 | 469 | } |
470 | done: | |
fee56204 | 471 | if (key != NULL) |
472 | key_free(key); | |
473 | xfree(pkalg); | |
474 | xfree(pkblob); | |
475 | ||
343288b8 | 476 | /* try another method if we did not send a packet */ |
fee56204 | 477 | if (sent == 0) |
478 | userauth(authctxt, NULL); | |
188adeb2 | 479 | } |
480 | ||
7364bd04 | 481 | #ifdef GSSAPI |
aff51935 | 482 | int |
7364bd04 | 483 | userauth_gssapi(Authctxt *authctxt) |
484 | { | |
485 | Gssctxt *gssctxt = NULL; | |
b0b30ca6 | 486 | static gss_OID_set gss_supported = NULL; |
2ceb8101 | 487 | static u_int mech = 0; |
7364bd04 | 488 | OM_uint32 min; |
489 | int ok = 0; | |
490 | ||
491 | /* Try one GSSAPI method at a time, rather than sending them all at | |
492 | * once. */ | |
493 | ||
b0b30ca6 | 494 | if (gss_supported == NULL) |
495 | gss_indicate_mechs(&min, &gss_supported); | |
7364bd04 | 496 | |
497 | /* Check to see if the mechanism is usable before we offer it */ | |
b0b30ca6 | 498 | while (mech < gss_supported->count && !ok) { |
7364bd04 | 499 | if (gssctxt) |
500 | ssh_gssapi_delete_ctx(&gssctxt); | |
501 | ssh_gssapi_build_ctx(&gssctxt); | |
b0b30ca6 | 502 | ssh_gssapi_set_oid(gssctxt, &gss_supported->elements[mech]); |
7364bd04 | 503 | |
504 | /* My DER encoding requires length<128 */ | |
b0b30ca6 | 505 | if (gss_supported->elements[mech].length < 128 && |
7364bd04 | 506 | !GSS_ERROR(ssh_gssapi_import_name(gssctxt, |
507 | authctxt->host))) { | |
508 | ok = 1; /* Mechanism works */ | |
509 | } else { | |
510 | mech++; | |
511 | } | |
512 | } | |
513 | ||
2ceb8101 | 514 | if (!ok) |
515 | return 0; | |
7364bd04 | 516 | |
517 | authctxt->methoddata=(void *)gssctxt; | |
518 | ||
519 | packet_start(SSH2_MSG_USERAUTH_REQUEST); | |
520 | packet_put_cstring(authctxt->server_user); | |
521 | packet_put_cstring(authctxt->service); | |
522 | packet_put_cstring(authctxt->method->name); | |
523 | ||
524 | packet_put_int(1); | |
525 | ||
d8d9afd0 | 526 | packet_put_int((gss_supported->elements[mech].length) + 2); |
527 | packet_put_char(SSH_GSS_OIDTYPE); | |
528 | packet_put_char(gss_supported->elements[mech].length); | |
529 | packet_put_raw(gss_supported->elements[mech].elements, | |
530 | gss_supported->elements[mech].length); | |
7364bd04 | 531 | |
532 | packet_send(); | |
533 | ||
534 | dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE, &input_gssapi_response); | |
535 | dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, &input_gssapi_token); | |
536 | dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_ERROR, &input_gssapi_error); | |
537 | dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_ERRTOK, &input_gssapi_errtok); | |
538 | ||
539 | mech++; /* Move along to next candidate */ | |
540 | ||
541 | return 1; | |
542 | } | |
543 | ||
b930668c | 544 | static OM_uint32 |
545 | process_gssapi_token(void *ctxt, gss_buffer_t recv_tok) | |
546 | { | |
547 | Authctxt *authctxt = ctxt; | |
548 | Gssctxt *gssctxt = authctxt->methoddata; | |
549 | gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; | |
fe206de9 | 550 | gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; |
551 | gss_buffer_desc gssbuf; | |
0789992b | 552 | OM_uint32 status, ms, flags; |
553 | Buffer b; | |
b6453d99 | 554 | |
b930668c | 555 | status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, |
0789992b | 556 | recv_tok, &send_tok, &flags); |
b930668c | 557 | |
558 | if (send_tok.length > 0) { | |
559 | if (GSS_ERROR(status)) | |
560 | packet_start(SSH2_MSG_USERAUTH_GSSAPI_ERRTOK); | |
561 | else | |
562 | packet_start(SSH2_MSG_USERAUTH_GSSAPI_TOKEN); | |
b6453d99 | 563 | |
b930668c | 564 | packet_put_string(send_tok.value, send_tok.length); |
565 | packet_send(); | |
566 | gss_release_buffer(&ms, &send_tok); | |
567 | } | |
b6453d99 | 568 | |
b930668c | 569 | if (status == GSS_S_COMPLETE) { |
0789992b | 570 | /* send either complete or MIC, depending on mechanism */ |
571 | if (!(flags & GSS_C_INTEG_FLAG)) { | |
572 | packet_start(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE); | |
573 | packet_send(); | |
574 | } else { | |
575 | ssh_gssapi_buildmic(&b, authctxt->server_user, | |
576 | authctxt->service, "gssapi-with-mic"); | |
577 | ||
578 | gssbuf.value = buffer_ptr(&b); | |
579 | gssbuf.length = buffer_len(&b); | |
b6453d99 | 580 | |
0789992b | 581 | status = ssh_gssapi_sign(gssctxt, &gssbuf, &mic); |
b6453d99 | 582 | |
0789992b | 583 | if (!GSS_ERROR(status)) { |
584 | packet_start(SSH2_MSG_USERAUTH_GSSAPI_MIC); | |
585 | packet_put_string(mic.value, mic.length); | |
b6453d99 | 586 | |
0789992b | 587 | packet_send(); |
588 | } | |
b6453d99 | 589 | |
0789992b | 590 | buffer_free(&b); |
591 | gss_release_buffer(&ms, &mic); | |
b6453d99 | 592 | } |
b930668c | 593 | } |
b6453d99 | 594 | |
b930668c | 595 | return status; |
596 | } | |
597 | ||
7364bd04 | 598 | void |
599 | input_gssapi_response(int type, u_int32_t plen, void *ctxt) | |
600 | { | |
601 | Authctxt *authctxt = ctxt; | |
602 | Gssctxt *gssctxt; | |
7364bd04 | 603 | int oidlen; |
604 | char *oidv; | |
7364bd04 | 605 | |
606 | if (authctxt == NULL) | |
607 | fatal("input_gssapi_response: no authentication context"); | |
608 | gssctxt = authctxt->methoddata; | |
609 | ||
610 | /* Setup our OID */ | |
611 | oidv = packet_get_string(&oidlen); | |
612 | ||
d8d9afd0 | 613 | if (oidlen <= 2 || |
614 | oidv[0] != SSH_GSS_OIDTYPE || | |
615 | oidv[1] != oidlen - 2) { | |
b930668c | 616 | xfree(oidv); |
d8d9afd0 | 617 | debug("Badly encoded mechanism OID received"); |
618 | userauth(authctxt, NULL); | |
d8d9afd0 | 619 | return; |
7364bd04 | 620 | } |
621 | ||
d8d9afd0 | 622 | if (!ssh_gssapi_check_oid(gssctxt, oidv + 2, oidlen - 2)) |
623 | fatal("Server returned different OID than expected"); | |
624 | ||
7364bd04 | 625 | packet_check_eom(); |
626 | ||
627 | xfree(oidv); | |
628 | ||
b930668c | 629 | if (GSS_ERROR(process_gssapi_token(ctxt, GSS_C_NO_BUFFER))) { |
7364bd04 | 630 | /* Start again with next method on list */ |
631 | debug("Trying to start again"); | |
632 | userauth(authctxt, NULL); | |
633 | return; | |
634 | } | |
7364bd04 | 635 | } |
636 | ||
637 | void | |
638 | input_gssapi_token(int type, u_int32_t plen, void *ctxt) | |
639 | { | |
640 | Authctxt *authctxt = ctxt; | |
7364bd04 | 641 | gss_buffer_desc recv_tok; |
b930668c | 642 | OM_uint32 status; |
7364bd04 | 643 | u_int slen; |
644 | ||
645 | if (authctxt == NULL) | |
646 | fatal("input_gssapi_response: no authentication context"); | |
7364bd04 | 647 | |
648 | recv_tok.value = packet_get_string(&slen); | |
649 | recv_tok.length = slen; /* safe typecast */ | |
650 | ||
651 | packet_check_eom(); | |
652 | ||
b930668c | 653 | status = process_gssapi_token(ctxt, &recv_tok); |
7364bd04 | 654 | |
655 | xfree(recv_tok.value); | |
656 | ||
657 | if (GSS_ERROR(status)) { | |
7364bd04 | 658 | /* Start again with the next method in the list */ |
659 | userauth(authctxt, NULL); | |
660 | return; | |
661 | } | |
7364bd04 | 662 | } |
663 | ||
664 | void | |
665 | input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) | |
666 | { | |
667 | Authctxt *authctxt = ctxt; | |
668 | Gssctxt *gssctxt; | |
669 | gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; | |
670 | gss_buffer_desc recv_tok; | |
671 | OM_uint32 status, ms; | |
f99e1ca4 | 672 | u_int len; |
7364bd04 | 673 | |
674 | if (authctxt == NULL) | |
675 | fatal("input_gssapi_response: no authentication context"); | |
676 | gssctxt = authctxt->methoddata; | |
677 | ||
f99e1ca4 | 678 | recv_tok.value = packet_get_string(&len); |
679 | recv_tok.length = len; | |
7364bd04 | 680 | |
681 | packet_check_eom(); | |
682 | ||
683 | /* Stick it into GSSAPI and see what it says */ | |
684 | status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, | |
4e2e5cfd | 685 | &recv_tok, &send_tok, NULL); |
7364bd04 | 686 | |
687 | xfree(recv_tok.value); | |
688 | gss_release_buffer(&ms, &send_tok); | |
689 | ||
690 | /* Server will be returning a failed packet after this one */ | |
691 | } | |
692 | ||
693 | void | |
694 | input_gssapi_error(int type, u_int32_t plen, void *ctxt) | |
695 | { | |
696 | OM_uint32 maj, min; | |
697 | char *msg; | |
698 | char *lang; | |
699 | ||
700 | maj=packet_get_int(); | |
701 | min=packet_get_int(); | |
702 | msg=packet_get_string(NULL); | |
703 | lang=packet_get_string(NULL); | |
704 | ||
705 | packet_check_eom(); | |
706 | ||
17318dd6 | 707 | debug("Server GSSAPI Error:\n%s", msg); |
7364bd04 | 708 | xfree(msg); |
709 | xfree(lang); | |
710 | } | |
711 | #endif /* GSSAPI */ | |
712 | ||
94ec8c6b | 713 | int |
714 | userauth_none(Authctxt *authctxt) | |
715 | { | |
716 | /* initial userauth request */ | |
717 | packet_start(SSH2_MSG_USERAUTH_REQUEST); | |
718 | packet_put_cstring(authctxt->server_user); | |
719 | packet_put_cstring(authctxt->service); | |
720 | packet_put_cstring(authctxt->method->name); | |
721 | packet_send(); | |
94ec8c6b | 722 | return 1; |
723 | } | |
724 | ||
a306f2dd | 725 | int |
188adeb2 | 726 | userauth_passwd(Authctxt *authctxt) |
a306f2dd | 727 | { |
1d1ffb87 | 728 | static int attempt = 0; |
67ec167d | 729 | char prompt[150]; |
a306f2dd | 730 | char *password; |
731 | ||
fa649821 | 732 | if (attempt++ >= options.number_of_password_prompts) |
1d1ffb87 | 733 | return 0; |
734 | ||
6aacefa7 | 735 | if (attempt != 1) |
fa649821 | 736 | error("Permission denied, please try again."); |
737 | ||
f72e01a5 | 738 | snprintf(prompt, sizeof(prompt), "%.30s@%.128s's password: ", |
188adeb2 | 739 | authctxt->server_user, authctxt->host); |
a306f2dd | 740 | password = read_passphrase(prompt, 0); |
741 | packet_start(SSH2_MSG_USERAUTH_REQUEST); | |
188adeb2 | 742 | packet_put_cstring(authctxt->server_user); |
743 | packet_put_cstring(authctxt->service); | |
94ec8c6b | 744 | packet_put_cstring(authctxt->method->name); |
a306f2dd | 745 | packet_put_char(0); |
a6215e53 | 746 | packet_put_cstring(password); |
a306f2dd | 747 | memset(password, 0, strlen(password)); |
748 | xfree(password); | |
b4b701be | 749 | packet_add_padding(64); |
a306f2dd | 750 | packet_send(); |
67ec167d | 751 | |
7203d6bb | 752 | dispatch_set(SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ, |
67ec167d | 753 | &input_userauth_passwd_changereq); |
754 | ||
a306f2dd | 755 | return 1; |
756 | } | |
67ec167d | 757 | /* |
758 | * parse PASSWD_CHANGEREQ, prompt user and send SSH2_MSG_USERAUTH_REQUEST | |
759 | */ | |
760 | void | |
ef077e37 | 761 | input_userauth_passwd_changereq(int type, u_int32_t seqnr, void *ctxt) |
67ec167d | 762 | { |
763 | Authctxt *authctxt = ctxt; | |
764 | char *info, *lang, *password = NULL, *retype = NULL; | |
765 | char prompt[150]; | |
766 | ||
767 | debug2("input_userauth_passwd_changereq"); | |
768 | ||
769 | if (authctxt == NULL) | |
770 | fatal("input_userauth_passwd_changereq: " | |
771 | "no authentication context"); | |
772 | ||
773 | info = packet_get_string(NULL); | |
774 | lang = packet_get_string(NULL); | |
775 | if (strlen(info) > 0) | |
bbe88b6d | 776 | logit("%s", info); |
67ec167d | 777 | xfree(info); |
778 | xfree(lang); | |
779 | packet_start(SSH2_MSG_USERAUTH_REQUEST); | |
780 | packet_put_cstring(authctxt->server_user); | |
781 | packet_put_cstring(authctxt->service); | |
782 | packet_put_cstring(authctxt->method->name); | |
783 | packet_put_char(1); /* additional info */ | |
7203d6bb | 784 | snprintf(prompt, sizeof(prompt), |
67ec167d | 785 | "Enter %.30s@%.128s's old password: ", |
786 | authctxt->server_user, authctxt->host); | |
787 | password = read_passphrase(prompt, 0); | |
788 | packet_put_cstring(password); | |
789 | memset(password, 0, strlen(password)); | |
790 | xfree(password); | |
791 | password = NULL; | |
792 | while (password == NULL) { | |
7203d6bb | 793 | snprintf(prompt, sizeof(prompt), |
67ec167d | 794 | "Enter %.30s@%.128s's new password: ", |
795 | authctxt->server_user, authctxt->host); | |
796 | password = read_passphrase(prompt, RP_ALLOW_EOF); | |
797 | if (password == NULL) { | |
798 | /* bail out */ | |
799 | return; | |
800 | } | |
7203d6bb | 801 | snprintf(prompt, sizeof(prompt), |
67ec167d | 802 | "Retype %.30s@%.128s's new password: ", |
803 | authctxt->server_user, authctxt->host); | |
804 | retype = read_passphrase(prompt, 0); | |
805 | if (strcmp(password, retype) != 0) { | |
806 | memset(password, 0, strlen(password)); | |
807 | xfree(password); | |
bbe88b6d | 808 | logit("Mismatch; try again, EOF to quit."); |
67ec167d | 809 | password = NULL; |
810 | } | |
811 | memset(retype, 0, strlen(retype)); | |
812 | xfree(retype); | |
813 | } | |
814 | packet_put_cstring(password); | |
815 | memset(password, 0, strlen(password)); | |
816 | xfree(password); | |
817 | packet_add_padding(64); | |
818 | packet_send(); | |
7203d6bb | 819 | |
820 | dispatch_set(SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ, | |
67ec167d | 821 | &input_userauth_passwd_changereq); |
822 | } | |
a306f2dd | 823 | |
43348518 | 824 | static int |
825 | identity_sign(Identity *id, u_char **sigp, u_int *lenp, | |
826 | u_char *data, u_int datalen) | |
827 | { | |
828 | Key *prv; | |
829 | int ret; | |
830 | ||
831 | /* the agent supports this key */ | |
832 | if (id->ac) | |
833 | return (ssh_agent_sign(id->ac, id->key, sigp, lenp, | |
834 | data, datalen)); | |
835 | /* | |
836 | * we have already loaded the private key or | |
837 | * the private key is stored in external hardware | |
838 | */ | |
839 | if (id->isprivate || (id->key->flags & KEY_FLAG_EXT)) | |
840 | return (key_sign(id->key, sigp, lenp, data, datalen)); | |
841 | /* load the private key from the file */ | |
842 | if ((prv = load_identity_file(id->filename)) == NULL) | |
843 | return (-1); | |
844 | ret = key_sign(prv, sigp, lenp, data, datalen); | |
845 | key_free(prv); | |
846 | return (ret); | |
fee56204 | 847 | } |
848 | ||
396c147e | 849 | static int |
43348518 | 850 | sign_and_send_pubkey(Authctxt *authctxt, Identity *id) |
a306f2dd | 851 | { |
852 | Buffer b; | |
1e3b8b07 | 853 | u_char *blob, *signature; |
c66f9d0e | 854 | u_int bloblen, slen; |
a27002e5 | 855 | u_int skip = 0; |
2e73a022 | 856 | int ret = -1; |
94ec8c6b | 857 | int have_sig = 1; |
a306f2dd | 858 | |
cbc5abf9 | 859 | debug3("sign_and_send_pubkey"); |
fee56204 | 860 | |
43348518 | 861 | if (key_to_blob(id->key, &blob, &bloblen) == 0) { |
fa08c86b | 862 | /* we cannot handle this key */ |
cbc5abf9 | 863 | debug3("sign_and_send_pubkey: cannot handle key"); |
fa08c86b | 864 | return 0; |
865 | } | |
a306f2dd | 866 | /* data to be signed */ |
867 | buffer_init(&b); | |
33de75a3 | 868 | if (datafellows & SSH_OLD_SESSIONID) { |
74fc9186 | 869 | buffer_append(&b, session_id2, session_id2_len); |
2b87da3b | 870 | skip = session_id2_len; |
33de75a3 | 871 | } else { |
872 | buffer_put_string(&b, session_id2, session_id2_len); | |
873 | skip = buffer_len(&b); | |
74fc9186 | 874 | } |
a306f2dd | 875 | buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); |
188adeb2 | 876 | buffer_put_cstring(&b, authctxt->server_user); |
d0c832f3 | 877 | buffer_put_cstring(&b, |
cbc5abf9 | 878 | datafellows & SSH_BUG_PKSERVICE ? |
d0c832f3 | 879 | "ssh-userauth" : |
188adeb2 | 880 | authctxt->service); |
cbc5abf9 | 881 | if (datafellows & SSH_BUG_PKAUTH) { |
882 | buffer_put_char(&b, have_sig); | |
883 | } else { | |
884 | buffer_put_cstring(&b, authctxt->method->name); | |
885 | buffer_put_char(&b, have_sig); | |
43348518 | 886 | buffer_put_cstring(&b, key_ssh_name(id->key)); |
cbc5abf9 | 887 | } |
a306f2dd | 888 | buffer_put_string(&b, blob, bloblen); |
a306f2dd | 889 | |
890 | /* generate signature */ | |
43348518 | 891 | ret = identity_sign(id, &signature, &slen, |
fee56204 | 892 | buffer_ptr(&b), buffer_len(&b)); |
2e73a022 | 893 | if (ret == -1) { |
894 | xfree(blob); | |
895 | buffer_free(&b); | |
896 | return 0; | |
897 | } | |
fa08c86b | 898 | #ifdef DEBUG_PK |
a306f2dd | 899 | buffer_dump(&b); |
900 | #endif | |
cbc5abf9 | 901 | if (datafellows & SSH_BUG_PKSERVICE) { |
d0c832f3 | 902 | buffer_clear(&b); |
903 | buffer_append(&b, session_id2, session_id2_len); | |
fee56204 | 904 | skip = session_id2_len; |
d0c832f3 | 905 | buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); |
188adeb2 | 906 | buffer_put_cstring(&b, authctxt->server_user); |
907 | buffer_put_cstring(&b, authctxt->service); | |
94ec8c6b | 908 | buffer_put_cstring(&b, authctxt->method->name); |
909 | buffer_put_char(&b, have_sig); | |
cbc5abf9 | 910 | if (!(datafellows & SSH_BUG_PKAUTH)) |
43348518 | 911 | buffer_put_cstring(&b, key_ssh_name(id->key)); |
d0c832f3 | 912 | buffer_put_string(&b, blob, bloblen); |
913 | } | |
914 | xfree(blob); | |
fee56204 | 915 | |
a306f2dd | 916 | /* append signature */ |
917 | buffer_put_string(&b, signature, slen); | |
918 | xfree(signature); | |
919 | ||
920 | /* skip session id and packet type */ | |
74fc9186 | 921 | if (buffer_len(&b) < skip + 1) |
188adeb2 | 922 | fatal("userauth_pubkey: internal error"); |
74fc9186 | 923 | buffer_consume(&b, skip + 1); |
a306f2dd | 924 | |
925 | /* put remaining data from buffer into packet */ | |
926 | packet_start(SSH2_MSG_USERAUTH_REQUEST); | |
927 | packet_put_raw(buffer_ptr(&b), buffer_len(&b)); | |
928 | buffer_free(&b); | |
a306f2dd | 929 | packet_send(); |
2e73a022 | 930 | |
931 | return 1; | |
4c8722d9 | 932 | } |
933 | ||
396c147e | 934 | static int |
43348518 | 935 | send_pubkey_test(Authctxt *authctxt, Identity *id) |
4c8722d9 | 936 | { |
fee56204 | 937 | u_char *blob; |
21b30f38 | 938 | u_int bloblen, have_sig = 0; |
4c8722d9 | 939 | |
fee56204 | 940 | debug3("send_pubkey_test"); |
941 | ||
43348518 | 942 | if (key_to_blob(id->key, &blob, &bloblen) == 0) { |
fee56204 | 943 | /* we cannot handle this key */ |
944 | debug3("send_pubkey_test: cannot handle key"); | |
4c8722d9 | 945 | return 0; |
946 | } | |
fee56204 | 947 | /* register callback for USERAUTH_PK_OK message */ |
fee56204 | 948 | dispatch_set(SSH2_MSG_USERAUTH_PK_OK, &input_userauth_pk_ok); |
4c8722d9 | 949 | |
fee56204 | 950 | packet_start(SSH2_MSG_USERAUTH_REQUEST); |
951 | packet_put_cstring(authctxt->server_user); | |
952 | packet_put_cstring(authctxt->service); | |
953 | packet_put_cstring(authctxt->method->name); | |
954 | packet_put_char(have_sig); | |
955 | if (!(datafellows & SSH_BUG_PKAUTH)) | |
43348518 | 956 | packet_put_cstring(key_ssh_name(id->key)); |
fee56204 | 957 | packet_put_string(blob, bloblen); |
958 | xfree(blob); | |
959 | packet_send(); | |
960 | return 1; | |
961 | } | |
962 | ||
396c147e | 963 | static Key * |
fee56204 | 964 | load_identity_file(char *filename) |
965 | { | |
966 | Key *private; | |
967 | char prompt[300], *passphrase; | |
aeaa3d9e | 968 | int quit, i; |
d156519a | 969 | struct stat st; |
fee56204 | 970 | |
d156519a | 971 | if (stat(filename, &st) < 0) { |
972 | debug3("no such identity: %s", filename); | |
973 | return NULL; | |
974 | } | |
aeaa3d9e | 975 | private = key_load_private_type(KEY_UNSPEC, filename, "", NULL); |
976 | if (private == NULL) { | |
977 | if (options.batch_mode) | |
fee56204 | 978 | return NULL; |
4c8722d9 | 979 | snprintf(prompt, sizeof prompt, |
184eed6a | 980 | "Enter passphrase for key '%.100s': ", filename); |
188adeb2 | 981 | for (i = 0; i < options.number_of_password_prompts; i++) { |
982 | passphrase = read_passphrase(prompt, 0); | |
983 | if (strcmp(passphrase, "") != 0) { | |
aeaa3d9e | 984 | private = key_load_private_type(KEY_UNSPEC, filename, |
985 | passphrase, NULL); | |
fee56204 | 986 | quit = 0; |
188adeb2 | 987 | } else { |
988 | debug2("no passphrase given, try next key"); | |
fee56204 | 989 | quit = 1; |
188adeb2 | 990 | } |
991 | memset(passphrase, 0, strlen(passphrase)); | |
992 | xfree(passphrase); | |
aeaa3d9e | 993 | if (private != NULL || quit) |
188adeb2 | 994 | break; |
995 | debug2("bad passphrase given, try again..."); | |
996 | } | |
4c8722d9 | 997 | } |
fee56204 | 998 | return private; |
999 | } | |
1000 | ||
43348518 | 1001 | /* |
1002 | * try keys in the following order: | |
1003 | * 1. agent keys that are found in the config file | |
1004 | * 2. other agent keys | |
1005 | * 3. keys that are only listed in the config file | |
1006 | */ | |
1007 | static void | |
1008 | pubkey_prepare(Authctxt *authctxt) | |
fee56204 | 1009 | { |
43348518 | 1010 | Identity *id; |
1011 | Idlist agent, files, *preferred; | |
1012 | Key *key; | |
1013 | AuthenticationConnection *ac; | |
1014 | char *comment; | |
1015 | int i, found; | |
1016 | ||
1017 | TAILQ_INIT(&agent); /* keys from the agent */ | |
1018 | TAILQ_INIT(&files); /* keys from the config file */ | |
1019 | preferred = &authctxt->keys; | |
1020 | TAILQ_INIT(preferred); /* preferred order of keys */ | |
1021 | ||
1022 | /* list of keys stored in the filesystem */ | |
1023 | for (i = 0; i < options.num_identity_files; i++) { | |
1024 | key = options.identity_keys[i]; | |
1025 | if (key && key->type == KEY_RSA1) | |
1026 | continue; | |
1027 | options.identity_keys[i] = NULL; | |
1028 | id = xmalloc(sizeof(*id)); | |
1029 | memset(id, 0, sizeof(*id)); | |
1030 | id->key = key; | |
1031 | id->filename = xstrdup(options.identity_files[i]); | |
1032 | TAILQ_INSERT_TAIL(&files, id, next); | |
1033 | } | |
1034 | /* list of keys supported by the agent */ | |
1035 | if ((ac = ssh_get_authentication_connection())) { | |
1036 | for (key = ssh_get_first_identity(ac, &comment, 2); | |
1037 | key != NULL; | |
1038 | key = ssh_get_next_identity(ac, &comment, 2)) { | |
1039 | found = 0; | |
1040 | TAILQ_FOREACH(id, &files, next) { | |
aff51935 | 1041 | /* agent keys from the config file are preferred */ |
43348518 | 1042 | if (key_equal(key, id->key)) { |
1043 | key_free(key); | |
1044 | xfree(comment); | |
1045 | TAILQ_REMOVE(&files, id, next); | |
1046 | TAILQ_INSERT_TAIL(preferred, id, next); | |
1047 | id->ac = ac; | |
1048 | found = 1; | |
1049 | break; | |
1050 | } | |
1051 | } | |
3a065ed0 | 1052 | if (!found && !options.identities_only) { |
43348518 | 1053 | id = xmalloc(sizeof(*id)); |
1054 | memset(id, 0, sizeof(*id)); | |
1055 | id->key = key; | |
1056 | id->filename = comment; | |
1057 | id->ac = ac; | |
1058 | TAILQ_INSERT_TAIL(&agent, id, next); | |
1059 | } | |
1060 | } | |
1061 | /* append remaining agent keys */ | |
1062 | for (id = TAILQ_FIRST(&agent); id; id = TAILQ_FIRST(&agent)) { | |
1063 | TAILQ_REMOVE(&agent, id, next); | |
1064 | TAILQ_INSERT_TAIL(preferred, id, next); | |
1065 | } | |
1066 | authctxt->agent = ac; | |
1067 | } | |
1068 | /* append remaining keys from the config file */ | |
1069 | for (id = TAILQ_FIRST(&files); id; id = TAILQ_FIRST(&files)) { | |
1070 | TAILQ_REMOVE(&files, id, next); | |
1071 | TAILQ_INSERT_TAIL(preferred, id, next); | |
1072 | } | |
1073 | TAILQ_FOREACH(id, preferred, next) { | |
1074 | debug2("key: %s (%p)", id->filename, id->key); | |
1075 | } | |
fee56204 | 1076 | } |
1077 | ||
43348518 | 1078 | static void |
1079 | pubkey_cleanup(Authctxt *authctxt) | |
2e73a022 | 1080 | { |
43348518 | 1081 | Identity *id; |
1082 | ||
1083 | if (authctxt->agent != NULL) | |
1084 | ssh_close_authentication_connection(authctxt->agent); | |
1085 | for (id = TAILQ_FIRST(&authctxt->keys); id; | |
1086 | id = TAILQ_FIRST(&authctxt->keys)) { | |
1087 | TAILQ_REMOVE(&authctxt->keys, id, next); | |
1088 | if (id->key) | |
1089 | key_free(id->key); | |
1090 | if (id->filename) | |
1091 | xfree(id->filename); | |
1092 | xfree(id); | |
2e73a022 | 1093 | } |
a306f2dd | 1094 | } |
1095 | ||
188adeb2 | 1096 | int |
1097 | userauth_pubkey(Authctxt *authctxt) | |
a306f2dd | 1098 | { |
43348518 | 1099 | Identity *id; |
188adeb2 | 1100 | int sent = 0; |
1101 | ||
43348518 | 1102 | while ((id = TAILQ_FIRST(&authctxt->keys))) { |
1103 | if (id->tried++) | |
1104 | return (0); | |
b56e99e2 | 1105 | /* move key to the end of the queue */ |
43348518 | 1106 | TAILQ_REMOVE(&authctxt->keys, id, next); |
1107 | TAILQ_INSERT_TAIL(&authctxt->keys, id, next); | |
1108 | /* | |
1109 | * send a test message if we have the public key. for | |
1110 | * encrypted keys we cannot do this and have to load the | |
1111 | * private key instead | |
1112 | */ | |
1113 | if (id->key && id->key->type != KEY_RSA1) { | |
1114 | debug("Offering public key: %s", id->filename); | |
1115 | sent = send_pubkey_test(authctxt, id); | |
1116 | } else if (id->key == NULL) { | |
1117 | debug("Trying private key: %s", id->filename); | |
1118 | id->key = load_identity_file(id->filename); | |
1119 | if (id->key != NULL) { | |
1120 | id->isprivate = 1; | |
1121 | sent = sign_and_send_pubkey(authctxt, id); | |
1122 | key_free(id->key); | |
1123 | id->key = NULL; | |
fee56204 | 1124 | } |
fee56204 | 1125 | } |
43348518 | 1126 | if (sent) |
1127 | return (sent); | |
fa08c86b | 1128 | } |
43348518 | 1129 | return (0); |
188adeb2 | 1130 | } |
a306f2dd | 1131 | |
94ec8c6b | 1132 | /* |
1133 | * Send userauth request message specifying keyboard-interactive method. | |
1134 | */ | |
1135 | int | |
1136 | userauth_kbdint(Authctxt *authctxt) | |
1137 | { | |
1138 | static int attempt = 0; | |
1139 | ||
1140 | if (attempt++ >= options.number_of_password_prompts) | |
1141 | return 0; | |
6b759005 | 1142 | /* disable if no SSH2_MSG_USERAUTH_INFO_REQUEST has been seen */ |
1143 | if (attempt > 1 && !authctxt->info_req_seen) { | |
1144 | debug3("userauth_kbdint: disable: no info_req_seen"); | |
1145 | dispatch_set(SSH2_MSG_USERAUTH_INFO_REQUEST, NULL); | |
1146 | return 0; | |
1147 | } | |
94ec8c6b | 1148 | |
1149 | debug2("userauth_kbdint"); | |
1150 | packet_start(SSH2_MSG_USERAUTH_REQUEST); | |
1151 | packet_put_cstring(authctxt->server_user); | |
1152 | packet_put_cstring(authctxt->service); | |
1153 | packet_put_cstring(authctxt->method->name); | |
1154 | packet_put_cstring(""); /* lang */ | |
1155 | packet_put_cstring(options.kbd_interactive_devices ? | |
1156 | options.kbd_interactive_devices : ""); | |
1157 | packet_send(); | |
94ec8c6b | 1158 | |
1159 | dispatch_set(SSH2_MSG_USERAUTH_INFO_REQUEST, &input_userauth_info_req); | |
1160 | return 1; | |
1161 | } | |
1162 | ||
1163 | /* | |
f72e01a5 | 1164 | * parse INFO_REQUEST, prompt user and send INFO_RESPONSE |
94ec8c6b | 1165 | */ |
1166 | void | |
7819b5c3 | 1167 | input_userauth_info_req(int type, u_int32_t seq, void *ctxt) |
94ec8c6b | 1168 | { |
1169 | Authctxt *authctxt = ctxt; | |
f72e01a5 | 1170 | char *name, *inst, *lang, *prompt, *response; |
1e3b8b07 | 1171 | u_int num_prompts, i; |
94ec8c6b | 1172 | int echo = 0; |
1173 | ||
1174 | debug2("input_userauth_info_req"); | |
1175 | ||
1176 | if (authctxt == NULL) | |
1177 | fatal("input_userauth_info_req: no authentication context"); | |
1178 | ||
6b759005 | 1179 | authctxt->info_req_seen = 1; |
1180 | ||
94ec8c6b | 1181 | name = packet_get_string(NULL); |
1182 | inst = packet_get_string(NULL); | |
1183 | lang = packet_get_string(NULL); | |
94ec8c6b | 1184 | if (strlen(name) > 0) |
bbe88b6d | 1185 | logit("%s", name); |
94ec8c6b | 1186 | if (strlen(inst) > 0) |
bbe88b6d | 1187 | logit("%s", inst); |
f72e01a5 | 1188 | xfree(name); |
94ec8c6b | 1189 | xfree(inst); |
f72e01a5 | 1190 | xfree(lang); |
94ec8c6b | 1191 | |
1192 | num_prompts = packet_get_int(); | |
1193 | /* | |
1194 | * Begin to build info response packet based on prompts requested. | |
1195 | * We commit to providing the correct number of responses, so if | |
1196 | * further on we run into a problem that prevents this, we have to | |
1197 | * be sure and clean this up and send a correct error response. | |
1198 | */ | |
1199 | packet_start(SSH2_MSG_USERAUTH_INFO_RESPONSE); | |
1200 | packet_put_int(num_prompts); | |
1201 | ||
5ba55ada | 1202 | debug2("input_userauth_info_req: num_prompts %d", num_prompts); |
94ec8c6b | 1203 | for (i = 0; i < num_prompts; i++) { |
1204 | prompt = packet_get_string(NULL); | |
1205 | echo = packet_get_char(); | |
1206 | ||
1843a425 | 1207 | response = read_passphrase(prompt, echo ? RP_ECHO : 0); |
94ec8c6b | 1208 | |
a6215e53 | 1209 | packet_put_cstring(response); |
94ec8c6b | 1210 | memset(response, 0, strlen(response)); |
1211 | xfree(response); | |
1212 | xfree(prompt); | |
1213 | } | |
95500969 | 1214 | packet_check_eom(); /* done with parsing incoming message. */ |
94ec8c6b | 1215 | |
b4b701be | 1216 | packet_add_padding(64); |
94ec8c6b | 1217 | packet_send(); |
94ec8c6b | 1218 | } |
a306f2dd | 1219 | |
39c00dc2 | 1220 | static int |
d6133f43 | 1221 | ssh_keysign(Key *key, u_char **sigp, u_int *lenp, |
39c00dc2 | 1222 | u_char *data, u_int datalen) |
1223 | { | |
1224 | Buffer b; | |
7091a26b | 1225 | struct stat st; |
39c00dc2 | 1226 | pid_t pid; |
d4826734 | 1227 | int to[2], from[2], status, version = 2; |
39c00dc2 | 1228 | |
6226a8f8 | 1229 | debug2("ssh_keysign called"); |
39c00dc2 | 1230 | |
7091a26b | 1231 | if (stat(_PATH_SSH_KEY_SIGN, &st) < 0) { |
1232 | error("ssh_keysign: no installed: %s", strerror(errno)); | |
1233 | return -1; | |
1234 | } | |
39c00dc2 | 1235 | if (fflush(stdout) != 0) |
1236 | error("ssh_keysign: fflush: %s", strerror(errno)); | |
1237 | if (pipe(to) < 0) { | |
1238 | error("ssh_keysign: pipe: %s", strerror(errno)); | |
1239 | return -1; | |
1240 | } | |
1241 | if (pipe(from) < 0) { | |
1242 | error("ssh_keysign: pipe: %s", strerror(errno)); | |
1243 | return -1; | |
1244 | } | |
1245 | if ((pid = fork()) < 0) { | |
1246 | error("ssh_keysign: fork: %s", strerror(errno)); | |
1247 | return -1; | |
1248 | } | |
1249 | if (pid == 0) { | |
1250 | seteuid(getuid()); | |
1251 | setuid(getuid()); | |
1252 | close(from[0]); | |
1253 | if (dup2(from[1], STDOUT_FILENO) < 0) | |
1254 | fatal("ssh_keysign: dup2: %s", strerror(errno)); | |
1255 | close(to[1]); | |
1256 | if (dup2(to[0], STDIN_FILENO) < 0) | |
1257 | fatal("ssh_keysign: dup2: %s", strerror(errno)); | |
d4826734 | 1258 | close(from[1]); |
1259 | close(to[0]); | |
a3f69458 | 1260 | execl(_PATH_SSH_KEY_SIGN, _PATH_SSH_KEY_SIGN, (char *) 0); |
39c00dc2 | 1261 | fatal("ssh_keysign: exec(%s): %s", _PATH_SSH_KEY_SIGN, |
1262 | strerror(errno)); | |
1263 | } | |
1264 | close(from[1]); | |
1265 | close(to[0]); | |
1266 | ||
1267 | buffer_init(&b); | |
d4826734 | 1268 | buffer_put_int(&b, packet_get_connection_in()); /* send # of socket */ |
39c00dc2 | 1269 | buffer_put_string(&b, data, datalen); |
d3cbe6f8 | 1270 | if (ssh_msg_send(to[1], version, &b) == -1) |
1271 | fatal("ssh_keysign: couldn't send request"); | |
39c00dc2 | 1272 | |
e987fdbe | 1273 | if (ssh_msg_recv(from[0], &b) < 0) { |
7091a26b | 1274 | error("ssh_keysign: no reply"); |
43f7a4b8 | 1275 | buffer_free(&b); |
39c00dc2 | 1276 | return -1; |
1277 | } | |
39c00dc2 | 1278 | close(from[0]); |
1279 | close(to[1]); | |
1280 | ||
d4826734 | 1281 | while (waitpid(pid, &status, 0) < 0) |
1282 | if (errno != EINTR) | |
1283 | break; | |
39c00dc2 | 1284 | |
7091a26b | 1285 | if (buffer_get_char(&b) != version) { |
1286 | error("ssh_keysign: bad version"); | |
43f7a4b8 | 1287 | buffer_free(&b); |
7091a26b | 1288 | return -1; |
1289 | } | |
1290 | *sigp = buffer_get_string(&b, lenp); | |
43f7a4b8 | 1291 | buffer_free(&b); |
7091a26b | 1292 | |
39c00dc2 | 1293 | return 0; |
1294 | } | |
1295 | ||
8002af61 | 1296 | int |
1297 | userauth_hostbased(Authctxt *authctxt) | |
1298 | { | |
1299 | Key *private = NULL; | |
39c00dc2 | 1300 | Sensitive *sensitive = authctxt->sensitive; |
8002af61 | 1301 | Buffer b; |
1302 | u_char *signature, *blob; | |
1303 | char *chost, *pkalg, *p; | |
8dddf799 | 1304 | const char *service; |
8002af61 | 1305 | u_int blen, slen; |
f98c3421 | 1306 | int ok, i, len, found = 0; |
8002af61 | 1307 | |
8002af61 | 1308 | /* check for a useful key */ |
39c00dc2 | 1309 | for (i = 0; i < sensitive->nkeys; i++) { |
1310 | private = sensitive->keys[i]; | |
8002af61 | 1311 | if (private && private->type != KEY_RSA1) { |
1312 | found = 1; | |
1313 | /* we take and free the key */ | |
39c00dc2 | 1314 | sensitive->keys[i] = NULL; |
8002af61 | 1315 | break; |
1316 | } | |
1317 | } | |
1318 | if (!found) { | |
6226a8f8 | 1319 | debug("No more client hostkeys for hostbased authentication."); |
8002af61 | 1320 | return 0; |
1321 | } | |
1322 | if (key_to_blob(private, &blob, &blen) == 0) { | |
1323 | key_free(private); | |
8002af61 | 1324 | return 0; |
1325 | } | |
e8d59b4d | 1326 | /* figure out a name for the client host */ |
1327 | p = get_local_name(packet_get_connection_in()); | |
1328 | if (p == NULL) { | |
1329 | error("userauth_hostbased: cannot get local ipaddr/name"); | |
1330 | key_free(private); | |
1331 | return 0; | |
1332 | } | |
1333 | len = strlen(p) + 2; | |
1334 | chost = xmalloc(len); | |
1335 | strlcpy(chost, p, len); | |
1336 | strlcat(chost, ".", len); | |
1337 | debug2("userauth_hostbased: chost %s", chost); | |
3e2f2431 | 1338 | xfree(p); |
e8d59b4d | 1339 | |
8dddf799 | 1340 | service = datafellows & SSH_BUG_HBSERVICE ? "ssh-userauth" : |
1341 | authctxt->service; | |
8002af61 | 1342 | pkalg = xstrdup(key_ssh_name(private)); |
1343 | buffer_init(&b); | |
8002af61 | 1344 | /* construct data */ |
8dddf799 | 1345 | buffer_put_string(&b, session_id2, session_id2_len); |
8002af61 | 1346 | buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); |
1347 | buffer_put_cstring(&b, authctxt->server_user); | |
8dddf799 | 1348 | buffer_put_cstring(&b, service); |
8002af61 | 1349 | buffer_put_cstring(&b, authctxt->method->name); |
1350 | buffer_put_cstring(&b, pkalg); | |
1351 | buffer_put_string(&b, blob, blen); | |
1352 | buffer_put_cstring(&b, chost); | |
1353 | buffer_put_cstring(&b, authctxt->local_user); | |
1354 | #ifdef DEBUG_PK | |
1355 | buffer_dump(&b); | |
1356 | #endif | |
39c00dc2 | 1357 | if (sensitive->external_keysign) |
1358 | ok = ssh_keysign(private, &signature, &slen, | |
1359 | buffer_ptr(&b), buffer_len(&b)); | |
1360 | else | |
1361 | ok = key_sign(private, &signature, &slen, | |
1362 | buffer_ptr(&b), buffer_len(&b)); | |
8002af61 | 1363 | key_free(private); |
1364 | buffer_free(&b); | |
1365 | if (ok != 0) { | |
1366 | error("key_sign failed"); | |
1367 | xfree(chost); | |
1368 | xfree(pkalg); | |
1369 | return 0; | |
1370 | } | |
1371 | packet_start(SSH2_MSG_USERAUTH_REQUEST); | |
1372 | packet_put_cstring(authctxt->server_user); | |
1373 | packet_put_cstring(authctxt->service); | |
1374 | packet_put_cstring(authctxt->method->name); | |
1375 | packet_put_cstring(pkalg); | |
1376 | packet_put_string(blob, blen); | |
1377 | packet_put_cstring(chost); | |
1378 | packet_put_cstring(authctxt->local_user); | |
1379 | packet_put_string(signature, slen); | |
1380 | memset(signature, 's', slen); | |
1381 | xfree(signature); | |
1382 | xfree(chost); | |
1383 | xfree(pkalg); | |
1384 | ||
1385 | packet_send(); | |
1386 | return 1; | |
1387 | } | |
1388 | ||
188adeb2 | 1389 | /* find auth method */ |
1390 | ||
188adeb2 | 1391 | /* |
1392 | * given auth method name, if configurable options permit this method fill | |
1393 | * in auth_ident field and return true, otherwise return false. | |
1394 | */ | |
396c147e | 1395 | static int |
188adeb2 | 1396 | authmethod_is_enabled(Authmethod *method) |
1397 | { | |
1398 | if (method == NULL) | |
1399 | return 0; | |
1400 | /* return false if options indicate this method is disabled */ | |
1401 | if (method->enabled == NULL || *method->enabled == 0) | |
1402 | return 0; | |
1403 | /* return false if batch mode is enabled but method needs interactive mode */ | |
1404 | if (method->batch_flag != NULL && *method->batch_flag != 0) | |
1405 | return 0; | |
1406 | return 1; | |
1407 | } | |
a306f2dd | 1408 | |
396c147e | 1409 | static Authmethod * |
188adeb2 | 1410 | authmethod_lookup(const char *name) |
1411 | { | |
1412 | Authmethod *method = NULL; | |
1413 | if (name != NULL) | |
1414 | for (method = authmethods; method->name != NULL; method++) | |
1415 | if (strcmp(name, method->name) == 0) | |
1416 | return method; | |
1417 | debug2("Unrecognized authentication method name: %s", name ? name : "NULL"); | |
1418 | return NULL; | |
1419 | } | |
1420 | ||
cab80f75 | 1421 | /* XXX internal state */ |
1422 | static Authmethod *current = NULL; | |
1423 | static char *supported = NULL; | |
1424 | static char *preferred = NULL; | |
d6133f43 | 1425 | |
188adeb2 | 1426 | /* |
1427 | * Given the authentication method list sent by the server, return the | |
1428 | * next method we should try. If the server initially sends a nil list, | |
cd332296 | 1429 | * use a built-in default list. |
2b87da3b | 1430 | */ |
396c147e | 1431 | static Authmethod * |
188adeb2 | 1432 | authmethod_get(char *authlist) |
1433 | { | |
cab80f75 | 1434 | char *name = NULL; |
21b30f38 | 1435 | u_int next; |
2b87da3b | 1436 | |
188adeb2 | 1437 | /* Use a suitable default if we're passed a nil list. */ |
1438 | if (authlist == NULL || strlen(authlist) == 0) | |
cab80f75 | 1439 | authlist = options.preferred_authentications; |
1440 | ||
1441 | if (supported == NULL || strcmp(authlist, supported) != 0) { | |
1442 | debug3("start over, passed a different list %s", authlist); | |
1443 | if (supported != NULL) | |
1444 | xfree(supported); | |
1445 | supported = xstrdup(authlist); | |
1446 | preferred = options.preferred_authentications; | |
1447 | debug3("preferred %s", preferred); | |
1448 | current = NULL; | |
1449 | } else if (current != NULL && authmethod_is_enabled(current)) | |
1450 | return current; | |
188adeb2 | 1451 | |
cab80f75 | 1452 | for (;;) { |
1453 | if ((name = match_list(preferred, supported, &next)) == NULL) { | |
6226a8f8 | 1454 | debug("No more authentication methods to try."); |
cab80f75 | 1455 | current = NULL; |
1456 | return NULL; | |
1457 | } | |
1458 | preferred += next; | |
94ec8c6b | 1459 | debug3("authmethod_lookup %s", name); |
cab80f75 | 1460 | debug3("remaining preferred: %s", preferred); |
1461 | if ((current = authmethod_lookup(name)) != NULL && | |
1462 | authmethod_is_enabled(current)) { | |
94ec8c6b | 1463 | debug3("authmethod_is_enabled %s", name); |
6226a8f8 | 1464 | debug("Next authentication method: %s", name); |
cab80f75 | 1465 | return current; |
94ec8c6b | 1466 | } |
a306f2dd | 1467 | } |
cab80f75 | 1468 | } |
a22aff1f | 1469 | |
ffb215be | 1470 | static char * |
cab80f75 | 1471 | authmethods_get(void) |
1472 | { | |
1473 | Authmethod *method = NULL; | |
3469eac4 | 1474 | Buffer b; |
1475 | char *list; | |
cab80f75 | 1476 | |
3469eac4 | 1477 | buffer_init(&b); |
cab80f75 | 1478 | for (method = authmethods; method->name != NULL; method++) { |
1479 | if (authmethod_is_enabled(method)) { | |
3469eac4 | 1480 | if (buffer_len(&b) > 0) |
1481 | buffer_append(&b, ",", 1); | |
1482 | buffer_append(&b, method->name, strlen(method->name)); | |
cab80f75 | 1483 | } |
1484 | } | |
3469eac4 | 1485 | buffer_append(&b, "\0", 1); |
1486 | list = xstrdup(buffer_ptr(&b)); | |
1487 | buffer_free(&b); | |
1488 | return list; | |
a306f2dd | 1489 | } |