Annotation of src/usr.bin/ssh/ssh-add.c, Revision 1.122
1.122 ! naddy 1: /* $OpenBSD: ssh-add.c,v 1.121 2015/03/25 19:29:58 markus 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
6: * Adds an identity to the authentication server, or removes an identity.
1.19 markus 7: *
1.22 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".
13: *
1.19 markus 14: * SSH2 implementation,
1.41 markus 15: * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
1.22 deraadt 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.
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.75 stevesk 38: #include <sys/types.h>
39: #include <sys/stat.h>
1.16 markus 40:
1.19 markus 41: #include <openssl/evp.h>
1.81 stevesk 42:
1.116 djm 43: #include <errno.h>
1.82 stevesk 44: #include <fcntl.h>
1.81 stevesk 45: #include <pwd.h>
1.88 stevesk 46: #include <stdio.h>
1.87 stevesk 47: #include <stdlib.h>
1.85 stevesk 48: #include <string.h>
1.84 stevesk 49: #include <unistd.h>
1.117 deraadt 50: #include <limits.h>
1.1 deraadt 51:
1.89 deraadt 52: #include "xmalloc.h"
1.27 markus 53: #include "ssh.h"
1.1 deraadt 54: #include "rsa.h"
1.27 markus 55: #include "log.h"
1.116 djm 56: #include "sshkey.h"
57: #include "sshbuf.h"
1.18 markus 58: #include "authfd.h"
1.16 markus 59: #include "authfile.h"
1.25 markus 60: #include "pathnames.h"
1.57 stevesk 61: #include "misc.h"
1.110 djm 62: #include "ssherr.h"
1.115 djm 63: #include "digest.h"
1.1 deraadt 64:
1.45 jakob 65: /* argv0 */
66: extern char *__progname;
67:
1.48 djm 68: /* Default files to add */
69: static char *default_files[] = {
70: _PATH_SSH_CLIENT_ID_RSA,
71: _PATH_SSH_CLIENT_ID_DSA,
1.99 djm 72: _PATH_SSH_CLIENT_ID_ECDSA,
1.107 pascal 73: _PATH_SSH_CLIENT_ID_ED25519,
1.122 ! naddy 74: #ifdef WITH_SSH1
1.51 markus 75: _PATH_SSH_CLIENT_IDENTITY,
1.122 ! naddy 76: #endif
1.48 djm 77: NULL
78: };
79:
1.115 djm 80: static int fingerprint_hash = SSH_FP_HASH_DEFAULT;
81:
1.56 markus 82: /* Default lifetime (0 == forever) */
1.57 stevesk 83: static int lifetime = 0;
1.48 djm 84:
1.65 markus 85: /* User has to confirm key use */
86: static int confirm = 0;
87:
1.33 markus 88: /* we keep a cache of one passphrases */
89: static char *pass = NULL;
1.39 itojun 90: static void
1.33 markus 91: clear_pass(void)
92: {
93: if (pass) {
1.109 djm 94: explicit_bzero(pass, strlen(pass));
1.106 djm 95: free(pass);
1.33 markus 96: pass = NULL;
97: }
98: }
99:
1.46 djm 100: static int
1.116 djm 101: delete_file(int agent_fd, const char *filename, int key_only)
1.1 deraadt 102: {
1.116 djm 103: struct sshkey *public, *cert = NULL;
1.104 djm 104: char *certpath = NULL, *comment = NULL;
1.116 djm 105: int r, ret = -1;
1.1 deraadt 106:
1.116 djm 107: if ((r = sshkey_load_public(filename, &public, &comment)) != 0) {
108: printf("Bad key file %s: %s\n", filename, ssh_err(r));
1.46 djm 109: return -1;
1.12 markus 110: }
1.116 djm 111: if ((r = ssh_remove_identity(agent_fd, public)) == 0) {
1.12 markus 112: fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
1.46 djm 113: ret = 0;
114: } else
1.116 djm 115: fprintf(stderr, "Could not remove identity \"%s\": %s\n",
116: filename, ssh_err(r));
1.46 djm 117:
1.104 djm 118: if (key_only)
119: goto out;
120:
121: /* Now try to delete the corresponding certificate too */
122: free(comment);
1.105 markus 123: comment = NULL;
1.104 djm 124: xasprintf(&certpath, "%s-cert.pub", filename);
1.120 halex 125: if ((r = sshkey_load_public(certpath, &cert, &comment)) != 0) {
126: if (r != SSH_ERR_SYSTEM_ERROR || errno != ENOENT)
127: error("Failed to load certificate \"%s\": %s",
128: certpath, ssh_err(r));
1.104 djm 129: goto out;
1.120 halex 130: }
131:
1.116 djm 132: if (!sshkey_equal_public(cert, public))
1.104 djm 133: fatal("Certificate %s does not match private key %s",
134: certpath, filename);
135:
1.120 halex 136: if ((r = ssh_remove_identity(agent_fd, cert)) == 0) {
1.104 djm 137: fprintf(stderr, "Identity removed: %s (%s)\n", certpath,
138: comment);
139: ret = 0;
140: } else
1.120 halex 141: fprintf(stderr, "Could not remove identity \"%s\": %s\n",
142: certpath, ssh_err(r));
1.104 djm 143:
144: out:
145: if (cert != NULL)
1.116 djm 146: sshkey_free(cert);
1.104 djm 147: if (public != NULL)
1.116 djm 148: sshkey_free(public);
1.104 djm 149: free(certpath);
150: free(comment);
1.47 deraadt 151:
1.46 djm 152: return ret;
1.1 deraadt 153: }
154:
1.19 markus 155: /* Send a request to remove all identities. */
1.46 djm 156: static int
1.116 djm 157: delete_all(int agent_fd)
1.1 deraadt 158: {
1.46 djm 159: int ret = -1;
1.19 markus 160:
1.121 markus 161: if (ssh_remove_all_identities(agent_fd, 2) == 0)
1.46 djm 162: ret = 0;
1.121 markus 163: /* ignore error-code for ssh1 */
164: ssh_remove_all_identities(agent_fd, 1);
1.19 markus 165:
1.46 djm 166: if (ret == 0)
1.12 markus 167: fprintf(stderr, "All identities removed.\n");
168: else
1.24 markus 169: fprintf(stderr, "Failed to remove all identities.\n");
1.46 djm 170:
171: return ret;
1.1 deraadt 172: }
173:
1.46 djm 174: static int
1.116 djm 175: add_file(int agent_fd, const char *filename, int key_only)
1.1 deraadt 176: {
1.116 djm 177: struct sshkey *private, *cert;
1.36 markus 178: char *comment = NULL;
1.102 djm 179: char msg[1024], *certpath = NULL;
1.116 djm 180: int r, fd, ret = -1;
181: struct sshbuf *keyblob;
1.12 markus 182:
1.101 djm 183: if (strcmp(filename, "-") == 0) {
184: fd = STDIN_FILENO;
185: filename = "(stdin)";
186: } else if ((fd = open(filename, O_RDONLY)) < 0) {
1.19 markus 187: perror(filename);
1.46 djm 188: return -1;
1.19 markus 189: }
1.76 dtucker 190:
191: /*
192: * Since we'll try to load a keyfile multiple times, permission errors
193: * will occur multiple times, so check perms first and bail if wrong.
194: */
1.101 djm 195: if (fd != STDIN_FILENO) {
1.116 djm 196: if (sshkey_perm_ok(fd, filename) != 0) {
1.101 djm 197: close(fd);
198: return -1;
199: }
200: }
1.116 djm 201: if ((keyblob = sshbuf_new()) == NULL)
202: fatal("%s: sshbuf_new failed", __func__);
203: if ((r = sshkey_load_file(fd, keyblob)) != 0) {
204: fprintf(stderr, "Error loading key \"%s\": %s\n",
205: filename, ssh_err(r));
206: sshbuf_free(keyblob);
1.101 djm 207: close(fd);
208: return -1;
209: }
1.76 dtucker 210: close(fd);
211:
1.12 markus 212: /* At first, try empty passphrase */
1.116 djm 213: if ((r = sshkey_parse_private_fileblob(keyblob, "", filename,
214: &private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
215: fprintf(stderr, "Error loading key \"%s\": %s\n",
216: filename, ssh_err(r));
217: goto fail_load;
218: }
1.33 markus 219: /* try last */
1.110 djm 220: if (private == NULL && pass != NULL) {
1.116 djm 221: if ((r = sshkey_parse_private_fileblob(keyblob, pass, filename,
1.110 djm 222: &private, &comment)) != 0 &&
1.116 djm 223: r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
224: fprintf(stderr, "Error loading key \"%s\": %s\n",
225: filename, ssh_err(r));
226: goto fail_load;
227: }
1.110 djm 228: }
1.113 benno 229: if (comment == NULL)
230: comment = xstrdup(filename);
1.31 markus 231: if (private == NULL) {
1.33 markus 232: /* clear passphrase since it did not work */
233: clear_pass();
1.119 halex 234: snprintf(msg, sizeof msg, "Enter passphrase for %.200s%s: ",
235: comment, confirm ? " (will confirm each use)" : "");
1.12 markus 236: for (;;) {
1.40 markus 237: pass = read_passphrase(msg, RP_ALLOW_STDIN);
1.116 djm 238: if (strcmp(pass, "") == 0)
239: goto fail_load;
240: if ((r = sshkey_parse_private_fileblob(keyblob, pass,
241: filename, &private, NULL)) == 0)
242: break;
243: else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
244: fprintf(stderr,
245: "Error loading key \"%s\": %s\n",
246: filename, ssh_err(r));
247: fail_load:
1.35 markus 248: clear_pass();
1.106 djm 249: free(comment);
1.116 djm 250: sshbuf_free(keyblob);
1.46 djm 251: return -1;
1.12 markus 252: }
1.33 markus 253: clear_pass();
1.68 markus 254: snprintf(msg, sizeof msg,
1.119 halex 255: "Bad passphrase, try again for %.200s%s: ", comment,
256: confirm ? " (will confirm each use)" : "");
1.12 markus 257: }
258: }
1.116 djm 259: sshbuf_free(keyblob);
1.60 markus 260:
1.116 djm 261: if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
262: lifetime, confirm)) == 0) {
1.60 markus 263: fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
264: ret = 0;
265: if (lifetime != 0)
1.64 deraadt 266: fprintf(stderr,
1.60 markus 267: "Lifetime set to %d seconds\n", lifetime);
1.69 djm 268: if (confirm != 0)
1.65 markus 269: fprintf(stderr,
1.96 djm 270: "The user must confirm each use of the key\n");
1.60 markus 271: } else {
1.116 djm 272: fprintf(stderr, "Could not add identity \"%s\": %s\n",
273: filename, ssh_err(r));
1.56 markus 274: }
275:
1.102 djm 276: /* Skip trying to load the cert if requested */
277: if (key_only)
278: goto out;
1.93 djm 279:
280: /* Now try to add the certificate flavour too */
281: xasprintf(&certpath, "%s-cert.pub", filename);
1.116 djm 282: if ((r = sshkey_load_public(certpath, &cert, NULL)) != 0) {
283: if (r != SSH_ERR_SYSTEM_ERROR || errno != ENOENT)
284: error("Failed to load certificate \"%s\": %s",
285: certpath, ssh_err(r));
1.96 djm 286: goto out;
1.116 djm 287: }
1.96 djm 288:
1.116 djm 289: if (!sshkey_equal_public(cert, private)) {
1.96 djm 290: error("Certificate %s does not match private key %s",
291: certpath, filename);
1.116 djm 292: sshkey_free(cert);
1.96 djm 293: goto out;
294: }
1.93 djm 295:
1.96 djm 296: /* Graft with private bits */
1.116 djm 297: if ((r = sshkey_to_certified(private,
298: sshkey_cert_is_legacy(cert))) != 0) {
299: error("%s: sshkey_to_certified: %s", __func__, ssh_err(r));
300: sshkey_free(cert);
301: goto out;
302: }
303: if ((r = sshkey_cert_copy(cert, private)) != 0) {
304: error("%s: key_cert_copy: %s", __func__, ssh_err(r));
305: sshkey_free(cert);
1.96 djm 306: goto out;
1.94 otto 307: }
1.116 djm 308: sshkey_free(cert);
1.93 djm 309:
1.116 djm 310: if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
311: lifetime, confirm)) != 0) {
312: error("Certificate %s (%s) add failed: %s", certpath,
313: private->cert->key_id, ssh_err(r));
314: goto out;
1.96 djm 315: }
316: fprintf(stderr, "Certificate added: %s (%s)\n", certpath,
317: private->cert->key_id);
318: if (lifetime != 0)
319: fprintf(stderr, "Lifetime set to %d seconds\n", lifetime);
320: if (confirm != 0)
321: fprintf(stderr, "The user must confirm each use of the key\n");
322: out:
1.116 djm 323: free(certpath);
1.106 djm 324: free(comment);
1.116 djm 325: sshkey_free(private);
1.47 deraadt 326:
1.46 djm 327: return ret;
1.1 deraadt 328: }
329:
1.46 djm 330: static int
1.116 djm 331: update_card(int agent_fd, int add, const char *id)
1.42 markus 332: {
1.108 djm 333: char *pin = NULL;
1.116 djm 334: int r, ret = -1;
1.53 rees 335:
1.108 djm 336: if (add) {
337: if ((pin = read_passphrase("Enter passphrase for PKCS#11: ",
338: RP_ALLOW_STDIN)) == NULL)
339: return -1;
340: }
1.53 rees 341:
1.116 djm 342: if ((r = ssh_update_card(agent_fd, add, id, pin == NULL ? "" : pin,
343: lifetime, confirm)) == 0) {
1.44 markus 344: fprintf(stderr, "Card %s: %s\n",
1.47 deraadt 345: add ? "added" : "removed", id);
1.66 markus 346: ret = 0;
1.46 djm 347: } else {
1.116 djm 348: fprintf(stderr, "Could not %s card \"%s\": %s\n",
349: add ? "add" : "remove", id, ssh_err(r));
1.66 markus 350: ret = -1;
1.46 djm 351: }
1.106 djm 352: free(pin);
1.66 markus 353: return ret;
1.42 markus 354: }
355:
1.50 markus 356: static int
1.116 djm 357: list_identities(int agent_fd, int do_fp)
1.1 deraadt 358: {
1.116 djm 359: char *fp;
1.121 markus 360: int r, had_identities = 0;
1.116 djm 361: struct ssh_identitylist *idlist;
362: size_t i;
1.121 markus 363: #ifdef WITH_SSH1
364: int version = 1;
365: #else
366: int version = 2;
367: #endif
1.12 markus 368:
1.121 markus 369: for (; version <= 2; version++) {
1.116 djm 370: if ((r = ssh_fetch_identitylist(agent_fd, version,
371: &idlist)) != 0) {
372: if (r != SSH_ERR_AGENT_NO_IDENTITIES)
373: fprintf(stderr, "error fetching identities for "
374: "protocol %d: %s\n", version, ssh_err(r));
375: continue;
376: }
377: for (i = 0; i < idlist->nkeys; i++) {
1.19 markus 378: had_identities = 1;
1.30 markus 379: if (do_fp) {
1.116 djm 380: fp = sshkey_fingerprint(idlist->keys[i],
381: fingerprint_hash, SSH_FP_DEFAULT);
1.23 markus 382: printf("%d %s %s (%s)\n",
1.118 djm 383: sshkey_size(idlist->keys[i]),
384: fp == NULL ? "(null)" : fp,
1.116 djm 385: idlist->comments[i],
386: sshkey_type(idlist->keys[i]));
1.106 djm 387: free(fp);
1.12 markus 388: } else {
1.116 djm 389: if ((r = sshkey_write(idlist->keys[i],
390: stdout)) != 0) {
391: fprintf(stderr, "sshkey_write: %s\n",
392: ssh_err(r));
393: continue;
394: }
395: fprintf(stdout, " %s\n", idlist->comments[i]);
1.12 markus 396: }
397: }
1.116 djm 398: ssh_free_identitylist(idlist);
1.12 markus 399: }
1.50 markus 400: if (!had_identities) {
1.12 markus 401: printf("The agent has no identities.\n");
1.50 markus 402: return -1;
403: }
404: return 0;
1.1 deraadt 405: }
406:
1.48 djm 407: static int
1.116 djm 408: lock_agent(int agent_fd, int lock)
1.54 markus 409: {
410: char prompt[100], *p1, *p2;
1.116 djm 411: int r, passok = 1, ret = -1;
1.61 deraadt 412:
1.54 markus 413: strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
414: p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
415: if (lock) {
416: strlcpy(prompt, "Again: ", sizeof prompt);
417: p2 = read_passphrase(prompt, RP_ALLOW_STDIN);
418: if (strcmp(p1, p2) != 0) {
419: fprintf(stderr, "Passwords do not match.\n");
420: passok = 0;
421: }
1.109 djm 422: explicit_bzero(p2, strlen(p2));
1.106 djm 423: free(p2);
1.54 markus 424: }
1.116 djm 425: if (passok) {
426: if ((r = ssh_lock_agent(agent_fd, lock, p1)) == 0) {
427: fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
428: ret = 0;
429: } else {
430: fprintf(stderr, "Failed to %slock agent: %s\n",
431: lock ? "" : "un", ssh_err(r));
432: }
433: }
1.109 djm 434: explicit_bzero(p1, strlen(p1));
1.106 djm 435: free(p1);
1.62 markus 436: return (ret);
1.54 markus 437: }
438:
439: static int
1.116 djm 440: do_file(int agent_fd, int deleting, int key_only, char *file)
1.48 djm 441: {
442: if (deleting) {
1.116 djm 443: if (delete_file(agent_fd, file, key_only) == -1)
1.48 djm 444: return -1;
445: } else {
1.116 djm 446: if (add_file(agent_fd, file, key_only) == -1)
1.48 djm 447: return -1;
448: }
449: return 0;
450: }
451:
1.42 markus 452: static void
453: usage(void)
454: {
1.90 sobrado 455: fprintf(stderr, "usage: %s [options] [file ...]\n", __progname);
1.45 jakob 456: fprintf(stderr, "Options:\n");
457: fprintf(stderr, " -l List fingerprints of all identities.\n");
1.115 djm 458: fprintf(stderr, " -E hash Specify hash algorithm used for fingerprints.\n");
1.45 jakob 459: fprintf(stderr, " -L List public key parameters of all identities.\n");
1.103 djm 460: fprintf(stderr, " -k Load only keys and not certificates.\n");
461: fprintf(stderr, " -c Require confirmation to sign using identities\n");
462: fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n");
1.45 jakob 463: fprintf(stderr, " -d Delete identity.\n");
464: fprintf(stderr, " -D Delete all identities.\n");
1.55 markus 465: fprintf(stderr, " -x Lock agent.\n");
1.63 markus 466: fprintf(stderr, " -X Unlock agent.\n");
1.92 markus 467: fprintf(stderr, " -s pkcs11 Add keys from PKCS#11 provider.\n");
468: fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n");
1.42 markus 469: }
470:
1.2 provos 471: int
1.7 markus 472: main(int argc, char **argv)
1.1 deraadt 473: {
1.43 markus 474: extern char *optarg;
475: extern int optind;
1.116 djm 476: int agent_fd;
1.92 markus 477: char *pkcs11provider = NULL;
1.116 djm 478: int r, i, ch, deleting = 0, ret = 0, key_only = 0;
1.115 djm 479: int xflag = 0, lflag = 0, Dflag = 0;
1.73 djm 480:
481: /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
482: sanitise_stdfd();
1.12 markus 483:
1.100 djm 484: OpenSSL_add_all_algorithms();
1.112 djm 485:
1.114 millert 486: setvbuf(stdout, NULL, _IOLBF, 0);
1.19 markus 487:
1.116 djm 488: /* First, get a connection to the authentication agent. */
489: switch (r = ssh_get_authentication_socket(&agent_fd)) {
490: case 0:
491: break;
492: case SSH_ERR_AGENT_NOT_PRESENT:
493: fprintf(stderr, "Could not open a connection to your "
494: "authentication agent.\n");
495: exit(2);
496: default:
497: fprintf(stderr, "Error connecting to agent: %s\n", ssh_err(r));
1.50 markus 498: exit(2);
1.12 markus 499: }
1.116 djm 500:
1.115 djm 501: while ((ch = getopt(argc, argv, "klLcdDxXE:e:s:t:")) != -1) {
1.43 markus 502: switch (ch) {
1.115 djm 503: case 'E':
504: fingerprint_hash = ssh_digest_alg_by_name(optarg);
505: if (fingerprint_hash == -1)
506: fatal("Invalid hash algorithm \"%s\"", optarg);
507: break;
1.102 djm 508: case 'k':
509: key_only = 1;
510: break;
1.43 markus 511: case 'l':
512: case 'L':
1.115 djm 513: if (lflag != 0)
514: fatal("-%c flag already specified", lflag);
515: lflag = ch;
516: break;
1.54 markus 517: case 'x':
518: case 'X':
1.115 djm 519: if (xflag != 0)
520: fatal("-%c flag already specified", xflag);
521: xflag = ch;
522: break;
1.65 markus 523: case 'c':
524: confirm = 1;
1.43 markus 525: break;
526: case 'd':
1.12 markus 527: deleting = 1;
1.43 markus 528: break;
529: case 'D':
1.115 djm 530: Dflag = 1;
531: break;
1.43 markus 532: case 's':
1.92 markus 533: pkcs11provider = optarg;
1.43 markus 534: break;
535: case 'e':
1.47 deraadt 536: deleting = 1;
1.92 markus 537: pkcs11provider = optarg;
1.56 markus 538: break;
539: case 't':
1.57 stevesk 540: if ((lifetime = convtime(optarg)) == -1) {
541: fprintf(stderr, "Invalid lifetime\n");
542: ret = 1;
543: goto done;
544: }
1.43 markus 545: break;
546: default:
547: usage();
1.46 djm 548: ret = 1;
549: goto done;
1.42 markus 550: }
551: }
1.115 djm 552:
553: if ((xflag != 0) + (lflag != 0) + (Dflag != 0) > 1)
554: fatal("Invalid combination of actions");
555: else if (xflag) {
1.116 djm 556: if (lock_agent(agent_fd, xflag == 'x' ? 1 : 0) == -1)
1.115 djm 557: ret = 1;
558: goto done;
559: } else if (lflag) {
1.116 djm 560: if (list_identities(agent_fd, lflag == 'l' ? 1 : 0) == -1)
1.115 djm 561: ret = 1;
562: goto done;
563: } else if (Dflag) {
1.116 djm 564: if (delete_all(agent_fd) == -1)
1.115 djm 565: ret = 1;
566: goto done;
567: }
568:
1.43 markus 569: argc -= optind;
570: argv += optind;
1.92 markus 571: if (pkcs11provider != NULL) {
1.116 djm 572: if (update_card(agent_fd, !deleting, pkcs11provider) == -1)
1.46 djm 573: ret = 1;
1.43 markus 574: goto done;
1.12 markus 575: }
1.43 markus 576: if (argc == 0) {
1.117 deraadt 577: char buf[PATH_MAX];
1.48 djm 578: struct passwd *pw;
1.52 markus 579: struct stat st;
580: int count = 0;
1.48 djm 581:
582: if ((pw = getpwuid(getuid())) == NULL) {
1.20 deraadt 583: fprintf(stderr, "No user found with uid %u\n",
584: (u_int)getuid());
1.46 djm 585: ret = 1;
586: goto done;
1.12 markus 587: }
1.48 djm 588:
1.71 deraadt 589: for (i = 0; default_files[i]; i++) {
1.51 markus 590: snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
1.48 djm 591: default_files[i]);
1.52 markus 592: if (stat(buf, &st) < 0)
593: continue;
1.116 djm 594: if (do_file(agent_fd, deleting, key_only, buf) == -1)
1.46 djm 595: ret = 1;
1.52 markus 596: else
597: count++;
1.46 djm 598: }
1.52 markus 599: if (count == 0)
600: ret = 1;
1.43 markus 601: } else {
1.71 deraadt 602: for (i = 0; i < argc; i++) {
1.116 djm 603: if (do_file(agent_fd, deleting, key_only,
604: argv[i]) == -1)
1.48 djm 605: ret = 1;
1.43 markus 606: }
1.12 markus 607: }
1.33 markus 608: clear_pass();
1.43 markus 609:
610: done:
1.116 djm 611: ssh_close_authentication_socket(agent_fd);
1.46 djm 612: return ret;
1.1 deraadt 613: }
![[BACK]](/icons/back.gif){kind=icon}
Return to ssh-add.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / ssh