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