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