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