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