Annotation of src/usr.bin/ssh/ssh-add.c, Revision 1.154
1.154 ! jsg 1: /* $OpenBSD: ssh-add.c,v 1.153 2020/02/18 08:58:33 dtucker 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.141 djm 41: #ifdef WITH_OPENSSL
1.19 markus 42: #include <openssl/evp.h>
1.141 djm 43: #endif
1.81 stevesk 44:
1.116 djm 45: #include <errno.h>
1.82 stevesk 46: #include <fcntl.h>
1.81 stevesk 47: #include <pwd.h>
1.88 stevesk 48: #include <stdio.h>
1.87 stevesk 49: #include <stdlib.h>
1.85 stevesk 50: #include <string.h>
1.146 naddy 51: #include <stdarg.h>
1.84 stevesk 52: #include <unistd.h>
1.117 deraadt 53: #include <limits.h>
1.1 deraadt 54:
1.89 deraadt 55: #include "xmalloc.h"
1.27 markus 56: #include "ssh.h"
57: #include "log.h"
1.116 djm 58: #include "sshkey.h"
59: #include "sshbuf.h"
1.18 markus 60: #include "authfd.h"
1.16 markus 61: #include "authfile.h"
1.25 markus 62: #include "pathnames.h"
1.57 stevesk 63: #include "misc.h"
1.110 djm 64: #include "ssherr.h"
1.115 djm 65: #include "digest.h"
1.148 djm 66: #include "ssh-sk.h"
1.1 deraadt 67:
1.45 jakob 68: /* argv0 */
69: extern char *__progname;
70:
1.48 djm 71: /* Default files to add */
72: static char *default_files[] = {
73: _PATH_SSH_CLIENT_ID_RSA,
74: _PATH_SSH_CLIENT_ID_DSA,
1.99 djm 75: _PATH_SSH_CLIENT_ID_ECDSA,
1.143 djm 76: _PATH_SSH_CLIENT_ID_ECDSA_SK,
1.107 pascal 77: _PATH_SSH_CLIENT_ID_ED25519,
1.144 markus 78: _PATH_SSH_CLIENT_ID_ED25519_SK,
1.135 markus 79: _PATH_SSH_CLIENT_ID_XMSS,
1.48 djm 80: NULL
81: };
82:
1.115 djm 83: static int fingerprint_hash = SSH_FP_HASH_DEFAULT;
84:
1.56 markus 85: /* Default lifetime (0 == forever) */
1.153 dtucker 86: static long lifetime = 0;
1.48 djm 87:
1.65 markus 88: /* User has to confirm key use */
89: static int confirm = 0;
90:
1.135 markus 91: /* Maximum number of signatures (XMSS) */
92: static u_int maxsign = 0;
93: static u_int minleft = 0;
94:
1.124 tim 95: /* we keep a cache of one passphrase */
1.33 markus 96: static char *pass = NULL;
1.39 itojun 97: static void
1.33 markus 98: clear_pass(void)
99: {
100: if (pass) {
1.154 ! jsg 101: freezero(pass, strlen(pass));
1.33 markus 102: pass = NULL;
103: }
104: }
105:
1.46 djm 106: static int
1.134 dlg 107: delete_file(int agent_fd, const char *filename, int key_only, int qflag)
1.1 deraadt 108: {
1.116 djm 109: struct sshkey *public, *cert = NULL;
1.104 djm 110: char *certpath = NULL, *comment = NULL;
1.116 djm 111: int r, ret = -1;
1.1 deraadt 112:
1.116 djm 113: if ((r = sshkey_load_public(filename, &public, &comment)) != 0) {
114: printf("Bad key file %s: %s\n", filename, ssh_err(r));
1.46 djm 115: return -1;
1.12 markus 116: }
1.116 djm 117: if ((r = ssh_remove_identity(agent_fd, public)) == 0) {
1.134 dlg 118: if (!qflag) {
119: fprintf(stderr, "Identity removed: %s (%s)\n",
120: filename, comment);
121: }
1.46 djm 122: ret = 0;
123: } else
1.116 djm 124: fprintf(stderr, "Could not remove identity \"%s\": %s\n",
125: filename, ssh_err(r));
1.46 djm 126:
1.104 djm 127: if (key_only)
128: goto out;
129:
130: /* Now try to delete the corresponding certificate too */
131: free(comment);
1.105 markus 132: comment = NULL;
1.104 djm 133: xasprintf(&certpath, "%s-cert.pub", filename);
1.120 halex 134: if ((r = sshkey_load_public(certpath, &cert, &comment)) != 0) {
135: if (r != SSH_ERR_SYSTEM_ERROR || errno != ENOENT)
136: error("Failed to load certificate \"%s\": %s",
137: certpath, ssh_err(r));
1.104 djm 138: goto out;
1.120 halex 139: }
140:
1.116 djm 141: if (!sshkey_equal_public(cert, public))
1.104 djm 142: fatal("Certificate %s does not match private key %s",
143: certpath, filename);
144:
1.120 halex 145: if ((r = ssh_remove_identity(agent_fd, cert)) == 0) {
1.134 dlg 146: if (!qflag) {
147: fprintf(stderr, "Identity removed: %s (%s)\n",
148: certpath, comment);
149: }
1.104 djm 150: ret = 0;
151: } else
1.120 halex 152: fprintf(stderr, "Could not remove identity \"%s\": %s\n",
153: certpath, ssh_err(r));
1.104 djm 154:
155: out:
1.127 mmcc 156: sshkey_free(cert);
157: sshkey_free(public);
1.104 djm 158: free(certpath);
159: free(comment);
1.47 deraadt 160:
1.46 djm 161: return ret;
1.1 deraadt 162: }
163:
1.19 markus 164: /* Send a request to remove all identities. */
1.46 djm 165: static int
1.136 djm 166: delete_all(int agent_fd, int qflag)
1.1 deraadt 167: {
1.46 djm 168: int ret = -1;
1.19 markus 169:
1.130 djm 170: /*
171: * Since the agent might be forwarded, old or non-OpenSSH, when asked
172: * to remove all keys, attempt to remove both protocol v.1 and v.2
173: * keys.
174: */
1.121 markus 175: if (ssh_remove_all_identities(agent_fd, 2) == 0)
1.46 djm 176: ret = 0;
1.121 markus 177: /* ignore error-code for ssh1 */
178: ssh_remove_all_identities(agent_fd, 1);
1.19 markus 179:
1.136 djm 180: if (ret != 0)
181: fprintf(stderr, "Failed to remove all identities.\n");
182: else if (!qflag)
1.12 markus 183: fprintf(stderr, "All identities removed.\n");
1.46 djm 184:
185: return ret;
1.1 deraadt 186: }
187:
1.46 djm 188: static int
1.143 djm 189: add_file(int agent_fd, const char *filename, int key_only, int qflag,
190: const char *skprovider)
1.1 deraadt 191: {
1.116 djm 192: struct sshkey *private, *cert;
1.36 markus 193: char *comment = NULL;
1.102 djm 194: char msg[1024], *certpath = NULL;
1.116 djm 195: int r, fd, ret = -1;
1.135 markus 196: size_t i;
197: u_int32_t left;
1.116 djm 198: struct sshbuf *keyblob;
1.135 markus 199: struct ssh_identitylist *idlist;
1.12 markus 200:
1.101 djm 201: if (strcmp(filename, "-") == 0) {
202: fd = STDIN_FILENO;
203: filename = "(stdin)";
1.140 deraadt 204: } else if ((fd = open(filename, O_RDONLY)) == -1) {
1.19 markus 205: perror(filename);
1.46 djm 206: return -1;
1.19 markus 207: }
1.76 dtucker 208:
209: /*
210: * Since we'll try to load a keyfile multiple times, permission errors
211: * will occur multiple times, so check perms first and bail if wrong.
212: */
1.101 djm 213: if (fd != STDIN_FILENO) {
1.116 djm 214: if (sshkey_perm_ok(fd, filename) != 0) {
1.101 djm 215: close(fd);
216: return -1;
217: }
218: }
1.151 djm 219: if ((r = sshbuf_load_fd(fd, &keyblob)) != 0) {
1.116 djm 220: fprintf(stderr, "Error loading key \"%s\": %s\n",
221: filename, ssh_err(r));
222: sshbuf_free(keyblob);
1.101 djm 223: close(fd);
224: return -1;
225: }
1.76 dtucker 226: close(fd);
227:
1.12 markus 228: /* At first, try empty passphrase */
1.125 tim 229: if ((r = sshkey_parse_private_fileblob(keyblob, "", &private,
230: &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
1.116 djm 231: fprintf(stderr, "Error loading key \"%s\": %s\n",
232: filename, ssh_err(r));
233: goto fail_load;
234: }
1.33 markus 235: /* try last */
1.110 djm 236: if (private == NULL && pass != NULL) {
1.125 tim 237: if ((r = sshkey_parse_private_fileblob(keyblob, pass, &private,
238: &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
1.116 djm 239: fprintf(stderr, "Error loading key \"%s\": %s\n",
240: filename, ssh_err(r));
241: goto fail_load;
242: }
1.110 djm 243: }
1.31 markus 244: if (private == NULL) {
1.33 markus 245: /* clear passphrase since it did not work */
246: clear_pass();
1.124 tim 247: snprintf(msg, sizeof msg, "Enter passphrase for %s%s: ",
248: filename, confirm ? " (will confirm each use)" : "");
1.12 markus 249: for (;;) {
1.40 markus 250: pass = read_passphrase(msg, RP_ALLOW_STDIN);
1.116 djm 251: if (strcmp(pass, "") == 0)
252: goto fail_load;
253: if ((r = sshkey_parse_private_fileblob(keyblob, pass,
1.125 tim 254: &private, &comment)) == 0)
1.116 djm 255: break;
256: else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
257: fprintf(stderr,
258: "Error loading key \"%s\": %s\n",
259: filename, ssh_err(r));
260: fail_load:
1.35 markus 261: clear_pass();
1.116 djm 262: sshbuf_free(keyblob);
1.46 djm 263: return -1;
1.12 markus 264: }
1.33 markus 265: clear_pass();
1.68 markus 266: snprintf(msg, sizeof msg,
1.124 tim 267: "Bad passphrase, try again for %s%s: ", filename,
1.119 halex 268: confirm ? " (will confirm each use)" : "");
1.12 markus 269: }
270: }
1.124 tim 271: if (comment == NULL || *comment == '\0')
272: comment = xstrdup(filename);
1.116 djm 273: sshbuf_free(keyblob);
1.60 markus 274:
1.135 markus 275: /* For XMSS */
276: if ((r = sshkey_set_filename(private, filename)) != 0) {
277: fprintf(stderr, "Could not add filename to private key: %s (%s)\n",
278: filename, comment);
279: goto out;
280: }
281: if (maxsign && minleft &&
282: (r = ssh_fetch_identitylist(agent_fd, &idlist)) == 0) {
283: for (i = 0; i < idlist->nkeys; i++) {
284: if (!sshkey_equal_public(idlist->keys[i], private))
285: continue;
286: left = sshkey_signatures_left(idlist->keys[i]);
287: if (left < minleft) {
288: fprintf(stderr,
289: "Only %d signatures left.\n", left);
290: break;
291: }
292: fprintf(stderr, "Skipping update: ");
293: if (left == minleft) {
294: fprintf(stderr,
295: "required signatures left (%d).\n", left);
296: } else {
297: fprintf(stderr,
298: "more signatures left (%d) than"
299: " required (%d).\n", left, minleft);
300: }
301: ssh_free_identitylist(idlist);
302: goto out;
303: }
304: ssh_free_identitylist(idlist);
305: }
306:
1.144 markus 307: if (!sshkey_is_sk(private))
1.143 djm 308: skprovider = NULL; /* Don't send constraint for other keys */
309: else if (skprovider == NULL) {
1.152 naddy 310: fprintf(stderr, "Cannot load authenticator-hosted key %s "
311: "without provider\n", filename);
1.143 djm 312: goto out;
313: }
314:
1.116 djm 315: if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
1.143 djm 316: lifetime, confirm, maxsign, skprovider)) == 0) {
1.60 markus 317: ret = 0;
1.136 djm 318: if (!qflag) {
319: fprintf(stderr, "Identity added: %s (%s)\n",
320: filename, comment);
321: if (lifetime != 0) {
322: fprintf(stderr,
1.153 dtucker 323: "Lifetime set to %ld seconds\n", lifetime);
1.136 djm 324: }
325: if (confirm != 0) {
326: fprintf(stderr, "The user must confirm "
327: "each use of the key\n");
328: }
329: }
1.60 markus 330: } else {
1.116 djm 331: fprintf(stderr, "Could not add identity \"%s\": %s\n",
332: filename, ssh_err(r));
1.56 markus 333: }
334:
1.102 djm 335: /* Skip trying to load the cert if requested */
336: if (key_only)
337: goto out;
1.93 djm 338:
339: /* Now try to add the certificate flavour too */
340: xasprintf(&certpath, "%s-cert.pub", filename);
1.116 djm 341: if ((r = sshkey_load_public(certpath, &cert, NULL)) != 0) {
342: if (r != SSH_ERR_SYSTEM_ERROR || errno != ENOENT)
343: error("Failed to load certificate \"%s\": %s",
344: certpath, ssh_err(r));
1.96 djm 345: goto out;
1.116 djm 346: }
1.96 djm 347:
1.116 djm 348: if (!sshkey_equal_public(cert, private)) {
1.96 djm 349: error("Certificate %s does not match private key %s",
350: certpath, filename);
1.116 djm 351: sshkey_free(cert);
1.96 djm 352: goto out;
353: }
1.93 djm 354:
1.96 djm 355: /* Graft with private bits */
1.123 djm 356: if ((r = sshkey_to_certified(private)) != 0) {
1.116 djm 357: error("%s: sshkey_to_certified: %s", __func__, ssh_err(r));
358: sshkey_free(cert);
359: goto out;
360: }
361: if ((r = sshkey_cert_copy(cert, private)) != 0) {
1.132 markus 362: error("%s: sshkey_cert_copy: %s", __func__, ssh_err(r));
1.116 djm 363: sshkey_free(cert);
1.96 djm 364: goto out;
1.94 otto 365: }
1.116 djm 366: sshkey_free(cert);
1.93 djm 367:
1.116 djm 368: if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
1.143 djm 369: lifetime, confirm, maxsign, skprovider)) != 0) {
1.116 djm 370: error("Certificate %s (%s) add failed: %s", certpath,
371: private->cert->key_id, ssh_err(r));
372: goto out;
1.96 djm 373: }
1.136 djm 374: /* success */
375: if (!qflag) {
376: fprintf(stderr, "Certificate added: %s (%s)\n", certpath,
377: private->cert->key_id);
378: if (lifetime != 0) {
1.153 dtucker 379: fprintf(stderr, "Lifetime set to %ld seconds\n",
1.136 djm 380: lifetime);
381: }
382: if (confirm != 0) {
383: fprintf(stderr, "The user must confirm each use "
384: "of the key\n");
385: }
386: }
387:
1.96 djm 388: out:
1.116 djm 389: free(certpath);
1.106 djm 390: free(comment);
1.116 djm 391: sshkey_free(private);
1.47 deraadt 392:
1.46 djm 393: return ret;
1.1 deraadt 394: }
395:
1.46 djm 396: static int
1.136 djm 397: update_card(int agent_fd, int add, const char *id, int qflag)
1.42 markus 398: {
1.108 djm 399: char *pin = NULL;
1.116 djm 400: int r, ret = -1;
1.53 rees 401:
1.108 djm 402: if (add) {
403: if ((pin = read_passphrase("Enter passphrase for PKCS#11: ",
404: RP_ALLOW_STDIN)) == NULL)
405: return -1;
406: }
1.53 rees 407:
1.116 djm 408: if ((r = ssh_update_card(agent_fd, add, id, pin == NULL ? "" : pin,
409: lifetime, confirm)) == 0) {
1.66 markus 410: ret = 0;
1.136 djm 411: if (!qflag) {
412: fprintf(stderr, "Card %s: %s\n",
413: add ? "added" : "removed", id);
414: }
1.46 djm 415: } else {
1.116 djm 416: fprintf(stderr, "Could not %s card \"%s\": %s\n",
417: add ? "add" : "remove", id, ssh_err(r));
1.66 markus 418: ret = -1;
1.46 djm 419: }
1.106 djm 420: free(pin);
1.66 markus 421: return ret;
1.42 markus 422: }
423:
1.50 markus 424: static int
1.137 djm 425: test_key(int agent_fd, const char *filename)
426: {
427: struct sshkey *key = NULL;
428: u_char *sig = NULL;
429: size_t slen = 0;
430: int r, ret = -1;
431: char data[1024];
432:
433: if ((r = sshkey_load_public(filename, &key, NULL)) != 0) {
434: error("Couldn't read public key %s: %s", filename, ssh_err(r));
435: return -1;
436: }
437: arc4random_buf(data, sizeof(data));
438: if ((r = ssh_agent_sign(agent_fd, key, &sig, &slen, data, sizeof(data),
439: NULL, 0)) != 0) {
440: error("Agent signature failed for %s: %s",
441: filename, ssh_err(r));
442: goto done;
443: }
444: if ((r = sshkey_verify(key, sig, slen, data, sizeof(data),
1.147 djm 445: NULL, 0, NULL)) != 0) {
1.137 djm 446: error("Signature verification failed for %s: %s",
447: filename, ssh_err(r));
448: goto done;
449: }
450: /* success */
451: ret = 0;
452: done:
453: free(sig);
454: sshkey_free(key);
455: return ret;
456: }
457:
458: static int
1.116 djm 459: list_identities(int agent_fd, int do_fp)
1.1 deraadt 460: {
1.116 djm 461: char *fp;
1.131 naddy 462: int r;
1.116 djm 463: struct ssh_identitylist *idlist;
1.135 markus 464: u_int32_t left;
1.116 djm 465: size_t i;
1.12 markus 466:
1.131 naddy 467: if ((r = ssh_fetch_identitylist(agent_fd, &idlist)) != 0) {
468: if (r != SSH_ERR_AGENT_NO_IDENTITIES)
469: fprintf(stderr, "error fetching identities: %s\n",
470: ssh_err(r));
471: else
472: printf("The agent has no identities.\n");
473: return -1;
474: }
475: for (i = 0; i < idlist->nkeys; i++) {
476: if (do_fp) {
477: fp = sshkey_fingerprint(idlist->keys[i],
478: fingerprint_hash, SSH_FP_DEFAULT);
479: printf("%u %s %s (%s)\n", sshkey_size(idlist->keys[i]),
480: fp == NULL ? "(null)" : fp, idlist->comments[i],
481: sshkey_type(idlist->keys[i]));
482: free(fp);
483: } else {
484: if ((r = sshkey_write(idlist->keys[i], stdout)) != 0) {
485: fprintf(stderr, "sshkey_write: %s\n",
486: ssh_err(r));
487: continue;
1.12 markus 488: }
1.135 markus 489: fprintf(stdout, " %s", idlist->comments[i]);
490: left = sshkey_signatures_left(idlist->keys[i]);
491: if (left > 0)
492: fprintf(stdout,
493: " [signatures left %d]", left);
494: fprintf(stdout, "\n");
1.12 markus 495: }
1.50 markus 496: }
1.131 naddy 497: ssh_free_identitylist(idlist);
1.50 markus 498: return 0;
1.1 deraadt 499: }
500:
1.48 djm 501: static int
1.116 djm 502: lock_agent(int agent_fd, int lock)
1.54 markus 503: {
504: char prompt[100], *p1, *p2;
1.116 djm 505: int r, passok = 1, ret = -1;
1.61 deraadt 506:
1.54 markus 507: strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
508: p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
509: if (lock) {
510: strlcpy(prompt, "Again: ", sizeof prompt);
511: p2 = read_passphrase(prompt, RP_ALLOW_STDIN);
512: if (strcmp(p1, p2) != 0) {
513: fprintf(stderr, "Passwords do not match.\n");
514: passok = 0;
515: }
1.154 ! jsg 516: freezero(p2, strlen(p2));
1.54 markus 517: }
1.116 djm 518: if (passok) {
519: if ((r = ssh_lock_agent(agent_fd, lock, p1)) == 0) {
520: fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
521: ret = 0;
522: } else {
523: fprintf(stderr, "Failed to %slock agent: %s\n",
524: lock ? "" : "un", ssh_err(r));
525: }
526: }
1.154 ! jsg 527: freezero(p1, strlen(p1));
1.62 markus 528: return (ret);
1.54 markus 529: }
530:
531: static int
1.148 djm 532: load_resident_keys(int agent_fd, const char *skprovider, int qflag)
533: {
534: struct sshkey **keys;
535: size_t nkeys, i;
536: int r, ok = 0;
537: char *fp;
538:
1.152 naddy 539: pass = read_passphrase("Enter PIN for authenticator: ", RP_ALLOW_STDIN);
1.149 djm 540: if ((r = sshsk_load_resident(skprovider, NULL, pass,
541: &keys, &nkeys)) != 0) {
1.148 djm 542: error("Unable to load resident keys: %s", ssh_err(r));
543: return r;
544: }
545: for (i = 0; i < nkeys; i++) {
546: if ((fp = sshkey_fingerprint(keys[i],
547: fingerprint_hash, SSH_FP_DEFAULT)) == NULL)
548: fatal("%s: sshkey_fingerprint failed", __func__);
549: if ((r = ssh_add_identity_constrained(agent_fd, keys[i], "",
550: lifetime, confirm, maxsign, skprovider)) != 0) {
551: error("Unable to add key %s %s",
552: sshkey_type(keys[i]), fp);
553: free(fp);
554: ok = r;
555: continue;
556: }
557: if (ok == 0)
558: ok = 1;
559: if (!qflag) {
560: fprintf(stderr, "Resident identity added: %s %s\n",
561: sshkey_type(keys[i]), fp);
562: if (lifetime != 0) {
563: fprintf(stderr,
1.153 dtucker 564: "Lifetime set to %ld seconds\n", lifetime);
1.148 djm 565: }
566: if (confirm != 0) {
567: fprintf(stderr, "The user must confirm "
568: "each use of the key\n");
569: }
570: }
571: free(fp);
572: sshkey_free(keys[i]);
573: }
574: free(keys);
575: if (nkeys == 0)
576: return SSH_ERR_KEY_NOT_FOUND;
577: return ok == 1 ? 0 : ok;
578: }
579:
580: static int
1.143 djm 581: do_file(int agent_fd, int deleting, int key_only, char *file, int qflag,
582: const char *skprovider)
1.48 djm 583: {
584: if (deleting) {
1.134 dlg 585: if (delete_file(agent_fd, file, key_only, qflag) == -1)
1.48 djm 586: return -1;
587: } else {
1.143 djm 588: if (add_file(agent_fd, file, key_only, qflag, skprovider) == -1)
1.48 djm 589: return -1;
590: }
591: return 0;
592: }
593:
1.42 markus 594: static void
595: usage(void)
596: {
1.150 naddy 597: fprintf(stderr,
598: "usage: ssh-add [-cDdKkLlqvXx] [-E fingerprint_hash] [-S provider] [-t life]\n"
599: #ifdef WITH_XMSS
600: " [-M maxsign] [-m minleft]\n"
601: #endif
602: " [file ...]\n"
603: " ssh-add -s pkcs11\n"
604: " ssh-add -e pkcs11\n"
605: " ssh-add -T pubkey ...\n"
606: );
1.42 markus 607: }
608:
1.2 provos 609: int
1.7 markus 610: main(int argc, char **argv)
1.1 deraadt 611: {
1.43 markus 612: extern char *optarg;
613: extern int optind;
1.116 djm 614: int agent_fd;
1.143 djm 615: char *pkcs11provider = NULL, *skprovider = NULL;
1.148 djm 616: int r, i, ch, deleting = 0, ret = 0, key_only = 0, do_download = 0;
1.137 djm 617: int xflag = 0, lflag = 0, Dflag = 0, qflag = 0, Tflag = 0;
1.138 djm 618: SyslogFacility log_facility = SYSLOG_FACILITY_AUTH;
619: LogLevel log_level = SYSLOG_LEVEL_INFO;
1.73 djm 620:
621: /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
622: sanitise_stdfd();
1.12 markus 623:
1.141 djm 624: #ifdef WITH_OPENSSL
1.100 djm 625: OpenSSL_add_all_algorithms();
1.141 djm 626: #endif
1.138 djm 627: log_init(__progname, log_level, log_facility, 1);
628:
1.114 millert 629: setvbuf(stdout, NULL, _IOLBF, 0);
1.19 markus 630:
1.116 djm 631: /* First, get a connection to the authentication agent. */
632: switch (r = ssh_get_authentication_socket(&agent_fd)) {
633: case 0:
634: break;
635: case SSH_ERR_AGENT_NOT_PRESENT:
636: fprintf(stderr, "Could not open a connection to your "
637: "authentication agent.\n");
638: exit(2);
639: default:
640: fprintf(stderr, "Error connecting to agent: %s\n", ssh_err(r));
1.50 markus 641: exit(2);
1.12 markus 642: }
1.116 djm 643:
1.143 djm 644: skprovider = getenv("SSH_SK_PROVIDER");
645:
1.150 naddy 646: while ((ch = getopt(argc, argv, "vkKlLcdDTxXE:e:M:m:qs:S:t:")) != -1) {
1.43 markus 647: switch (ch) {
1.138 djm 648: case 'v':
649: if (log_level == SYSLOG_LEVEL_INFO)
650: log_level = SYSLOG_LEVEL_DEBUG1;
651: else if (log_level < SYSLOG_LEVEL_DEBUG3)
652: log_level++;
653: break;
1.115 djm 654: case 'E':
655: fingerprint_hash = ssh_digest_alg_by_name(optarg);
656: if (fingerprint_hash == -1)
657: fatal("Invalid hash algorithm \"%s\"", optarg);
658: break;
1.102 djm 659: case 'k':
660: key_only = 1;
661: break;
1.150 naddy 662: case 'K':
663: do_download = 1;
664: break;
1.43 markus 665: case 'l':
666: case 'L':
1.115 djm 667: if (lflag != 0)
668: fatal("-%c flag already specified", lflag);
669: lflag = ch;
1.148 djm 670: break;
1.54 markus 671: case 'x':
672: case 'X':
1.115 djm 673: if (xflag != 0)
674: fatal("-%c flag already specified", xflag);
675: xflag = ch;
676: break;
1.65 markus 677: case 'c':
678: confirm = 1;
1.135 markus 679: break;
680: case 'm':
681: minleft = (int)strtonum(optarg, 1, UINT_MAX, NULL);
682: if (minleft == 0) {
683: usage();
684: ret = 1;
685: goto done;
686: }
687: break;
688: case 'M':
689: maxsign = (int)strtonum(optarg, 1, UINT_MAX, NULL);
690: if (maxsign == 0) {
691: usage();
692: ret = 1;
693: goto done;
694: }
1.43 markus 695: break;
696: case 'd':
1.12 markus 697: deleting = 1;
1.43 markus 698: break;
699: case 'D':
1.115 djm 700: Dflag = 1;
701: break;
1.43 markus 702: case 's':
1.92 markus 703: pkcs11provider = optarg;
1.43 markus 704: break;
1.143 djm 705: case 'S':
706: skprovider = optarg;
707: break;
1.43 markus 708: case 'e':
1.47 deraadt 709: deleting = 1;
1.92 markus 710: pkcs11provider = optarg;
1.56 markus 711: break;
712: case 't':
1.153 dtucker 713: if ((lifetime = convtime(optarg)) == -1 ||
714: lifetime < 0 || lifetime > UINT32_MAX) {
1.57 stevesk 715: fprintf(stderr, "Invalid lifetime\n");
716: ret = 1;
717: goto done;
718: }
1.43 markus 719: break;
1.134 dlg 720: case 'q':
721: qflag = 1;
722: break;
1.137 djm 723: case 'T':
724: Tflag = 1;
725: break;
1.43 markus 726: default:
727: usage();
1.46 djm 728: ret = 1;
729: goto done;
1.42 markus 730: }
731: }
1.138 djm 732: log_init(__progname, log_level, log_facility, 1);
1.115 djm 733:
734: if ((xflag != 0) + (lflag != 0) + (Dflag != 0) > 1)
735: fatal("Invalid combination of actions");
736: else if (xflag) {
1.116 djm 737: if (lock_agent(agent_fd, xflag == 'x' ? 1 : 0) == -1)
1.115 djm 738: ret = 1;
739: goto done;
740: } else if (lflag) {
1.116 djm 741: if (list_identities(agent_fd, lflag == 'l' ? 1 : 0) == -1)
1.115 djm 742: ret = 1;
743: goto done;
744: } else if (Dflag) {
1.136 djm 745: if (delete_all(agent_fd, qflag) == -1)
1.115 djm 746: ret = 1;
747: goto done;
748: }
1.145 djm 749:
750: if (skprovider == NULL)
751: skprovider = "internal";
1.115 djm 752:
1.43 markus 753: argc -= optind;
754: argv += optind;
1.137 djm 755: if (Tflag) {
756: if (argc <= 0)
757: fatal("no keys to test");
758: for (r = i = 0; i < argc; i++)
759: r |= test_key(agent_fd, argv[i]);
760: ret = r == 0 ? 0 : 1;
761: goto done;
762: }
1.92 markus 763: if (pkcs11provider != NULL) {
1.136 djm 764: if (update_card(agent_fd, !deleting, pkcs11provider,
765: qflag) == -1)
1.46 djm 766: ret = 1;
1.43 markus 767: goto done;
1.12 markus 768: }
1.148 djm 769: if (do_download) {
770: if (skprovider == NULL)
771: fatal("Cannot download keys without provider");
772: if (load_resident_keys(agent_fd, skprovider, qflag) != 0)
773: ret = 1;
774: goto done;
775: }
1.43 markus 776: if (argc == 0) {
1.117 deraadt 777: char buf[PATH_MAX];
1.48 djm 778: struct passwd *pw;
1.52 markus 779: struct stat st;
780: int count = 0;
1.48 djm 781:
782: if ((pw = getpwuid(getuid())) == NULL) {
1.20 deraadt 783: fprintf(stderr, "No user found with uid %u\n",
784: (u_int)getuid());
1.46 djm 785: ret = 1;
786: goto done;
1.12 markus 787: }
1.48 djm 788:
1.71 deraadt 789: for (i = 0; default_files[i]; i++) {
1.51 markus 790: snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
1.48 djm 791: default_files[i]);
1.140 deraadt 792: if (stat(buf, &st) == -1)
1.52 markus 793: continue;
1.134 dlg 794: if (do_file(agent_fd, deleting, key_only, buf,
1.143 djm 795: qflag, skprovider) == -1)
1.46 djm 796: ret = 1;
1.52 markus 797: else
798: count++;
1.46 djm 799: }
1.52 markus 800: if (count == 0)
801: ret = 1;
1.43 markus 802: } else {
1.71 deraadt 803: for (i = 0; i < argc; i++) {
1.116 djm 804: if (do_file(agent_fd, deleting, key_only,
1.143 djm 805: argv[i], qflag, skprovider) == -1)
1.48 djm 806: ret = 1;
1.43 markus 807: }
1.12 markus 808: }
1.148 djm 809: done:
1.33 markus 810: clear_pass();
1.116 djm 811: ssh_close_authentication_socket(agent_fd);
1.46 djm 812: return ret;
1.1 deraadt 813: }
![[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