Annotation of src/usr.bin/ssh/authfd.c, Revision 1.86.8.1
1.86.8.1! djm 1: /* $OpenBSD: authfd.c,v 1.87.2.1 2013/11/08 01:33:56 djm Exp $ */
1.1 deraadt 2: /*
1.13 deraadt 3: * Author: Tatu Ylonen <ylo@cs.hut.fi>
4: * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5: * All rights reserved
1.27 deraadt 6: * Functions for connecting the local authentication agent.
1.18 markus 7: *
1.27 deraadt 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".
1.18 markus 13: *
1.25 markus 14: * SSH2 implementation,
1.27 deraadt 15: * Copyright (c) 2000 Markus Friedl. All rights reserved.
1.25 markus 16: *
1.27 deraadt 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.
25: *
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.
1.13 deraadt 36: */
1.1 deraadt 37:
1.67 stevesk 38:
39: #include <sys/types.h>
40: #include <sys/un.h>
1.75 stevesk 41: #include <sys/socket.h>
1.33 markus 42:
43: #include <openssl/evp.h>
1.76 stevesk 44:
1.80 deraadt 45: #include <openssl/crypto.h>
1.76 stevesk 46: #include <fcntl.h>
1.79 stevesk 47: #include <stdlib.h>
1.80 deraadt 48: #include <signal.h>
1.78 stevesk 49: #include <string.h>
1.77 stevesk 50: #include <unistd.h>
1.1 deraadt 51:
1.80 deraadt 52: #include "xmalloc.h"
1.1 deraadt 53: #include "ssh.h"
54: #include "rsa.h"
55: #include "buffer.h"
1.22 markus 56: #include "key.h"
57: #include "authfd.h"
1.33 markus 58: #include "cipher.h"
1.22 markus 59: #include "kex.h"
1.28 markus 60: #include "compat.h"
1.33 markus 61: #include "log.h"
62: #include "atomicio.h"
1.74 djm 63: #include "misc.h"
1.2 provos 64:
1.57 stevesk 65: static int agent_present = 0;
66:
1.21 markus 67: /* helper */
1.24 markus 68: int decode_reply(int type);
1.21 markus 69:
1.29 markus 70: /* macro to check for "agent failure" message */
71: #define agent_failed(x) \
1.44 markus 72: ((x == SSH_AGENT_FAILURE) || (x == SSH_COM_AGENT2_FAILURE) || \
1.55 deraadt 73: (x == SSH2_AGENT_FAILURE))
1.29 markus 74:
1.57 stevesk 75: int
76: ssh_agent_present(void)
77: {
78: int authfd;
79:
80: if (agent_present)
81: return 1;
82: if ((authfd = ssh_get_authentication_socket()) == -1)
83: return 0;
84: else {
85: ssh_close_authentication_socket(authfd);
86: return 1;
87: }
88: }
89:
1.1 deraadt 90: /* Returns the number of the authentication fd, or -1 if there is none. */
91:
1.2 provos 92: int
1.32 markus 93: ssh_get_authentication_socket(void)
1.1 deraadt 94: {
1.12 markus 95: const char *authsocket;
1.45 stevesk 96: int sock;
1.12 markus 97: struct sockaddr_un sunaddr;
98:
99: authsocket = getenv(SSH_AUTHSOCKET_ENV_NAME);
100: if (!authsocket)
101: return -1;
102:
1.86 tedu 103: bzero(&sunaddr, sizeof(sunaddr));
1.12 markus 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 */
1.85 djm 112: if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) {
1.12 markus 113: close(sock);
114: return -1;
115: }
1.71 deraadt 116: if (connect(sock, (struct sockaddr *)&sunaddr, sizeof sunaddr) < 0) {
1.12 markus 117: close(sock);
118: return -1;
119: }
1.57 stevesk 120: agent_present = 1;
1.12 markus 121: return sock;
1.1 deraadt 122: }
123:
1.41 itojun 124: static int
1.25 markus 125: ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)
1.24 markus 126: {
1.66 djm 127: u_int l, len;
1.24 markus 128: char buf[1024];
129:
130: /* Get the length of the message, and format it in the buffer. */
131: len = buffer_len(request);
1.74 djm 132: put_u32(buf, len);
1.24 markus 133:
134: /* Send the length and then the packet to the agent. */
1.61 deraadt 135: if (atomicio(vwrite, auth->fd, buf, 4) != 4 ||
136: atomicio(vwrite, auth->fd, buffer_ptr(request),
1.24 markus 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: */
1.64 avsm 145: if (atomicio(read, auth->fd, buf, 4) != 4) {
146: error("Error reading response length from authentication socket.");
147: return 0;
1.24 markus 148: }
149:
150: /* Extract the length, and check it for sanity. */
1.74 djm 151: len = get_u32(buf);
1.24 markus 152: if (len > 256 * 1024)
1.62 miod 153: fatal("Authentication response too long: %u", len);
1.24 markus 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);
1.65 avsm 161: if (atomicio(read, auth->fd, buf, l) != l) {
1.24 markus 162: error("Error reading response from authentication socket.");
163: return 0;
164: }
1.56 markus 165: buffer_append(reply, buf, l);
1.24 markus 166: len -= l;
167: }
168: return 1;
169: }
170:
1.14 markus 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: */
1.1 deraadt 176:
1.18 markus 177: void
1.12 markus 178: ssh_close_authentication_socket(int sock)
1.1 deraadt 179: {
1.12 markus 180: if (getenv(SSH_AUTHSOCKET_ENV_NAME))
181: close(sock);
1.1 deraadt 182: }
183:
1.14 markus 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: */
1.1 deraadt 191:
1.12 markus 192: AuthenticationConnection *
1.32 markus 193: ssh_get_authentication_connection(void)
1.1 deraadt 194: {
1.12 markus 195: AuthenticationConnection *auth;
196: int sock;
1.1 deraadt 197:
1.12 markus 198: sock = ssh_get_authentication_socket();
199:
1.14 markus 200: /*
201: * Fail if we couldn't obtain a connection. This happens if we
202: * exited due to a timeout.
203: */
1.12 markus 204: if (sock < 0)
205: return NULL;
206:
1.86.8.1! djm 207: auth = xcalloc(1, sizeof(*auth));
1.12 markus 208: auth->fd = sock;
209: buffer_init(&auth->identities);
210: auth->howmany = 0;
211:
212: return auth;
1.1 deraadt 213: }
214:
1.14 markus 215: /*
216: * Closes the connection to the authentication agent and frees any associated
217: * memory.
218: */
1.1 deraadt 219:
1.18 markus 220: void
1.25 markus 221: ssh_close_authentication_connection(AuthenticationConnection *auth)
1.1 deraadt 222: {
1.25 markus 223: buffer_free(&auth->identities);
224: close(auth->fd);
225: xfree(auth);
1.50 markus 226: }
227:
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);
1.1 deraadt 246: }
247:
1.14 markus 248: /*
249: * Returns the first authentication identity held by the agent.
250: */
1.1 deraadt 251:
1.30 markus 252: int
253: ssh_get_num_identities(AuthenticationConnection *auth, int version)
1.1 deraadt 254: {
1.25 markus 255: int type, code1 = 0, code2 = 0;
1.24 markus 256: Buffer request;
1.25 markus 257:
1.46 deraadt 258: switch (version) {
1.25 markus 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:
1.30 markus 268: return 0;
1.25 markus 269: }
1.1 deraadt 270:
1.14 markus 271: /*
272: * Send a message to the agent requesting for a list of the
273: * identities it can represent.
274: */
1.24 markus 275: buffer_init(&request);
1.25 markus 276: buffer_put_char(&request, code1);
1.12 markus 277:
278: buffer_clear(&auth->identities);
1.24 markus 279: if (ssh_request_reply(auth, &request, &auth->identities) == 0) {
280: buffer_free(&request);
1.30 markus 281: return 0;
1.12 markus 282: }
1.24 markus 283: buffer_free(&request);
1.1 deraadt 284:
1.12 markus 285: /* Get message type, and verify that we got a proper answer. */
1.24 markus 286: type = buffer_get_char(&auth->identities);
1.29 markus 287: if (agent_failed(type)) {
1.30 markus 288: return 0;
1.25 markus 289: } else if (type != code2) {
1.24 markus 290: fatal("Bad authentication reply message type: %d", type);
1.25 markus 291: }
1.12 markus 292:
293: /* Get the number of entries in the response and check it for sanity. */
294: auth->howmany = buffer_get_int(&auth->identities);
1.62 miod 295: if ((u_int)auth->howmany > 1024)
1.37 millert 296: fatal("Too many identities in authentication reply: %d",
1.24 markus 297: auth->howmany);
1.12 markus 298:
1.30 markus 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;
1.1 deraadt 309: }
310:
1.25 markus 311: Key *
312: ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version)
1.1 deraadt 313: {
1.66 djm 314: int keybits;
1.31 markus 315: u_int bits;
316: u_char *blob;
317: u_int blen;
1.25 markus 318: Key *key = NULL;
1.9 markus 319:
1.12 markus 320: /* Return failure if no more entries. */
321: if (auth->howmany <= 0)
1.25 markus 322: return NULL;
1.12 markus 323:
1.14 markus 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: */
1.46 deraadt 328: switch (version) {
1.25 markus 329: case 1:
1.30 markus 330: key = key_new(KEY_RSA1);
1.25 markus 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);
1.66 djm 335: keybits = BN_num_bits(key->rsa->n);
336: if (keybits < 0 || bits != (u_int)keybits)
1.59 itojun 337: logit("Warning: identity keysize mismatch: actual %d, announced %u",
1.25 markus 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);
1.30 markus 343: key = key_from_blob(blob, blen);
1.25 markus 344: xfree(blob);
345: break;
346: default:
347: return NULL;
348: }
1.12 markus 349: /* Decrement the number of remaining entries. */
350: auth->howmany--;
1.25 markus 351: return key;
1.1 deraadt 352: }
353:
1.14 markus 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: */
1.1 deraadt 361:
1.2 provos 362: int
363: ssh_decrypt_challenge(AuthenticationConnection *auth,
1.25 markus 364: Key* key, BIGNUM *challenge,
1.31 markus 365: u_char session_id[16],
366: u_int response_type,
367: u_char response[16])
1.1 deraadt 368: {
1.12 markus 369: Buffer buffer;
1.24 markus 370: int success = 0;
371: int i;
372: int type;
1.12 markus 373:
1.30 markus 374: if (key->type != KEY_RSA1)
1.25 markus 375: return 0;
376: if (response_type == 0) {
1.59 itojun 377: logit("Compatibility with ssh protocol version 1.0 no longer supported.");
1.25 markus 378: return 0;
379: }
1.12 markus 380: buffer_init(&buffer);
1.24 markus 381: buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
1.25 markus 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);
1.12 markus 385: buffer_put_bignum(&buffer, challenge);
1.47 stevesk 386: buffer_append(&buffer, session_id, 16);
1.12 markus 387: buffer_put_int(&buffer, response_type);
388:
1.24 markus 389: if (ssh_request_reply(auth, &buffer, &buffer) == 0) {
1.12 markus 390: buffer_free(&buffer);
391: return 0;
392: }
1.24 markus 393: type = buffer_get_char(&buffer);
1.12 markus 394:
1.29 markus 395: if (agent_failed(type)) {
1.59 itojun 396: logit("Agent admitted failure to authenticate using the key.");
1.24 markus 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++)
1.73 deraadt 406: response[i] = (u_char)buffer_get_char(&buffer);
1.12 markus 407: }
408: buffer_free(&buffer);
1.24 markus 409: return success;
1.12 markus 410: }
1.1 deraadt 411:
1.25 markus 412: /* ask agent to sign data, returns -1 on error, 0 on success */
413: int
414: ssh_agent_sign(AuthenticationConnection *auth,
415: Key *key,
1.48 markus 416: u_char **sigp, u_int *lenp,
417: u_char *data, u_int datalen)
1.25 markus 418: {
1.28 markus 419: extern int datafellows;
1.25 markus 420: Buffer msg;
1.31 markus 421: u_char *blob;
422: u_int blen;
1.28 markus 423: int type, flags = 0;
1.25 markus 424: int ret = -1;
425:
1.30 markus 426: if (key_to_blob(key, &blob, &blen) == 0)
1.25 markus 427: return -1;
428:
1.28 markus 429: if (datafellows & SSH_BUG_SIGBLOB)
430: flags = SSH_AGENT_OLD_SIGNATURE;
431:
1.25 markus 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);
1.28 markus 436: buffer_put_int(&msg, flags);
1.25 markus 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);
1.29 markus 444: if (agent_failed(type)) {
1.59 itojun 445: logit("Agent admitted failure to sign using the key.");
1.25 markus 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:
1.22 markus 456: /* Encode key for a message to the agent. */
457:
1.41 itojun 458: static void
1.30 markus 459: ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
1.22 markus 460: {
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 */
1.40 markus 469: buffer_put_cstring(b, comment);
1.22 markus 470: }
471:
1.41 itojun 472: static void
1.30 markus 473: ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
1.22 markus 474: {
1.30 markus 475: buffer_put_cstring(b, key_ssh_name(key));
1.46 deraadt 476: switch (key->type) {
1.30 markus 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;
1.83 djm 485: case KEY_RSA_CERT_V00:
1.82 djm 486: case KEY_RSA_CERT:
487: if (key->cert == NULL || buffer_len(&key->cert->certblob) == 0)
488: fatal("%s: no cert/certblob", __func__);
489: buffer_put_string(b, buffer_ptr(&key->cert->certblob),
490: buffer_len(&key->cert->certblob));
491: buffer_put_bignum2(b, key->rsa->d);
492: buffer_put_bignum2(b, key->rsa->iqmp);
493: buffer_put_bignum2(b, key->rsa->p);
494: buffer_put_bignum2(b, key->rsa->q);
495: break;
1.30 markus 496: case KEY_DSA:
497: buffer_put_bignum2(b, key->dsa->p);
498: buffer_put_bignum2(b, key->dsa->q);
499: buffer_put_bignum2(b, key->dsa->g);
500: buffer_put_bignum2(b, key->dsa->pub_key);
501: buffer_put_bignum2(b, key->dsa->priv_key);
502: break;
1.83 djm 503: case KEY_DSA_CERT_V00:
1.82 djm 504: case KEY_DSA_CERT:
505: if (key->cert == NULL || buffer_len(&key->cert->certblob) == 0)
506: fatal("%s: no cert/certblob", __func__);
507: buffer_put_string(b, buffer_ptr(&key->cert->certblob),
508: buffer_len(&key->cert->certblob));
509: buffer_put_bignum2(b, key->dsa->priv_key);
510: break;
1.84 djm 511: case KEY_ECDSA:
512: buffer_put_cstring(b, key_curve_nid_to_name(key->ecdsa_nid));
513: buffer_put_ecpoint(b, EC_KEY_get0_group(key->ecdsa),
514: EC_KEY_get0_public_key(key->ecdsa));
515: buffer_put_bignum2(b, EC_KEY_get0_private_key(key->ecdsa));
516: break;
517: case KEY_ECDSA_CERT:
518: if (key->cert == NULL || buffer_len(&key->cert->certblob) == 0)
519: fatal("%s: no cert/certblob", __func__);
520: buffer_put_string(b, buffer_ptr(&key->cert->certblob),
521: buffer_len(&key->cert->certblob));
522: buffer_put_bignum2(b, EC_KEY_get0_private_key(key->ecdsa));
523: break;
1.30 markus 524: }
525: buffer_put_cstring(b, comment);
1.22 markus 526: }
527:
1.14 markus 528: /*
529: * Adds an identity to the authentication server. This call is not meant to
530: * be used by normal applications.
531: */
1.1 deraadt 532:
1.18 markus 533: int
1.54 markus 534: ssh_add_identity_constrained(AuthenticationConnection *auth, Key *key,
1.58 markus 535: const char *comment, u_int life, u_int confirm)
1.1 deraadt 536: {
1.25 markus 537: Buffer msg;
1.58 markus 538: int type, constrained = (life || confirm);
1.12 markus 539:
1.25 markus 540: buffer_init(&msg);
1.22 markus 541:
542: switch (key->type) {
1.30 markus 543: case KEY_RSA1:
1.54 markus 544: type = constrained ?
545: SSH_AGENTC_ADD_RSA_ID_CONSTRAINED :
546: SSH_AGENTC_ADD_RSA_IDENTITY;
547: buffer_put_char(&msg, type);
1.30 markus 548: ssh_encode_identity_rsa1(&msg, key->rsa, comment);
549: break;
1.22 markus 550: case KEY_RSA:
1.82 djm 551: case KEY_RSA_CERT:
1.83 djm 552: case KEY_RSA_CERT_V00:
1.22 markus 553: case KEY_DSA:
1.82 djm 554: case KEY_DSA_CERT:
1.83 djm 555: case KEY_DSA_CERT_V00:
1.84 djm 556: case KEY_ECDSA:
557: case KEY_ECDSA_CERT:
1.54 markus 558: type = constrained ?
559: SSH2_AGENTC_ADD_ID_CONSTRAINED :
560: SSH2_AGENTC_ADD_IDENTITY;
561: buffer_put_char(&msg, type);
1.30 markus 562: ssh_encode_identity_ssh2(&msg, key, comment);
1.22 markus 563: break;
564: default:
1.25 markus 565: buffer_free(&msg);
1.22 markus 566: return 0;
567: }
1.54 markus 568: if (constrained) {
569: if (life != 0) {
570: buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
571: buffer_put_int(&msg, life);
572: }
1.58 markus 573: if (confirm != 0)
574: buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
1.54 markus 575: }
1.25 markus 576: if (ssh_request_reply(auth, &msg, &msg) == 0) {
577: buffer_free(&msg);
1.12 markus 578: return 0;
579: }
1.25 markus 580: type = buffer_get_char(&msg);
581: buffer_free(&msg);
1.24 markus 582: return decode_reply(type);
1.54 markus 583: }
584:
1.14 markus 585: /*
586: * Removes an identity from the authentication server. This call is not
587: * meant to be used by normal applications.
588: */
1.1 deraadt 589:
1.18 markus 590: int
1.25 markus 591: ssh_remove_identity(AuthenticationConnection *auth, Key *key)
1.1 deraadt 592: {
1.25 markus 593: Buffer msg;
1.24 markus 594: int type;
1.31 markus 595: u_char *blob;
596: u_int blen;
1.12 markus 597:
1.25 markus 598: buffer_init(&msg);
1.12 markus 599:
1.30 markus 600: if (key->type == KEY_RSA1) {
1.25 markus 601: buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
602: buffer_put_int(&msg, BN_num_bits(key->rsa->n));
603: buffer_put_bignum(&msg, key->rsa->e);
604: buffer_put_bignum(&msg, key->rsa->n);
1.82 djm 605: } else if (key_type_plain(key->type) == KEY_DSA ||
1.84 djm 606: key_type_plain(key->type) == KEY_RSA ||
607: key_type_plain(key->type) == KEY_ECDSA) {
1.30 markus 608: key_to_blob(key, &blob, &blen);
1.25 markus 609: buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
1.51 markus 610: buffer_put_string(&msg, blob, blen);
611: xfree(blob);
612: } else {
613: buffer_free(&msg);
614: return 0;
615: }
1.42 markus 616: if (ssh_request_reply(auth, &msg, &msg) == 0) {
617: buffer_free(&msg);
618: return 0;
619: }
620: type = buffer_get_char(&msg);
621: buffer_free(&msg);
622: return decode_reply(type);
623: }
624:
625: int
1.63 djm 626: ssh_update_card(AuthenticationConnection *auth, int add,
1.60 djm 627: const char *reader_id, const char *pin, u_int life, u_int confirm)
1.42 markus 628: {
629: Buffer msg;
1.60 djm 630: int type, constrained = (life || confirm);
631:
632: if (add) {
633: type = constrained ?
634: SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED :
635: SSH_AGENTC_ADD_SMARTCARD_KEY;
636: } else
637: type = SSH_AGENTC_REMOVE_SMARTCARD_KEY;
1.42 markus 638:
639: buffer_init(&msg);
1.60 djm 640: buffer_put_char(&msg, type);
1.43 markus 641: buffer_put_cstring(&msg, reader_id);
1.49 rees 642: buffer_put_cstring(&msg, pin);
1.63 djm 643:
1.60 djm 644: if (constrained) {
645: if (life != 0) {
646: buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_LIFETIME);
647: buffer_put_int(&msg, life);
648: }
649: if (confirm != 0)
650: buffer_put_char(&msg, SSH_AGENT_CONSTRAIN_CONFIRM);
651: }
652:
1.25 markus 653: if (ssh_request_reply(auth, &msg, &msg) == 0) {
654: buffer_free(&msg);
1.12 markus 655: return 0;
656: }
1.25 markus 657: type = buffer_get_char(&msg);
658: buffer_free(&msg);
1.24 markus 659: return decode_reply(type);
1.12 markus 660: }
661:
1.14 markus 662: /*
663: * Removes all identities from the agent. This call is not meant to be used
664: * by normal applications.
665: */
1.1 deraadt 666:
1.18 markus 667: int
1.25 markus 668: ssh_remove_all_identities(AuthenticationConnection *auth, int version)
1.1 deraadt 669: {
1.25 markus 670: Buffer msg;
1.24 markus 671: int type;
1.25 markus 672: int code = (version==1) ?
673: SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES :
674: SSH2_AGENTC_REMOVE_ALL_IDENTITIES;
1.12 markus 675:
1.25 markus 676: buffer_init(&msg);
677: buffer_put_char(&msg, code);
1.12 markus 678:
1.25 markus 679: if (ssh_request_reply(auth, &msg, &msg) == 0) {
680: buffer_free(&msg);
1.12 markus 681: return 0;
682: }
1.25 markus 683: type = buffer_get_char(&msg);
684: buffer_free(&msg);
1.24 markus 685: return decode_reply(type);
1.21 markus 686: }
687:
1.35 stevesk 688: int
1.24 markus 689: decode_reply(int type)
1.21 markus 690: {
1.12 markus 691: switch (type) {
692: case SSH_AGENT_FAILURE:
1.29 markus 693: case SSH_COM_AGENT2_FAILURE:
1.44 markus 694: case SSH2_AGENT_FAILURE:
1.59 itojun 695: logit("SSH_AGENT_FAILURE");
1.12 markus 696: return 0;
697: case SSH_AGENT_SUCCESS:
698: return 1;
699: default:
1.21 markus 700: fatal("Bad response from authentication agent: %d", type);
1.12 markus 701: }
702: /* NOTREACHED */
703: return 0;
704: }
![[BACK]](/icons/back.gif){kind=icon}
Return to authfd.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / ssh