]>
Commit | Line | Data |
---|---|---|
5b04a8bf | 1 | /* $OpenBSD: authfd.c,v 1.75 2006/07/08 21:47:12 stevesk Exp $ */ |
8efc0c15 | 2 | /* |
5260325f | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
5260325f | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
5 | * All rights reserved | |
5260325f | 6 | * Functions for connecting the local authentication agent. |
6ae2364d | 7 | * |
bcbf86ec | 8 | * As far as I am concerned, the code I have written for this software |
9 | * can be used freely for any purpose. Any derived versions of this | |
10 | * software must be clearly marked as such, and if the derived work is | |
11 | * incompatible with the protocol description in the RFC file, it must be | |
12 | * called by a name other than "ssh" or "Secure Shell". | |
13 | * | |
2e73a022 | 14 | * SSH2 implementation, |
bcbf86ec | 15 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
16 | * | |
17 | * Redistribution and use in source and binary forms, with or without | |
18 | * modification, are permitted provided that the following conditions | |
19 | * are met: | |
20 | * 1. Redistributions of source code must retain the above copyright | |
21 | * notice, this list of conditions and the following disclaimer. | |
22 | * 2. Redistributions in binary form must reproduce the above copyright | |
23 | * notice, this list of conditions and the following disclaimer in the | |
24 | * documentation and/or other materials provided with the distribution. | |
2e73a022 | 25 | * |
bcbf86ec | 26 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
27 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | |
28 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | |
29 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | |
30 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | |
31 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
32 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
33 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
34 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | |
35 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
5260325f | 36 | */ |
8efc0c15 | 37 | |
38 | #include "includes.h" | |
cebb4c24 | 39 | |
40 | #include <sys/types.h> | |
41 | #include <sys/un.h> | |
5b04a8bf | 42 | #include <sys/socket.h> |
42f11eb2 | 43 | |
44 | #include <openssl/evp.h> | |
8efc0c15 | 45 | |
46 | #include "ssh.h" | |
47 | #include "rsa.h" | |
8efc0c15 | 48 | #include "buffer.h" |
49 | #include "bufaux.h" | |
50 | #include "xmalloc.h" | |
4c8722d9 | 51 | #include "key.h" |
52 | #include "authfd.h" | |
42f11eb2 | 53 | #include "cipher.h" |
4c8722d9 | 54 | #include "kex.h" |
188adeb2 | 55 | #include "compat.h" |
42f11eb2 | 56 | #include "log.h" |
57 | #include "atomicio.h" | |
51e7a012 | 58 | #include "misc.h" |
8efc0c15 | 59 | |
8b10e20e | 60 | static int agent_present = 0; |
61 | ||
089fbbd2 | 62 | /* helper */ |
c345cf9d | 63 | int decode_reply(int type); |
089fbbd2 | 64 | |
94ec8c6b | 65 | /* macro to check for "agent failure" message */ |
66 | #define agent_failed(x) \ | |
65e683bd | 67 | ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE) || \ |
7203d6bb | 68 | (x == SSH2_AGENT_FAILURE)) |
94ec8c6b | 69 | |
8b10e20e | 70 | int |
71 | ssh_agent_present(void) | |
72 | { | |
73 | int authfd; | |
74 | ||
75 | if (agent_present) | |
76 | return 1; | |
77 | if ((authfd = ssh_get_authentication_socket()) == -1) | |
78 | return 0; | |
79 | else { | |
80 | ssh_close_authentication_socket(authfd); | |
81 | return 1; | |
82 | } | |
83 | } | |
84 | ||
8efc0c15 | 85 | /* Returns the number of the authentication fd, or -1 if there is none. */ |
86 | ||
87 | int | |
1e3b8b07 | 88 | ssh_get_authentication_socket(void) |
8efc0c15 | 89 | { |
5260325f | 90 | const char *authsocket; |
f34f05d5 | 91 | int sock; |
5260325f | 92 | struct sockaddr_un sunaddr; |
93 | ||
94 | authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME); | |
95 | if (!authsocket) | |
96 | return -1; | |
97 | ||
98 | sunaddr.sun_family = AF_UNIX; | |
99 | strlcpy(sunaddr.sun_path, authsocket, sizeof(sunaddr.sun_path)); | |
100 | ||
101 | sock = socket(AF_UNIX, SOCK_STREAM, 0); | |
102 | if (sock < 0) | |
103 | return -1; | |
104 | ||
105 | /* close on exec */ | |
106 | if (fcntl(sock, F_SETFD, 1) == -1) { | |
107 | close(sock); | |
108 | return -1; | |
109 | } | |
c8e9c167 | 110 | if (connect(sock, (struct sockaddr *)&sunaddr, sizeof sunaddr) < 0) { |
5260325f | 111 | close(sock); |
112 | return -1; | |
113 | } | |
8b10e20e | 114 | agent_present = 1; |
5260325f | 115 | return sock; |
8efc0c15 | 116 | } |
117 | ||
396c147e | 118 | static int |
2e73a022 | 119 | ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply) |
c345cf9d | 120 | { |
2ceb8101 | 121 | u_int l, len; |
c345cf9d | 122 | char buf[1024]; |
123 | ||
124 | /* Get the length of the message, and format it in the buffer. */ | |
125 | len = buffer_len(request); | |
51e7a012 | 126 | put_u32(buf, len); |
c345cf9d | 127 | |
128 | /* Send the length and then the packet to the agent. */ | |
dc54438a | 129 | if (atomicio(vwrite, auth->fd, buf, 4) != 4 || |
130 | atomicio(vwrite, auth->fd, buffer_ptr(request), | |
c345cf9d | 131 | buffer_len(request)) != buffer_len(request)) { |
132 | error("Error writing to authentication socket."); | |
133 | return 0; | |
134 | } | |
135 | /* | |
136 | * Wait for response from the agent. First read the length of the | |
137 | * response packet. | |
138 | */ | |
f581b6e8 | 139 | if (atomicio(read, auth->fd, buf, 4) != 4) { |
140 | error("Error reading response length from authentication socket."); | |
141 | return 0; | |
c345cf9d | 142 | } |
143 | ||
144 | /* Extract the length, and check it for sanity. */ | |
51e7a012 | 145 | len = get_u32(buf); |
c345cf9d | 146 | if (len > 256 * 1024) |
bb92e5cc | 147 | fatal("Authentication response too long: %u", len); |
c345cf9d | 148 | |
149 | /* Read the rest of the response in to the buffer. */ | |
150 | buffer_clear(reply); | |
151 | while (len > 0) { | |
152 | l = len; | |
153 | if (l > sizeof(buf)) | |
154 | l = sizeof(buf); | |
05624c18 | 155 | if (atomicio(read, auth->fd, buf, l) != l) { |
c345cf9d | 156 | error("Error reading response from authentication socket."); |
157 | return 0; | |
158 | } | |
6c69a6a9 | 159 | buffer_append(reply, buf, l); |
c345cf9d | 160 | len -= l; |
161 | } | |
162 | return 1; | |
163 | } | |
164 | ||
aa3378df | 165 | /* |
166 | * Closes the agent socket if it should be closed (depends on how it was | |
167 | * obtained). The argument must have been returned by | |
168 | * ssh_get_authentication_socket(). | |
169 | */ | |
8efc0c15 | 170 | |
6ae2364d | 171 | void |
5260325f | 172 | ssh_close_authentication_socket(int sock) |
8efc0c15 | 173 | { |
5260325f | 174 | if (getenv(SSH_AUTHSOCKET_ENV_NAME)) |
175 | close(sock); | |
8efc0c15 | 176 | } |
177 | ||
aa3378df | 178 | /* |
179 | * Opens and connects a private socket for communication with the | |
180 | * authentication agent. Returns the file descriptor (which must be | |
181 | * shut down and closed by the caller when no longer needed). | |
182 | * Returns NULL if an error occurred and the connection could not be | |
183 | * opened. | |
184 | */ | |
8efc0c15 | 185 | |
5260325f | 186 | AuthenticationConnection * |
1e3b8b07 | 187 | ssh_get_authentication_connection(void) |
8efc0c15 | 188 | { |
5260325f | 189 | AuthenticationConnection *auth; |
190 | int sock; | |
191 | ||
192 | sock = ssh_get_authentication_socket(); | |
193 | ||
aa3378df | 194 | /* |
195 | * Fail if we couldn't obtain a connection. This happens if we | |
196 | * exited due to a timeout. | |
197 | */ | |
5260325f | 198 | if (sock < 0) |
199 | return NULL; | |
200 | ||
5260325f | 201 | auth = xmalloc(sizeof(*auth)); |
202 | auth->fd = sock; | |
5260325f | 203 | buffer_init(&auth->identities); |
204 | auth->howmany = 0; | |
205 | ||
206 | return auth; | |
8efc0c15 | 207 | } |
208 | ||
aa3378df | 209 | /* |
210 | * Closes the connection to the authentication agent and frees any associated | |
211 | * memory. | |
212 | */ | |
8efc0c15 | 213 | |
6ae2364d | 214 | void |
2e73a022 | 215 | ssh_close_authentication_connection(AuthenticationConnection *auth) |
8efc0c15 | 216 | { |
2e73a022 | 217 | buffer_free(&auth->identities); |
218 | close(auth->fd); | |
219 | xfree(auth); | |
8efc0c15 | 220 | } |
221 | ||
3db7f994 | 222 | /* Lock/unlock agent */ |
223 | int | |
224 | ssh_lock_agent(AuthenticationConnection *auth, int lock, const char *password) | |
225 | { | |
226 | int type; | |
227 | Buffer msg; | |
228 | ||
229 | buffer_init(&msg); | |
230 | buffer_put_char(&msg, lock ? SSH_AGENTC_LOCK : SSH_AGENTC_UNLOCK); | |
231 | buffer_put_cstring(&msg, password); | |
232 | ||
233 | if (ssh_request_reply(auth, &msg, &msg) == 0) { | |
234 | buffer_free(&msg); | |
235 | return 0; | |
236 | } | |
237 | type = buffer_get_char(&msg); | |
238 | buffer_free(&msg); | |
239 | return decode_reply(type); | |
240 | } | |
241 | ||
aa3378df | 242 | /* |
243 | * Returns the first authentication identity held by the agent. | |
aa3378df | 244 | */ |
8efc0c15 | 245 | |
fa08c86b | 246 | int |
247 | ssh_get_num_identities(AuthenticationConnection *auth, int version) | |
8efc0c15 | 248 | { |
2e73a022 | 249 | int type, code1 = 0, code2 = 0; |
c345cf9d | 250 | Buffer request; |
2e73a022 | 251 | |
6aacefa7 | 252 | switch (version) { |
2e73a022 | 253 | case 1: |
254 | code1 = SSH_AGENTC_REQUEST_RSA_IDENTITIES; | |
255 | code2 = SSH_AGENT_RSA_IDENTITIES_ANSWER; | |
256 | break; | |
257 | case 2: | |
258 | code1 = SSH2_AGENTC_REQUEST_IDENTITIES; | |
259 | code2 = SSH2_AGENT_IDENTITIES_ANSWER; | |
260 | break; | |
261 | default: | |
fa08c86b | 262 | return 0; |
2e73a022 | 263 | } |
5260325f | 264 | |
aa3378df | 265 | /* |
266 | * Send a message to the agent requesting for a list of the | |
267 | * identities it can represent. | |
268 | */ | |
c345cf9d | 269 | buffer_init(&request); |
2e73a022 | 270 | buffer_put_char(&request, code1); |
5260325f | 271 | |
5260325f | 272 | buffer_clear(&auth->identities); |
c345cf9d | 273 | if (ssh_request_reply(auth, &request, &auth->identities) == 0) { |
274 | buffer_free(&request); | |
fa08c86b | 275 | return 0; |
8efc0c15 | 276 | } |
c345cf9d | 277 | buffer_free(&request); |
5260325f | 278 | |
279 | /* Get message type, and verify that we got a proper answer. */ | |
c345cf9d | 280 | type = buffer_get_char(&auth->identities); |
94ec8c6b | 281 | if (agent_failed(type)) { |
fa08c86b | 282 | return 0; |
2e73a022 | 283 | } else if (type != code2) { |
c345cf9d | 284 | fatal("Bad authentication reply message type: %d", type); |
2e73a022 | 285 | } |
5260325f | 286 | |
287 | /* Get the number of entries in the response and check it for sanity. */ | |
288 | auth->howmany = buffer_get_int(&auth->identities); | |
bb92e5cc | 289 | if ((u_int)auth->howmany > 1024) |
54b974dc | 290 | fatal("Too many identities in authentication reply: %d", |
c345cf9d | 291 | auth->howmany); |
5260325f | 292 | |
fa08c86b | 293 | return auth->howmany; |
294 | } | |
295 | ||
296 | Key * | |
297 | ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int version) | |
298 | { | |
299 | /* get number of identities and return the first entry (if any). */ | |
300 | if (ssh_get_num_identities(auth, version) > 0) | |
301 | return ssh_get_next_identity(auth, comment, version); | |
302 | return NULL; | |
8efc0c15 | 303 | } |
304 | ||
2e73a022 | 305 | Key * |
306 | ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version) | |
8efc0c15 | 307 | { |
2ceb8101 | 308 | int keybits; |
1e3b8b07 | 309 | u_int bits; |
310 | u_char *blob; | |
311 | u_int blen; | |
2e73a022 | 312 | Key *key = NULL; |
4d195447 | 313 | |
5260325f | 314 | /* Return failure if no more entries. */ |
315 | if (auth->howmany <= 0) | |
2e73a022 | 316 | return NULL; |
8efc0c15 | 317 | |
aa3378df | 318 | /* |
319 | * Get the next entry from the packet. These will abort with a fatal | |
320 | * error if the packet is too short or contains corrupt data. | |
321 | */ | |
6aacefa7 | 322 | switch (version) { |
2e73a022 | 323 | case 1: |
fa08c86b | 324 | key = key_new(KEY_RSA1); |
2e73a022 | 325 | bits = buffer_get_int(&auth->identities); |
326 | buffer_get_bignum(&auth->identities, key->rsa->e); | |
327 | buffer_get_bignum(&auth->identities, key->rsa->n); | |
328 | *comment = buffer_get_string(&auth->identities, NULL); | |
2ceb8101 | 329 | keybits = BN_num_bits(key->rsa->n); |
330 | if (keybits < 0 || bits != (u_int)keybits) | |
bbe88b6d | 331 | logit("Warning: identity keysize mismatch: actual %d, announced %u", |
2e73a022 | 332 | BN_num_bits(key->rsa->n), bits); |
333 | break; | |
334 | case 2: | |
335 | blob = buffer_get_string(&auth->identities, &blen); | |
336 | *comment = buffer_get_string(&auth->identities, NULL); | |
fa08c86b | 337 | key = key_from_blob(blob, blen); |
2e73a022 | 338 | xfree(blob); |
339 | break; | |
340 | default: | |
341 | return NULL; | |
2e73a022 | 342 | } |
5260325f | 343 | /* Decrement the number of remaining entries. */ |
344 | auth->howmany--; | |
2e73a022 | 345 | return key; |
8efc0c15 | 346 | } |
347 | ||
aa3378df | 348 | /* |
349 | * Generates a random challenge, sends it to the agent, and waits for | |
350 | * response from the agent. Returns true (non-zero) if the agent gave the | |
351 | * correct answer, zero otherwise. Response type selects the style of | |
352 | * response desired, with 0 corresponding to protocol version 1.0 (no longer | |
353 | * supported) and 1 corresponding to protocol version 1.1. | |
354 | */ | |
8efc0c15 | 355 | |
356 | int | |
357 | ssh_decrypt_challenge(AuthenticationConnection *auth, | |
2e73a022 | 358 | Key* key, BIGNUM *challenge, |
1e3b8b07 | 359 | u_char session_id[16], |
360 | u_int response_type, | |
361 | u_char response[16]) | |
8efc0c15 | 362 | { |
5260325f | 363 | Buffer buffer; |
c345cf9d | 364 | int success = 0; |
365 | int i; | |
366 | int type; | |
5260325f | 367 | |
fa08c86b | 368 | if (key->type != KEY_RSA1) |
2e73a022 | 369 | return 0; |
370 | if (response_type == 0) { | |
bbe88b6d | 371 | logit("Compatibility with ssh protocol version 1.0 no longer supported."); |
2e73a022 | 372 | return 0; |
373 | } | |
5260325f | 374 | buffer_init(&buffer); |
c345cf9d | 375 | buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE); |
2e73a022 | 376 | buffer_put_int(&buffer, BN_num_bits(key->rsa->n)); |
377 | buffer_put_bignum(&buffer, key->rsa->e); | |
378 | buffer_put_bignum(&buffer, key->rsa->n); | |
5260325f | 379 | buffer_put_bignum(&buffer, challenge); |
e6207598 | 380 | buffer_append(&buffer, session_id, 16); |
5260325f | 381 | buffer_put_int(&buffer, response_type); |
382 | ||
c345cf9d | 383 | if (ssh_request_reply(auth, &buffer, &buffer) == 0) { |
5260325f | 384 | buffer_free(&buffer); |
385 | return 0; | |
386 | } | |
c345cf9d | 387 | type = buffer_get_char(&buffer); |
5260325f | 388 | |
94ec8c6b | 389 | if (agent_failed(type)) { |
bbe88b6d | 390 | logit("Agent admitted failure to authenticate using the key."); |
c345cf9d | 391 | } else if (type != SSH_AGENT_RSA_RESPONSE) { |
392 | fatal("Bad authentication response: %d", type); | |
393 | } else { | |
394 | success = 1; | |
395 | /* | |
396 | * Get the response from the packet. This will abort with a | |
397 | * fatal error if the packet is corrupt. | |
398 | */ | |
399 | for (i = 0; i < 16; i++) | |
febd6f21 | 400 | response[i] = (u_char)buffer_get_char(&buffer); |
8efc0c15 | 401 | } |
5260325f | 402 | buffer_free(&buffer); |
c345cf9d | 403 | return success; |
5260325f | 404 | } |
8efc0c15 | 405 | |
2e73a022 | 406 | /* ask agent to sign data, returns -1 on error, 0 on success */ |
407 | int | |
408 | ssh_agent_sign(AuthenticationConnection *auth, | |
409 | Key *key, | |
c66f9d0e | 410 | u_char **sigp, u_int *lenp, |
411 | u_char *data, u_int datalen) | |
2e73a022 | 412 | { |
188adeb2 | 413 | extern int datafellows; |
2e73a022 | 414 | Buffer msg; |
1e3b8b07 | 415 | u_char *blob; |
416 | u_int blen; | |
188adeb2 | 417 | int type, flags = 0; |
2e73a022 | 418 | int ret = -1; |
419 | ||
fa08c86b | 420 | if (key_to_blob(key, &blob, &blen) == 0) |
2e73a022 | 421 | return -1; |
422 | ||
188adeb2 | 423 | if (datafellows & SSH_BUG_SIGBLOB) |
424 | flags = SSH_AGENT_OLD_SIGNATURE; | |
425 | ||
2e73a022 | 426 | buffer_init(&msg); |
427 | buffer_put_char(&msg, SSH2_AGENTC_SIGN_REQUEST); | |
428 | buffer_put_string(&msg, blob, blen); | |
429 | buffer_put_string(&msg, data, datalen); | |
188adeb2 | 430 | buffer_put_int(&msg, flags); |
2e73a022 | 431 | xfree(blob); |
432 | ||
433 | if (ssh_request_reply(auth, &msg, &msg) == 0) { | |
434 | buffer_free(&msg); | |
435 | return -1; | |
436 | } | |
437 | type = buffer_get_char(&msg); | |
94ec8c6b | 438 | if (agent_failed(type)) { |
bbe88b6d | 439 | logit("Agent admitted failure to sign using the key."); |
2e73a022 | 440 | } else if (type != SSH2_AGENT_SIGN_RESPONSE) { |
441 | fatal("Bad authentication response: %d", type); | |
442 | } else { | |
443 | ret = 0; | |
444 | *sigp = buffer_get_string(&msg, lenp); | |
445 | } | |
446 | buffer_free(&msg); | |
447 | return ret; | |
448 | } | |
449 | ||
4c8722d9 | 450 | /* Encode key for a message to the agent. */ |
451 | ||
396c147e | 452 | static void |
fa08c86b | 453 | ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment) |
4c8722d9 | 454 | { |
4c8722d9 | 455 | buffer_put_int(b, BN_num_bits(key->n)); |
456 | buffer_put_bignum(b, key->n); | |
457 | buffer_put_bignum(b, key->e); | |
458 | buffer_put_bignum(b, key->d); | |
459 | /* To keep within the protocol: p < q for ssh. in SSL p > q */ | |
460 | buffer_put_bignum(b, key->iqmp); /* ssh key->u */ | |
461 | buffer_put_bignum(b, key->q); /* ssh key->p, SSL key->q */ | |
462 | buffer_put_bignum(b, key->p); /* ssh key->q, SSL key->p */ | |
449c5ba5 | 463 | buffer_put_cstring(b, comment); |
4c8722d9 | 464 | } |
465 | ||
396c147e | 466 | static void |
fa08c86b | 467 | ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment) |
4c8722d9 | 468 | { |
fa08c86b | 469 | buffer_put_cstring(b, key_ssh_name(key)); |
6aacefa7 | 470 | switch (key->type) { |
fa08c86b | 471 | case KEY_RSA: |
472 | buffer_put_bignum2(b, key->rsa->n); | |
473 | buffer_put_bignum2(b, key->rsa->e); | |
474 | buffer_put_bignum2(b, key->rsa->d); | |
475 | buffer_put_bignum2(b, key->rsa->iqmp); | |
476 | buffer_put_bignum2(b, key->rsa->p); | |
477 | buffer_put_bignum2(b, key->rsa->q); | |
478 | break; | |
479 | case KEY_DSA: | |
480 | buffer_put_bignum2(b, key->dsa->p); | |
481 | buffer_put_bignum2(b, key->dsa->q); | |
482 | buffer_put_bignum2(b, key->dsa->g); | |
483 | buffer_put_bignum2(b, key->dsa->pub_key); | |
484 | buffer_put_bignum2(b, key->dsa->priv_key); | |
485 | break; | |
486 | } | |
487 | buffer_put_cstring(b, comment); | |
4c8722d9 | 488 | } |
489 | ||
aa3378df | 490 | /* |
491 | * Adds an identity to the authentication server. This call is not meant to | |
492 | * be used by normal applications. | |
493 | */ | |
8efc0c15 | 494 | |
6ae2364d | 495 | int |
ee900f87 | 496 | ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key, |
c4087616 | 497 | const char *comment, u_int life, u_int confirm) |
8efc0c15 | 498 | { |
2e73a022 | 499 | Buffer msg; |
c4087616 | 500 | int type, constrained = (life || confirm); |
5260325f | 501 | |
2e73a022 | 502 | buffer_init(&msg); |
4c8722d9 | 503 | |
504 | switch (key->type) { | |
fa08c86b | 505 | case KEY_RSA1: |
ee900f87 | 506 | type = constrained ? |
507 | SSH_AGENTC_ADD_RSA_ID_CONSTRAINED : | |
508 | SSH_AGENTC_ADD_RSA_IDENTITY; | |
509 | buffer_put_char(&msg, type); | |
fa08c86b | 510 | ssh_encode_identity_rsa1(&msg, key->rsa, comment); |
4c8722d9 | 511 | break; |
fa08c86b | 512 | case KEY_RSA: |
4c8722d9 | 513 | case KEY_DSA: |
ee900f87 | 514 | type = constrained ? |
515 | SSH2_AGENTC_ADD_ID_CONSTRAINED : | |
516 | SSH2_AGENTC_ADD_IDENTITY; | |
517 | buffer_put_char(&msg, type); | |
fa08c86b | 518 | ssh_encode_identity_ssh2(&msg, key, comment); |
4c8722d9 | 519 | break; |
520 | default: | |
2e73a022 | 521 | buffer_free(&msg); |
4c8722d9 | 522 | return 0; |
4c8722d9 | 523 | } |
ee900f87 | 524 | if (constrained) { |
525 | if (life != 0) { | |
526 | buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME); | |
527 | buffer_put_int(&msg, life); | |
528 | } | |
c4087616 | 529 | if (confirm != 0) |
530 | buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM); | |
ee900f87 | 531 | } |
2e73a022 | 532 | if (ssh_request_reply(auth, &msg, &msg) == 0) { |
533 | buffer_free(&msg); | |
5260325f | 534 | return 0; |
535 | } | |
2e73a022 | 536 | type = buffer_get_char(&msg); |
537 | buffer_free(&msg); | |
c345cf9d | 538 | return decode_reply(type); |
5260325f | 539 | } |
540 | ||
ee900f87 | 541 | int |
542 | ssh_add_identity(AuthenticationConnection *auth, Key *key, const char *comment) | |
543 | { | |
c4087616 | 544 | return ssh_add_identity_constrained(auth, key, comment, 0, 0); |
ee900f87 | 545 | } |
546 | ||
aa3378df | 547 | /* |
548 | * Removes an identity from the authentication server. This call is not | |
549 | * meant to be used by normal applications. | |
550 | */ | |
8efc0c15 | 551 | |
6ae2364d | 552 | int |
2e73a022 | 553 | ssh_remove_identity(AuthenticationConnection *auth, Key *key) |
8efc0c15 | 554 | { |
2e73a022 | 555 | Buffer msg; |
c345cf9d | 556 | int type; |
1e3b8b07 | 557 | u_char *blob; |
558 | u_int blen; | |
2e73a022 | 559 | |
560 | buffer_init(&msg); | |
561 | ||
fa08c86b | 562 | if (key->type == KEY_RSA1) { |
2e73a022 | 563 | buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY); |
564 | buffer_put_int(&msg, BN_num_bits(key->rsa->n)); | |
565 | buffer_put_bignum(&msg, key->rsa->e); | |
566 | buffer_put_bignum(&msg, key->rsa->n); | |
fa08c86b | 567 | } else if (key->type == KEY_DSA || key->type == KEY_RSA) { |
568 | key_to_blob(key, &blob, &blen); | |
2e73a022 | 569 | buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY); |
570 | buffer_put_string(&msg, blob, blen); | |
571 | xfree(blob); | |
572 | } else { | |
573 | buffer_free(&msg); | |
5260325f | 574 | return 0; |
575 | } | |
2e73a022 | 576 | if (ssh_request_reply(auth, &msg, &msg) == 0) { |
577 | buffer_free(&msg); | |
578 | return 0; | |
579 | } | |
580 | type = buffer_get_char(&msg); | |
581 | buffer_free(&msg); | |
c345cf9d | 582 | return decode_reply(type); |
5260325f | 583 | } |
584 | ||
983def13 | 585 | int |
aff51935 | 586 | ssh_update_card(AuthenticationConnection *auth, int add, |
ca719034 | 587 | const char *reader_id, const char *pin, u_int life, u_int confirm) |
983def13 | 588 | { |
589 | Buffer msg; | |
ca719034 | 590 | int type, constrained = (life || confirm); |
591 | ||
592 | if (add) { | |
593 | type = constrained ? | |
594 | SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED : | |
595 | SSH_AGENTC_ADD_SMARTCARD_KEY; | |
596 | } else | |
597 | type = SSH_AGENTC_REMOVE_SMARTCARD_KEY; | |
983def13 | 598 | |
599 | buffer_init(&msg); | |
ca719034 | 600 | buffer_put_char(&msg, type); |
9ff6f66f | 601 | buffer_put_cstring(&msg, reader_id); |
76139bd8 | 602 | buffer_put_cstring(&msg, pin); |
b6453d99 | 603 | |
ca719034 | 604 | if (constrained) { |
605 | if (life != 0) { | |
606 | buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME); | |
607 | buffer_put_int(&msg, life); | |
608 | } | |
609 | if (confirm != 0) | |
610 | buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM); | |
611 | } | |
612 | ||
983def13 | 613 | if (ssh_request_reply(auth, &msg, &msg) == 0) { |
614 | buffer_free(&msg); | |
615 | return 0; | |
616 | } | |
617 | type = buffer_get_char(&msg); | |
618 | buffer_free(&msg); | |
619 | return decode_reply(type); | |
620 | } | |
621 | ||
aa3378df | 622 | /* |
623 | * Removes all identities from the agent. This call is not meant to be used | |
624 | * by normal applications. | |
625 | */ | |
8efc0c15 | 626 | |
6ae2364d | 627 | int |
2e73a022 | 628 | ssh_remove_all_identities(AuthenticationConnection *auth, int version) |
8efc0c15 | 629 | { |
2e73a022 | 630 | Buffer msg; |
c345cf9d | 631 | int type; |
2e73a022 | 632 | int code = (version==1) ? |
633 | SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES : | |
634 | SSH2_AGENTC_REMOVE_ALL_IDENTITIES; | |
5260325f | 635 | |
2e73a022 | 636 | buffer_init(&msg); |
637 | buffer_put_char(&msg, code); | |
5260325f | 638 | |
2e73a022 | 639 | if (ssh_request_reply(auth, &msg, &msg) == 0) { |
640 | buffer_free(&msg); | |
5260325f | 641 | return 0; |
642 | } | |
2e73a022 | 643 | type = buffer_get_char(&msg); |
644 | buffer_free(&msg); | |
c345cf9d | 645 | return decode_reply(type); |
089fbbd2 | 646 | } |
647 | ||
2b87da3b | 648 | int |
c345cf9d | 649 | decode_reply(int type) |
089fbbd2 | 650 | { |
5260325f | 651 | switch (type) { |
652 | case SSH_AGENT_FAILURE: | |
94ec8c6b | 653 | case SSH_COM_AGENT2_FAILURE: |
65e683bd | 654 | case SSH2_AGENT_FAILURE: |
bbe88b6d | 655 | logit("SSH_AGENT_FAILURE"); |
5260325f | 656 | return 0; |
657 | case SSH_AGENT_SUCCESS: | |
5260325f | 658 | return 1; |
659 | default: | |
089fbbd2 | 660 | fatal("Bad response from authentication agent: %d", type); |
8efc0c15 | 661 | } |
5260325f | 662 | /* NOTREACHED */ |
663 | return 0; | |
664 | } |