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