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