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