Annotation of src/usr.bin/ssh/ssh-add.c, Revision 1.101
1.101 ! djm 1: /* $OpenBSD: ssh-add.c,v 1.100 2010/08/31 12:33:38 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.86 stevesk 40: #include <sys/param.h>
1.16 markus 41:
1.19 markus 42: #include <openssl/evp.h>
1.81 stevesk 43:
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.1 deraadt 50:
1.89 deraadt 51: #include "xmalloc.h"
1.27 markus 52: #include "ssh.h"
1.1 deraadt 53: #include "rsa.h"
1.27 markus 54: #include "log.h"
1.16 markus 55: #include "key.h"
1.89 deraadt 56: #include "buffer.h"
1.18 markus 57: #include "authfd.h"
1.16 markus 58: #include "authfile.h"
1.25 markus 59: #include "pathnames.h"
1.57 stevesk 60: #include "misc.h"
1.1 deraadt 61:
1.45 jakob 62: /* argv0 */
63: extern char *__progname;
64:
1.48 djm 65: /* Default files to add */
66: static char *default_files[] = {
67: _PATH_SSH_CLIENT_ID_RSA,
68: _PATH_SSH_CLIENT_ID_DSA,
1.99 djm 69: _PATH_SSH_CLIENT_ID_ECDSA,
1.51 markus 70: _PATH_SSH_CLIENT_IDENTITY,
1.48 djm 71: NULL
72: };
73:
1.56 markus 74: /* Default lifetime (0 == forever) */
1.57 stevesk 75: static int lifetime = 0;
1.48 djm 76:
1.65 markus 77: /* User has to confirm key use */
78: static int confirm = 0;
79:
1.33 markus 80: /* we keep a cache of one passphrases */
81: static char *pass = NULL;
1.39 itojun 82: static void
1.33 markus 83: clear_pass(void)
84: {
85: if (pass) {
86: memset(pass, 0, strlen(pass));
87: xfree(pass);
88: pass = NULL;
89: }
90: }
91:
1.46 djm 92: static int
1.7 markus 93: delete_file(AuthenticationConnection *ac, const char *filename)
1.1 deraadt 94: {
1.16 markus 95: Key *public;
1.32 markus 96: char *comment = NULL;
1.46 djm 97: int ret = -1;
1.1 deraadt 98:
1.31 markus 99: public = key_load_public(filename, &comment);
100: if (public == NULL) {
101: printf("Bad key file %s\n", filename);
1.46 djm 102: return -1;
1.12 markus 103: }
1.46 djm 104: if (ssh_remove_identity(ac, public)) {
1.12 markus 105: fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
1.46 djm 106: ret = 0;
107: } else
1.12 markus 108: fprintf(stderr, "Could not remove identity: %s\n", filename);
1.46 djm 109:
1.16 markus 110: key_free(public);
1.12 markus 111: xfree(comment);
1.47 deraadt 112:
1.46 djm 113: return ret;
1.1 deraadt 114: }
115:
1.19 markus 116: /* Send a request to remove all identities. */
1.46 djm 117: static int
1.7 markus 118: delete_all(AuthenticationConnection *ac)
1.1 deraadt 119: {
1.46 djm 120: int ret = -1;
1.19 markus 121:
1.46 djm 122: if (ssh_remove_all_identities(ac, 1))
123: ret = 0;
1.19 markus 124: /* ignore error-code for ssh2 */
125: ssh_remove_all_identities(ac, 2);
126:
1.46 djm 127: if (ret == 0)
1.12 markus 128: fprintf(stderr, "All identities removed.\n");
129: else
1.24 markus 130: fprintf(stderr, "Failed to remove all identities.\n");
1.46 djm 131:
132: return ret;
1.1 deraadt 133: }
134:
1.46 djm 135: static int
1.7 markus 136: add_file(AuthenticationConnection *ac, const char *filename)
1.1 deraadt 137: {
1.93 djm 138: Key *private, *cert;
1.36 markus 139: char *comment = NULL;
1.93 djm 140: char msg[1024], *certpath;
1.76 dtucker 141: int fd, perms_ok, ret = -1;
1.101 ! djm 142: Buffer keyblob;
1.12 markus 143:
1.101 ! djm 144: if (strcmp(filename, "-") == 0) {
! 145: fd = STDIN_FILENO;
! 146: filename = "(stdin)";
! 147: } else if ((fd = open(filename, O_RDONLY)) < 0) {
1.19 markus 148: perror(filename);
1.46 djm 149: return -1;
1.19 markus 150: }
1.76 dtucker 151:
152: /*
153: * Since we'll try to load a keyfile multiple times, permission errors
154: * will occur multiple times, so check perms first and bail if wrong.
155: */
1.101 ! djm 156: if (fd != STDIN_FILENO) {
! 157: perms_ok = key_perm_ok(fd, filename);
! 158: if (!perms_ok) {
! 159: close(fd);
! 160: return -1;
! 161: }
! 162: }
! 163: buffer_init(&keyblob);
! 164: if (!key_load_file(fd, filename, &keyblob)) {
! 165: buffer_free(&keyblob);
! 166: close(fd);
! 167: return -1;
! 168: }
1.76 dtucker 169: close(fd);
170:
1.12 markus 171: /* At first, try empty passphrase */
1.101 ! djm 172: private = key_parse_private(&keyblob, filename, "", &comment);
1.31 markus 173: if (comment == NULL)
174: comment = xstrdup(filename);
1.33 markus 175: /* try last */
176: if (private == NULL && pass != NULL)
1.101 ! djm 177: private = key_parse_private(&keyblob, filename, pass, NULL);
1.31 markus 178: if (private == NULL) {
1.33 markus 179: /* clear passphrase since it did not work */
180: clear_pass();
1.37 markus 181: snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
1.72 djm 182: comment);
1.12 markus 183: for (;;) {
1.40 markus 184: pass = read_passphrase(msg, RP_ALLOW_STDIN);
1.12 markus 185: if (strcmp(pass, "") == 0) {
1.35 markus 186: clear_pass();
1.31 markus 187: xfree(comment);
1.101 ! djm 188: buffer_free(&keyblob);
1.46 djm 189: return -1;
1.12 markus 190: }
1.101 ! djm 191: private = key_parse_private(&keyblob, filename, pass,
! 192: &comment);
1.31 markus 193: if (private != NULL)
1.12 markus 194: break;
1.33 markus 195: clear_pass();
1.68 markus 196: snprintf(msg, sizeof msg,
197: "Bad passphrase, try again for %.200s: ", comment);
1.12 markus 198: }
199: }
1.101 ! djm 200: buffer_free(&keyblob);
1.60 markus 201:
1.69 djm 202: if (ssh_add_identity_constrained(ac, private, comment, lifetime,
203: confirm)) {
1.60 markus 204: fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
205: ret = 0;
206: if (lifetime != 0)
1.64 deraadt 207: fprintf(stderr,
1.60 markus 208: "Lifetime set to %d seconds\n", lifetime);
1.69 djm 209: if (confirm != 0)
1.65 markus 210: fprintf(stderr,
1.96 djm 211: "The user must confirm each use of the key\n");
1.60 markus 212: } else {
1.12 markus 213: fprintf(stderr, "Could not add identity: %s\n", filename);
1.56 markus 214: }
215:
1.93 djm 216:
217: /* Now try to add the certificate flavour too */
218: xasprintf(&certpath, "%s-cert.pub", filename);
1.96 djm 219: if ((cert = key_load_public(certpath, NULL)) == NULL)
220: goto out;
221:
222: if (!key_equal_public(cert, private)) {
223: error("Certificate %s does not match private key %s",
224: certpath, filename);
1.93 djm 225: key_free(cert);
1.96 djm 226: goto out;
227: }
1.93 djm 228:
1.96 djm 229: /* Graft with private bits */
230: if (key_to_certified(private, key_cert_is_legacy(cert)) != 0) {
231: error("%s: key_to_certified failed", __func__);
232: key_free(cert);
233: goto out;
1.94 otto 234: }
1.96 djm 235: key_cert_copy(cert, private);
236: key_free(cert);
1.93 djm 237:
1.96 djm 238: if (!ssh_add_identity_constrained(ac, private, comment,
239: lifetime, confirm)) {
240: error("Certificate %s (%s) add failed", certpath,
241: private->cert->key_id);
242: }
243: fprintf(stderr, "Certificate added: %s (%s)\n", certpath,
244: private->cert->key_id);
245: if (lifetime != 0)
246: fprintf(stderr, "Lifetime set to %d seconds\n", lifetime);
247: if (confirm != 0)
248: fprintf(stderr, "The user must confirm each use of the key\n");
249: out:
1.93 djm 250: xfree(certpath);
1.31 markus 251: xfree(comment);
1.16 markus 252: key_free(private);
1.47 deraadt 253:
1.46 djm 254: return ret;
1.1 deraadt 255: }
256:
1.46 djm 257: static int
1.44 markus 258: update_card(AuthenticationConnection *ac, int add, const char *id)
1.42 markus 259: {
1.53 rees 260: char *pin;
1.66 markus 261: int ret = -1;
1.53 rees 262:
1.92 markus 263: pin = read_passphrase("Enter passphrase for PKCS#11: ", RP_ALLOW_STDIN);
1.53 rees 264: if (pin == NULL)
265: return -1;
266:
1.67 djm 267: if (ssh_update_card(ac, add, id, pin, lifetime, confirm)) {
1.44 markus 268: fprintf(stderr, "Card %s: %s\n",
1.47 deraadt 269: add ? "added" : "removed", id);
1.66 markus 270: ret = 0;
1.46 djm 271: } else {
1.44 markus 272: fprintf(stderr, "Could not %s card: %s\n",
1.47 deraadt 273: add ? "add" : "remove", id);
1.66 markus 274: ret = -1;
1.46 djm 275: }
1.66 markus 276: xfree(pin);
277: return ret;
1.42 markus 278: }
279:
1.50 markus 280: static int
1.30 markus 281: list_identities(AuthenticationConnection *ac, int do_fp)
1.1 deraadt 282: {
1.19 markus 283: Key *key;
1.30 markus 284: char *comment, *fp;
1.19 markus 285: int had_identities = 0;
286: int version;
1.12 markus 287:
1.19 markus 288: for (version = 1; version <= 2; version++) {
289: for (key = ssh_get_first_identity(ac, &comment, version);
1.47 deraadt 290: key != NULL;
291: key = ssh_get_next_identity(ac, &comment, version)) {
1.19 markus 292: had_identities = 1;
1.30 markus 293: if (do_fp) {
294: fp = key_fingerprint(key, SSH_FP_MD5,
295: SSH_FP_HEX);
1.23 markus 296: printf("%d %s %s (%s)\n",
1.30 markus 297: key_size(key), fp, comment, key_type(key));
298: xfree(fp);
1.12 markus 299: } else {
1.19 markus 300: if (!key_write(key, stdout))
301: fprintf(stderr, "key_write failed");
302: fprintf(stdout, " %s\n", comment);
1.12 markus 303: }
1.19 markus 304: key_free(key);
305: xfree(comment);
1.12 markus 306: }
307: }
1.50 markus 308: if (!had_identities) {
1.12 markus 309: printf("The agent has no identities.\n");
1.50 markus 310: return -1;
311: }
312: return 0;
1.1 deraadt 313: }
314:
1.48 djm 315: static int
1.54 markus 316: lock_agent(AuthenticationConnection *ac, int lock)
317: {
318: char prompt[100], *p1, *p2;
319: int passok = 1, ret = -1;
1.61 deraadt 320:
1.54 markus 321: strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
322: p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
323: if (lock) {
324: strlcpy(prompt, "Again: ", sizeof prompt);
325: p2 = read_passphrase(prompt, RP_ALLOW_STDIN);
326: if (strcmp(p1, p2) != 0) {
327: fprintf(stderr, "Passwords do not match.\n");
328: passok = 0;
329: }
330: memset(p2, 0, strlen(p2));
331: xfree(p2);
332: }
333: if (passok && ssh_lock_agent(ac, lock, p1)) {
334: fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
335: ret = 0;
336: } else
337: fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
338: memset(p1, 0, strlen(p1));
339: xfree(p1);
1.62 markus 340: return (ret);
1.54 markus 341: }
342:
343: static int
1.48 djm 344: do_file(AuthenticationConnection *ac, int deleting, char *file)
345: {
346: if (deleting) {
347: if (delete_file(ac, file) == -1)
348: return -1;
349: } else {
350: if (add_file(ac, file) == -1)
351: return -1;
352: }
353: return 0;
354: }
355:
1.42 markus 356: static void
357: usage(void)
358: {
1.90 sobrado 359: fprintf(stderr, "usage: %s [options] [file ...]\n", __progname);
1.45 jakob 360: fprintf(stderr, "Options:\n");
361: fprintf(stderr, " -l List fingerprints of all identities.\n");
362: fprintf(stderr, " -L List public key parameters of all identities.\n");
363: fprintf(stderr, " -d Delete identity.\n");
364: fprintf(stderr, " -D Delete all identities.\n");
1.55 markus 365: fprintf(stderr, " -x Lock agent.\n");
1.63 markus 366: fprintf(stderr, " -X Unlock agent.\n");
1.56 markus 367: fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n");
1.65 markus 368: fprintf(stderr, " -c Require confirmation to sign using identities\n");
1.92 markus 369: fprintf(stderr, " -s pkcs11 Add keys from PKCS#11 provider.\n");
370: fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n");
1.42 markus 371: }
372:
1.2 provos 373: int
1.7 markus 374: main(int argc, char **argv)
1.1 deraadt 375: {
1.43 markus 376: extern char *optarg;
377: extern int optind;
1.12 markus 378: AuthenticationConnection *ac = NULL;
1.92 markus 379: char *pkcs11provider = NULL;
1.46 djm 380: int i, ch, deleting = 0, ret = 0;
1.73 djm 381:
382: /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
383: sanitise_stdfd();
1.12 markus 384:
1.100 djm 385: OpenSSL_add_all_algorithms();
1.19 markus 386:
1.12 markus 387: /* At first, get a connection to the authentication agent. */
388: ac = ssh_get_authentication_connection();
389: if (ac == NULL) {
1.74 deraadt 390: fprintf(stderr,
391: "Could not open a connection to your authentication agent.\n");
1.50 markus 392: exit(2);
1.12 markus 393: }
1.65 markus 394: while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
1.43 markus 395: switch (ch) {
396: case 'l':
397: case 'L':
1.50 markus 398: if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
1.54 markus 399: ret = 1;
400: goto done;
401: case 'x':
402: case 'X':
403: if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
1.50 markus 404: ret = 1;
1.43 markus 405: goto done;
1.65 markus 406: case 'c':
407: confirm = 1;
1.43 markus 408: break;
409: case 'd':
1.12 markus 410: deleting = 1;
1.43 markus 411: break;
412: case 'D':
1.46 djm 413: if (delete_all(ac) == -1)
414: ret = 1;
1.43 markus 415: goto done;
416: case 's':
1.92 markus 417: pkcs11provider = optarg;
1.43 markus 418: break;
419: case 'e':
1.47 deraadt 420: deleting = 1;
1.92 markus 421: pkcs11provider = optarg;
1.56 markus 422: break;
423: case 't':
1.57 stevesk 424: if ((lifetime = convtime(optarg)) == -1) {
425: fprintf(stderr, "Invalid lifetime\n");
426: ret = 1;
427: goto done;
428: }
1.43 markus 429: break;
430: default:
431: usage();
1.46 djm 432: ret = 1;
433: goto done;
1.42 markus 434: }
435: }
1.43 markus 436: argc -= optind;
437: argv += optind;
1.92 markus 438: if (pkcs11provider != NULL) {
439: if (update_card(ac, !deleting, pkcs11provider) == -1)
1.46 djm 440: ret = 1;
1.43 markus 441: goto done;
1.12 markus 442: }
1.43 markus 443: if (argc == 0) {
1.48 djm 444: char buf[MAXPATHLEN];
445: struct passwd *pw;
1.52 markus 446: struct stat st;
447: int count = 0;
1.48 djm 448:
449: if ((pw = getpwuid(getuid())) == NULL) {
1.20 deraadt 450: fprintf(stderr, "No user found with uid %u\n",
451: (u_int)getuid());
1.46 djm 452: ret = 1;
453: goto done;
1.12 markus 454: }
1.48 djm 455:
1.71 deraadt 456: for (i = 0; default_files[i]; i++) {
1.51 markus 457: snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
1.48 djm 458: default_files[i]);
1.52 markus 459: if (stat(buf, &st) < 0)
460: continue;
1.48 djm 461: if (do_file(ac, deleting, buf) == -1)
1.46 djm 462: ret = 1;
1.52 markus 463: else
464: count++;
1.46 djm 465: }
1.52 markus 466: if (count == 0)
467: ret = 1;
1.43 markus 468: } else {
1.71 deraadt 469: for (i = 0; i < argc; i++) {
1.49 deraadt 470: if (do_file(ac, deleting, argv[i]) == -1)
1.48 djm 471: ret = 1;
1.43 markus 472: }
1.12 markus 473: }
1.33 markus 474: clear_pass();
1.43 markus 475:
476: done:
1.12 markus 477: ssh_close_authentication_connection(ac);
1.46 djm 478: return ret;
1.1 deraadt 479: }
![[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