Annotation of src/usr.bin/ssh/ssh-add.c, Revision 1.148
1.148 ! djm 1: /* $OpenBSD: ssh-add.c,v 1.147 2019/11/25 00:51:37 djm Exp $ */
1.1 deraadt 2: /*
1.13 deraadt 3: * Author: Tatu Ylonen <ylo@cs.hut.fi>
4: * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5: * All rights reserved
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.57 stevesk 86: static int 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.116 djm 220: if ((keyblob = sshbuf_new()) == NULL)
221: fatal("%s: sshbuf_new failed", __func__);
222: if ((r = sshkey_load_file(fd, keyblob)) != 0) {
223: fprintf(stderr, "Error loading key \"%s\": %s\n",
224: filename, ssh_err(r));
225: sshbuf_free(keyblob);
1.101 djm 226: close(fd);
227: return -1;
228: }
1.76 dtucker 229: close(fd);
230:
1.12 markus 231: /* At first, try empty passphrase */
1.125 tim 232: if ((r = sshkey_parse_private_fileblob(keyblob, "", &private,
233: &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
1.116 djm 234: fprintf(stderr, "Error loading key \"%s\": %s\n",
235: filename, ssh_err(r));
236: goto fail_load;
237: }
1.33 markus 238: /* try last */
1.110 djm 239: if (private == NULL && pass != NULL) {
1.125 tim 240: if ((r = sshkey_parse_private_fileblob(keyblob, pass, &private,
241: &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
1.116 djm 242: fprintf(stderr, "Error loading key \"%s\": %s\n",
243: filename, ssh_err(r));
244: goto fail_load;
245: }
1.110 djm 246: }
1.31 markus 247: if (private == NULL) {
1.33 markus 248: /* clear passphrase since it did not work */
249: clear_pass();
1.124 tim 250: snprintf(msg, sizeof msg, "Enter passphrase for %s%s: ",
251: filename, confirm ? " (will confirm each use)" : "");
1.12 markus 252: for (;;) {
1.40 markus 253: pass = read_passphrase(msg, RP_ALLOW_STDIN);
1.116 djm 254: if (strcmp(pass, "") == 0)
255: goto fail_load;
256: if ((r = sshkey_parse_private_fileblob(keyblob, pass,
1.125 tim 257: &private, &comment)) == 0)
1.116 djm 258: break;
259: else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
260: fprintf(stderr,
261: "Error loading key \"%s\": %s\n",
262: filename, ssh_err(r));
263: fail_load:
1.35 markus 264: clear_pass();
1.116 djm 265: sshbuf_free(keyblob);
1.46 djm 266: return -1;
1.12 markus 267: }
1.33 markus 268: clear_pass();
1.68 markus 269: snprintf(msg, sizeof msg,
1.124 tim 270: "Bad passphrase, try again for %s%s: ", filename,
1.119 halex 271: confirm ? " (will confirm each use)" : "");
1.12 markus 272: }
273: }
1.124 tim 274: if (comment == NULL || *comment == '\0')
275: comment = xstrdup(filename);
1.116 djm 276: sshbuf_free(keyblob);
1.60 markus 277:
1.135 markus 278: /* For XMSS */
279: if ((r = sshkey_set_filename(private, filename)) != 0) {
280: fprintf(stderr, "Could not add filename to private key: %s (%s)\n",
281: filename, comment);
282: goto out;
283: }
284: if (maxsign && minleft &&
285: (r = ssh_fetch_identitylist(agent_fd, &idlist)) == 0) {
286: for (i = 0; i < idlist->nkeys; i++) {
287: if (!sshkey_equal_public(idlist->keys[i], private))
288: continue;
289: left = sshkey_signatures_left(idlist->keys[i]);
290: if (left < minleft) {
291: fprintf(stderr,
292: "Only %d signatures left.\n", left);
293: break;
294: }
295: fprintf(stderr, "Skipping update: ");
296: if (left == minleft) {
297: fprintf(stderr,
298: "required signatures left (%d).\n", left);
299: } else {
300: fprintf(stderr,
301: "more signatures left (%d) than"
302: " required (%d).\n", left, minleft);
303: }
304: ssh_free_identitylist(idlist);
305: goto out;
306: }
307: ssh_free_identitylist(idlist);
308: }
309:
1.144 markus 310: if (!sshkey_is_sk(private))
1.143 djm 311: skprovider = NULL; /* Don't send constraint for other keys */
312: else if (skprovider == NULL) {
313: fprintf(stderr, "Cannot load security key %s without "
314: "provider\n", filename);
315: goto out;
316: }
317:
1.116 djm 318: if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
1.143 djm 319: lifetime, confirm, maxsign, skprovider)) == 0) {
1.60 markus 320: ret = 0;
1.136 djm 321: if (!qflag) {
322: fprintf(stderr, "Identity added: %s (%s)\n",
323: filename, comment);
324: if (lifetime != 0) {
325: fprintf(stderr,
326: "Lifetime set to %d seconds\n", lifetime);
327: }
328: if (confirm != 0) {
329: fprintf(stderr, "The user must confirm "
330: "each use of the key\n");
331: }
332: }
1.60 markus 333: } else {
1.116 djm 334: fprintf(stderr, "Could not add identity \"%s\": %s\n",
335: filename, ssh_err(r));
1.56 markus 336: }
337:
1.102 djm 338: /* Skip trying to load the cert if requested */
339: if (key_only)
340: goto out;
1.93 djm 341:
342: /* Now try to add the certificate flavour too */
343: xasprintf(&certpath, "%s-cert.pub", filename);
1.116 djm 344: if ((r = sshkey_load_public(certpath, &cert, NULL)) != 0) {
345: if (r != SSH_ERR_SYSTEM_ERROR || errno != ENOENT)
346: error("Failed to load certificate \"%s\": %s",
347: certpath, ssh_err(r));
1.96 djm 348: goto out;
1.116 djm 349: }
1.96 djm 350:
1.116 djm 351: if (!sshkey_equal_public(cert, private)) {
1.96 djm 352: error("Certificate %s does not match private key %s",
353: certpath, filename);
1.116 djm 354: sshkey_free(cert);
1.96 djm 355: goto out;
356: }
1.93 djm 357:
1.96 djm 358: /* Graft with private bits */
1.123 djm 359: if ((r = sshkey_to_certified(private)) != 0) {
1.116 djm 360: error("%s: sshkey_to_certified: %s", __func__, ssh_err(r));
361: sshkey_free(cert);
362: goto out;
363: }
364: if ((r = sshkey_cert_copy(cert, private)) != 0) {
1.132 markus 365: error("%s: sshkey_cert_copy: %s", __func__, ssh_err(r));
1.116 djm 366: sshkey_free(cert);
1.96 djm 367: goto out;
1.94 otto 368: }
1.116 djm 369: sshkey_free(cert);
1.93 djm 370:
1.116 djm 371: if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
1.143 djm 372: lifetime, confirm, maxsign, skprovider)) != 0) {
1.116 djm 373: error("Certificate %s (%s) add failed: %s", certpath,
374: private->cert->key_id, ssh_err(r));
375: goto out;
1.96 djm 376: }
1.136 djm 377: /* success */
378: if (!qflag) {
379: fprintf(stderr, "Certificate added: %s (%s)\n", certpath,
380: private->cert->key_id);
381: if (lifetime != 0) {
382: fprintf(stderr, "Lifetime set to %d seconds\n",
383: lifetime);
384: }
385: if (confirm != 0) {
386: fprintf(stderr, "The user must confirm each use "
387: "of the key\n");
388: }
389: }
390:
1.96 djm 391: out:
1.116 djm 392: free(certpath);
1.106 djm 393: free(comment);
1.116 djm 394: sshkey_free(private);
1.47 deraadt 395:
1.46 djm 396: return ret;
1.1 deraadt 397: }
398:
1.46 djm 399: static int
1.136 djm 400: update_card(int agent_fd, int add, const char *id, int qflag)
1.42 markus 401: {
1.108 djm 402: char *pin = NULL;
1.116 djm 403: int r, ret = -1;
1.53 rees 404:
1.108 djm 405: if (add) {
406: if ((pin = read_passphrase("Enter passphrase for PKCS#11: ",
407: RP_ALLOW_STDIN)) == NULL)
408: return -1;
409: }
1.53 rees 410:
1.116 djm 411: if ((r = ssh_update_card(agent_fd, add, id, pin == NULL ? "" : pin,
412: lifetime, confirm)) == 0) {
1.66 markus 413: ret = 0;
1.136 djm 414: if (!qflag) {
415: fprintf(stderr, "Card %s: %s\n",
416: add ? "added" : "removed", id);
417: }
1.46 djm 418: } else {
1.116 djm 419: fprintf(stderr, "Could not %s card \"%s\": %s\n",
420: add ? "add" : "remove", id, ssh_err(r));
1.66 markus 421: ret = -1;
1.46 djm 422: }
1.106 djm 423: free(pin);
1.66 markus 424: return ret;
1.42 markus 425: }
426:
1.50 markus 427: static int
1.137 djm 428: test_key(int agent_fd, const char *filename)
429: {
430: struct sshkey *key = NULL;
431: u_char *sig = NULL;
432: size_t slen = 0;
433: int r, ret = -1;
434: char data[1024];
435:
436: if ((r = sshkey_load_public(filename, &key, NULL)) != 0) {
437: error("Couldn't read public key %s: %s", filename, ssh_err(r));
438: return -1;
439: }
440: arc4random_buf(data, sizeof(data));
441: if ((r = ssh_agent_sign(agent_fd, key, &sig, &slen, data, sizeof(data),
442: NULL, 0)) != 0) {
443: error("Agent signature failed for %s: %s",
444: filename, ssh_err(r));
445: goto done;
446: }
447: if ((r = sshkey_verify(key, sig, slen, data, sizeof(data),
1.147 djm 448: NULL, 0, NULL)) != 0) {
1.137 djm 449: error("Signature verification failed for %s: %s",
450: filename, ssh_err(r));
451: goto done;
452: }
453: /* success */
454: ret = 0;
455: done:
456: free(sig);
457: sshkey_free(key);
458: return ret;
459: }
460:
461: static int
1.116 djm 462: list_identities(int agent_fd, int do_fp)
1.1 deraadt 463: {
1.116 djm 464: char *fp;
1.131 naddy 465: int r;
1.116 djm 466: struct ssh_identitylist *idlist;
1.135 markus 467: u_int32_t left;
1.116 djm 468: size_t i;
1.12 markus 469:
1.131 naddy 470: if ((r = ssh_fetch_identitylist(agent_fd, &idlist)) != 0) {
471: if (r != SSH_ERR_AGENT_NO_IDENTITIES)
472: fprintf(stderr, "error fetching identities: %s\n",
473: ssh_err(r));
474: else
475: printf("The agent has no identities.\n");
476: return -1;
477: }
478: for (i = 0; i < idlist->nkeys; i++) {
479: if (do_fp) {
480: fp = sshkey_fingerprint(idlist->keys[i],
481: fingerprint_hash, SSH_FP_DEFAULT);
482: printf("%u %s %s (%s)\n", sshkey_size(idlist->keys[i]),
483: fp == NULL ? "(null)" : fp, idlist->comments[i],
484: sshkey_type(idlist->keys[i]));
485: free(fp);
486: } else {
487: if ((r = sshkey_write(idlist->keys[i], stdout)) != 0) {
488: fprintf(stderr, "sshkey_write: %s\n",
489: ssh_err(r));
490: continue;
1.12 markus 491: }
1.135 markus 492: fprintf(stdout, " %s", idlist->comments[i]);
493: left = sshkey_signatures_left(idlist->keys[i]);
494: if (left > 0)
495: fprintf(stdout,
496: " [signatures left %d]", left);
497: fprintf(stdout, "\n");
1.12 markus 498: }
1.50 markus 499: }
1.131 naddy 500: ssh_free_identitylist(idlist);
1.50 markus 501: return 0;
1.1 deraadt 502: }
503:
1.48 djm 504: static int
1.116 djm 505: lock_agent(int agent_fd, int lock)
1.54 markus 506: {
507: char prompt[100], *p1, *p2;
1.116 djm 508: int r, passok = 1, ret = -1;
1.61 deraadt 509:
1.54 markus 510: strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
511: p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
512: if (lock) {
513: strlcpy(prompt, "Again: ", sizeof prompt);
514: p2 = read_passphrase(prompt, RP_ALLOW_STDIN);
515: if (strcmp(p1, p2) != 0) {
516: fprintf(stderr, "Passwords do not match.\n");
517: passok = 0;
518: }
1.109 djm 519: explicit_bzero(p2, strlen(p2));
1.106 djm 520: free(p2);
1.54 markus 521: }
1.116 djm 522: if (passok) {
523: if ((r = ssh_lock_agent(agent_fd, lock, p1)) == 0) {
524: fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
525: ret = 0;
526: } else {
527: fprintf(stderr, "Failed to %slock agent: %s\n",
528: lock ? "" : "un", ssh_err(r));
529: }
530: }
1.109 djm 531: explicit_bzero(p1, strlen(p1));
1.106 djm 532: free(p1);
1.62 markus 533: return (ret);
1.54 markus 534: }
535:
536: static int
1.148 ! djm 537: load_resident_keys(int agent_fd, const char *skprovider, int qflag)
! 538: {
! 539: struct sshkey **keys;
! 540: size_t nkeys, i;
! 541: int r, ok = 0;
! 542: char *fp;
! 543:
! 544: pass = read_passphrase("Enter PIN for security key: ", RP_ALLOW_STDIN);
! 545: if ((r = sshsk_load_resident(skprovider, pass, &keys, &nkeys)) != 0) {
! 546: error("Unable to load resident keys: %s", ssh_err(r));
! 547: return r;
! 548: }
! 549: for (i = 0; i < nkeys; i++) {
! 550: if ((fp = sshkey_fingerprint(keys[i],
! 551: fingerprint_hash, SSH_FP_DEFAULT)) == NULL)
! 552: fatal("%s: sshkey_fingerprint failed", __func__);
! 553: if ((r = ssh_add_identity_constrained(agent_fd, keys[i], "",
! 554: lifetime, confirm, maxsign, skprovider)) != 0) {
! 555: error("Unable to add key %s %s",
! 556: sshkey_type(keys[i]), fp);
! 557: free(fp);
! 558: ok = r;
! 559: continue;
! 560: }
! 561: if (ok == 0)
! 562: ok = 1;
! 563: if (!qflag) {
! 564: fprintf(stderr, "Resident identity added: %s %s\n",
! 565: sshkey_type(keys[i]), fp);
! 566: if (lifetime != 0) {
! 567: fprintf(stderr,
! 568: "Lifetime set to %d seconds\n", lifetime);
! 569: }
! 570: if (confirm != 0) {
! 571: fprintf(stderr, "The user must confirm "
! 572: "each use of the key\n");
! 573: }
! 574: }
! 575: free(fp);
! 576: sshkey_free(keys[i]);
! 577: }
! 578: free(keys);
! 579: if (nkeys == 0)
! 580: return SSH_ERR_KEY_NOT_FOUND;
! 581: return ok == 1 ? 0 : ok;
! 582: }
! 583:
! 584: static int
1.143 djm 585: do_file(int agent_fd, int deleting, int key_only, char *file, int qflag,
586: const char *skprovider)
1.48 djm 587: {
588: if (deleting) {
1.134 dlg 589: if (delete_file(agent_fd, file, key_only, qflag) == -1)
1.48 djm 590: return -1;
591: } else {
1.143 djm 592: if (add_file(agent_fd, file, key_only, qflag, skprovider) == -1)
1.48 djm 593: return -1;
594: }
595: return 0;
596: }
597:
1.42 markus 598: static void
599: usage(void)
600: {
1.90 sobrado 601: fprintf(stderr, "usage: %s [options] [file ...]\n", __progname);
1.45 jakob 602: fprintf(stderr, "Options:\n");
603: fprintf(stderr, " -l List fingerprints of all identities.\n");
1.115 djm 604: fprintf(stderr, " -E hash Specify hash algorithm used for fingerprints.\n");
1.45 jakob 605: fprintf(stderr, " -L List public key parameters of all identities.\n");
1.103 djm 606: fprintf(stderr, " -k Load only keys and not certificates.\n");
607: fprintf(stderr, " -c Require confirmation to sign using identities\n");
1.135 markus 608: fprintf(stderr, " -m minleft Maxsign is only changed if less than minleft are left (for XMSS)\n");
609: fprintf(stderr, " -M maxsign Maximum number of signatures allowed (for XMSS)\n");
1.103 djm 610: fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n");
1.45 jakob 611: fprintf(stderr, " -d Delete identity.\n");
612: fprintf(stderr, " -D Delete all identities.\n");
1.55 markus 613: fprintf(stderr, " -x Lock agent.\n");
1.63 markus 614: fprintf(stderr, " -X Unlock agent.\n");
1.92 markus 615: fprintf(stderr, " -s pkcs11 Add keys from PKCS#11 provider.\n");
616: fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n");
1.137 djm 617: fprintf(stderr, " -T pubkey Test if ssh-agent can access matching private key.\n");
1.143 djm 618: fprintf(stderr, " -S provider Specify security key provider.\n");
1.134 dlg 619: fprintf(stderr, " -q Be quiet after a successful operation.\n");
1.138 djm 620: fprintf(stderr, " -v Be more verbose.\n");
1.42 markus 621: }
622:
1.2 provos 623: int
1.7 markus 624: main(int argc, char **argv)
1.1 deraadt 625: {
1.43 markus 626: extern char *optarg;
627: extern int optind;
1.116 djm 628: int agent_fd;
1.143 djm 629: char *pkcs11provider = NULL, *skprovider = NULL;
1.148 ! djm 630: int r, i, ch, deleting = 0, ret = 0, key_only = 0, do_download = 0;
1.137 djm 631: int xflag = 0, lflag = 0, Dflag = 0, qflag = 0, Tflag = 0;
1.138 djm 632: SyslogFacility log_facility = SYSLOG_FACILITY_AUTH;
633: LogLevel log_level = SYSLOG_LEVEL_INFO;
1.73 djm 634:
635: /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
636: sanitise_stdfd();
1.12 markus 637:
1.141 djm 638: #ifdef WITH_OPENSSL
1.100 djm 639: OpenSSL_add_all_algorithms();
1.141 djm 640: #endif
1.138 djm 641: log_init(__progname, log_level, log_facility, 1);
642:
1.114 millert 643: setvbuf(stdout, NULL, _IOLBF, 0);
1.19 markus 644:
1.116 djm 645: /* First, get a connection to the authentication agent. */
646: switch (r = ssh_get_authentication_socket(&agent_fd)) {
647: case 0:
648: break;
649: case SSH_ERR_AGENT_NOT_PRESENT:
650: fprintf(stderr, "Could not open a connection to your "
651: "authentication agent.\n");
652: exit(2);
653: default:
654: fprintf(stderr, "Error connecting to agent: %s\n", ssh_err(r));
1.50 markus 655: exit(2);
1.12 markus 656: }
1.116 djm 657:
1.143 djm 658: skprovider = getenv("SSH_SK_PROVIDER");
659:
1.148 ! djm 660: while ((ch = getopt(argc, argv, "vklLcdDTxXE:e:M:m:Oqs:S:t:")) != -1) {
1.43 markus 661: switch (ch) {
1.138 djm 662: case 'v':
663: if (log_level == SYSLOG_LEVEL_INFO)
664: log_level = SYSLOG_LEVEL_DEBUG1;
665: else if (log_level < SYSLOG_LEVEL_DEBUG3)
666: log_level++;
667: break;
1.115 djm 668: case 'E':
669: fingerprint_hash = ssh_digest_alg_by_name(optarg);
670: if (fingerprint_hash == -1)
671: fatal("Invalid hash algorithm \"%s\"", optarg);
672: break;
1.102 djm 673: case 'k':
674: key_only = 1;
675: break;
1.43 markus 676: case 'l':
677: case 'L':
1.115 djm 678: if (lflag != 0)
679: fatal("-%c flag already specified", lflag);
680: lflag = ch;
681: break;
1.148 ! djm 682: case 'O':
! 683: do_download = 1;
! 684: break;
1.54 markus 685: case 'x':
686: case 'X':
1.115 djm 687: if (xflag != 0)
688: fatal("-%c flag already specified", xflag);
689: xflag = ch;
690: break;
1.65 markus 691: case 'c':
692: confirm = 1;
1.135 markus 693: break;
694: case 'm':
695: minleft = (int)strtonum(optarg, 1, UINT_MAX, NULL);
696: if (minleft == 0) {
697: usage();
698: ret = 1;
699: goto done;
700: }
701: break;
702: case 'M':
703: maxsign = (int)strtonum(optarg, 1, UINT_MAX, NULL);
704: if (maxsign == 0) {
705: usage();
706: ret = 1;
707: goto done;
708: }
1.43 markus 709: break;
710: case 'd':
1.12 markus 711: deleting = 1;
1.43 markus 712: break;
713: case 'D':
1.115 djm 714: Dflag = 1;
715: break;
1.43 markus 716: case 's':
1.92 markus 717: pkcs11provider = optarg;
1.43 markus 718: break;
1.143 djm 719: case 'S':
720: skprovider = optarg;
721: break;
1.43 markus 722: case 'e':
1.47 deraadt 723: deleting = 1;
1.92 markus 724: pkcs11provider = optarg;
1.56 markus 725: break;
726: case 't':
1.57 stevesk 727: if ((lifetime = convtime(optarg)) == -1) {
728: fprintf(stderr, "Invalid lifetime\n");
729: ret = 1;
730: goto done;
731: }
1.43 markus 732: break;
1.134 dlg 733: case 'q':
734: qflag = 1;
735: break;
1.137 djm 736: case 'T':
737: Tflag = 1;
738: break;
1.43 markus 739: default:
740: usage();
1.46 djm 741: ret = 1;
742: goto done;
1.42 markus 743: }
744: }
1.138 djm 745: log_init(__progname, log_level, log_facility, 1);
1.115 djm 746:
747: if ((xflag != 0) + (lflag != 0) + (Dflag != 0) > 1)
748: fatal("Invalid combination of actions");
749: else if (xflag) {
1.116 djm 750: if (lock_agent(agent_fd, xflag == 'x' ? 1 : 0) == -1)
1.115 djm 751: ret = 1;
752: goto done;
753: } else if (lflag) {
1.116 djm 754: if (list_identities(agent_fd, lflag == 'l' ? 1 : 0) == -1)
1.115 djm 755: ret = 1;
756: goto done;
757: } else if (Dflag) {
1.136 djm 758: if (delete_all(agent_fd, qflag) == -1)
1.115 djm 759: ret = 1;
760: goto done;
761: }
1.145 djm 762:
763: if (skprovider == NULL)
764: skprovider = "internal";
1.115 djm 765:
1.43 markus 766: argc -= optind;
767: argv += optind;
1.137 djm 768: if (Tflag) {
769: if (argc <= 0)
770: fatal("no keys to test");
771: for (r = i = 0; i < argc; i++)
772: r |= test_key(agent_fd, argv[i]);
773: ret = r == 0 ? 0 : 1;
774: goto done;
775: }
1.92 markus 776: if (pkcs11provider != NULL) {
1.136 djm 777: if (update_card(agent_fd, !deleting, pkcs11provider,
778: qflag) == -1)
1.46 djm 779: ret = 1;
1.43 markus 780: goto done;
1.12 markus 781: }
1.148 ! djm 782: if (do_download) {
! 783: if (skprovider == NULL)
! 784: fatal("Cannot download keys without provider");
! 785: if (load_resident_keys(agent_fd, skprovider, qflag) != 0)
! 786: ret = 1;
! 787: goto done;
! 788: }
1.43 markus 789: if (argc == 0) {
1.117 deraadt 790: char buf[PATH_MAX];
1.48 djm 791: struct passwd *pw;
1.52 markus 792: struct stat st;
793: int count = 0;
1.48 djm 794:
795: if ((pw = getpwuid(getuid())) == NULL) {
1.20 deraadt 796: fprintf(stderr, "No user found with uid %u\n",
797: (u_int)getuid());
1.46 djm 798: ret = 1;
799: goto done;
1.12 markus 800: }
1.48 djm 801:
1.71 deraadt 802: for (i = 0; default_files[i]; i++) {
1.51 markus 803: snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
1.48 djm 804: default_files[i]);
1.140 deraadt 805: if (stat(buf, &st) == -1)
1.52 markus 806: continue;
1.134 dlg 807: if (do_file(agent_fd, deleting, key_only, buf,
1.143 djm 808: qflag, skprovider) == -1)
1.46 djm 809: ret = 1;
1.52 markus 810: else
811: count++;
1.46 djm 812: }
1.52 markus 813: if (count == 0)
814: ret = 1;
1.43 markus 815: } else {
1.71 deraadt 816: for (i = 0; i < argc; i++) {
1.116 djm 817: if (do_file(agent_fd, deleting, key_only,
1.143 djm 818: argv[i], qflag, skprovider) == -1)
1.48 djm 819: ret = 1;
1.43 markus 820: }
1.12 markus 821: }
1.148 ! djm 822: done:
1.33 markus 823: clear_pass();
1.116 djm 824: ssh_close_authentication_socket(agent_fd);
1.46 djm 825: return ret;
1.1 deraadt 826: }
![[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