Annotation of src/usr.bin/ssh/ssh-add.c, Revision 1.75.2.1
1.75.2.1! brad 1: /* $OpenBSD: ssh-add.c,v 1.89 2006/08/03 03:34:42 deraadt 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.75.2.1! brad 40: #include <sys/param.h>
1.16 markus 41:
1.19 markus 42: #include <openssl/evp.h>
1.1 deraadt 43:
1.75.2.1! brad 44: #include <fcntl.h>
! 45: #include <pwd.h>
! 46: #include <stdio.h>
! 47: #include <stdlib.h>
! 48: #include <string.h>
! 49: #include <unistd.h>
! 50:
! 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.75.2.1! brad 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.16 markus 137: Key *private;
1.36 markus 138: char *comment = NULL;
139: char msg[1024];
1.75.2.1! brad 140: int fd, perms_ok, ret = -1;
1.12 markus 141:
1.75.2.1! brad 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.75.2.1! brad 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 if (ssh_add_identity(ac, private, comment)) {
1.31 markus 195: fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
1.46 djm 196: ret = 0;
1.60 markus 197: } else {
1.12 markus 198: fprintf(stderr, "Could not add identity: %s\n", filename);
1.56 markus 199: }
200:
1.31 markus 201: xfree(comment);
1.16 markus 202: key_free(private);
1.47 deraadt 203:
1.46 djm 204: return ret;
1.1 deraadt 205: }
206:
1.46 djm 207: static int
1.44 markus 208: update_card(AuthenticationConnection *ac, int add, const char *id)
1.42 markus 209: {
1.53 rees 210: char *pin;
1.66 markus 211: int ret = -1;
1.53 rees 212:
213: pin = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN);
214: if (pin == NULL)
215: return -1;
216:
1.67 djm 217: if (ssh_update_card(ac, add, id, pin, lifetime, confirm)) {
1.44 markus 218: fprintf(stderr, "Card %s: %s\n",
1.47 deraadt 219: add ? "added" : "removed", id);
1.66 markus 220: ret = 0;
1.46 djm 221: } else {
1.44 markus 222: fprintf(stderr, "Could not %s card: %s\n",
1.47 deraadt 223: add ? "add" : "remove", id);
1.66 markus 224: ret = -1;
1.46 djm 225: }
1.66 markus 226: xfree(pin);
227: return ret;
1.42 markus 228: }
229:
1.50 markus 230: static int
1.30 markus 231: list_identities(AuthenticationConnection *ac, int do_fp)
1.1 deraadt 232: {
1.19 markus 233: Key *key;
1.30 markus 234: char *comment, *fp;
1.19 markus 235: int had_identities = 0;
236: int version;
1.12 markus 237:
1.19 markus 238: for (version = 1; version <= 2; version++) {
239: for (key = ssh_get_first_identity(ac, &comment, version);
1.47 deraadt 240: key != NULL;
241: key = ssh_get_next_identity(ac, &comment, version)) {
1.19 markus 242: had_identities = 1;
1.30 markus 243: if (do_fp) {
244: fp = key_fingerprint(key, SSH_FP_MD5,
245: SSH_FP_HEX);
1.23 markus 246: printf("%d %s %s (%s)\n",
1.30 markus 247: key_size(key), fp, comment, key_type(key));
248: xfree(fp);
1.12 markus 249: } else {
1.19 markus 250: if (!key_write(key, stdout))
251: fprintf(stderr, "key_write failed");
252: fprintf(stdout, " %s\n", comment);
1.12 markus 253: }
1.19 markus 254: key_free(key);
255: xfree(comment);
1.12 markus 256: }
257: }
1.50 markus 258: if (!had_identities) {
1.12 markus 259: printf("The agent has no identities.\n");
1.50 markus 260: return -1;
261: }
262: return 0;
1.1 deraadt 263: }
264:
1.48 djm 265: static int
1.54 markus 266: lock_agent(AuthenticationConnection *ac, int lock)
267: {
268: char prompt[100], *p1, *p2;
269: int passok = 1, ret = -1;
1.61 deraadt 270:
1.54 markus 271: strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
272: p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
273: if (lock) {
274: strlcpy(prompt, "Again: ", sizeof prompt);
275: p2 = read_passphrase(prompt, RP_ALLOW_STDIN);
276: if (strcmp(p1, p2) != 0) {
277: fprintf(stderr, "Passwords do not match.\n");
278: passok = 0;
279: }
280: memset(p2, 0, strlen(p2));
281: xfree(p2);
282: }
283: if (passok && ssh_lock_agent(ac, lock, p1)) {
284: fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
285: ret = 0;
286: } else
287: fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
288: memset(p1, 0, strlen(p1));
289: xfree(p1);
1.62 markus 290: return (ret);
1.54 markus 291: }
292:
293: static int
1.48 djm 294: do_file(AuthenticationConnection *ac, int deleting, char *file)
295: {
296: if (deleting) {
297: if (delete_file(ac, file) == -1)
298: return -1;
299: } else {
300: if (add_file(ac, file) == -1)
301: return -1;
302: }
303: return 0;
304: }
305:
1.42 markus 306: static void
307: usage(void)
308: {
1.75.2.1! brad 309: fprintf(stderr, "Usage: %s [options] [file ...]\n", __progname);
1.45 jakob 310: fprintf(stderr, "Options:\n");
311: fprintf(stderr, " -l List fingerprints of all identities.\n");
312: fprintf(stderr, " -L List public key parameters of all identities.\n");
313: fprintf(stderr, " -d Delete identity.\n");
314: fprintf(stderr, " -D Delete all identities.\n");
1.55 markus 315: fprintf(stderr, " -x Lock agent.\n");
1.63 markus 316: fprintf(stderr, " -X Unlock agent.\n");
1.56 markus 317: fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n");
1.65 markus 318: fprintf(stderr, " -c Require confirmation to sign using identities\n");
1.45 jakob 319: #ifdef SMARTCARD
320: fprintf(stderr, " -s reader Add key in smartcard reader.\n");
321: fprintf(stderr, " -e reader Remove key in smartcard reader.\n");
322: #endif
1.42 markus 323: }
324:
1.2 provos 325: int
1.7 markus 326: main(int argc, char **argv)
1.1 deraadt 327: {
1.43 markus 328: extern char *optarg;
329: extern int optind;
1.12 markus 330: AuthenticationConnection *ac = NULL;
1.44 markus 331: char *sc_reader_id = NULL;
1.46 djm 332: int i, ch, deleting = 0, ret = 0;
1.73 djm 333:
334: /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
335: sanitise_stdfd();
1.12 markus 336:
1.28 stevesk 337: SSLeay_add_all_algorithms();
1.19 markus 338:
1.12 markus 339: /* At first, get a connection to the authentication agent. */
340: ac = ssh_get_authentication_connection();
341: if (ac == NULL) {
1.74 deraadt 342: fprintf(stderr,
343: "Could not open a connection to your authentication agent.\n");
1.50 markus 344: exit(2);
1.12 markus 345: }
1.65 markus 346: while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
1.43 markus 347: switch (ch) {
348: case 'l':
349: case 'L':
1.50 markus 350: if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
1.54 markus 351: ret = 1;
352: goto done;
353: case 'x':
354: case 'X':
355: if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
1.50 markus 356: ret = 1;
1.43 markus 357: goto done;
1.65 markus 358: case 'c':
359: confirm = 1;
1.43 markus 360: break;
361: case 'd':
1.12 markus 362: deleting = 1;
1.43 markus 363: break;
364: case 'D':
1.46 djm 365: if (delete_all(ac) == -1)
366: ret = 1;
1.43 markus 367: goto done;
368: case 's':
1.44 markus 369: sc_reader_id = optarg;
1.43 markus 370: break;
371: case 'e':
1.47 deraadt 372: deleting = 1;
1.44 markus 373: sc_reader_id = optarg;
1.56 markus 374: break;
375: case 't':
1.57 stevesk 376: if ((lifetime = convtime(optarg)) == -1) {
377: fprintf(stderr, "Invalid lifetime\n");
378: ret = 1;
379: goto done;
380: }
1.43 markus 381: break;
382: default:
383: usage();
1.46 djm 384: ret = 1;
385: goto done;
1.42 markus 386: }
387: }
1.43 markus 388: argc -= optind;
389: argv += optind;
1.44 markus 390: if (sc_reader_id != NULL) {
1.46 djm 391: if (update_card(ac, !deleting, sc_reader_id) == -1)
392: ret = 1;
1.43 markus 393: goto done;
1.12 markus 394: }
1.43 markus 395: if (argc == 0) {
1.48 djm 396: char buf[MAXPATHLEN];
397: struct passwd *pw;
1.52 markus 398: struct stat st;
399: int count = 0;
1.48 djm 400:
401: if ((pw = getpwuid(getuid())) == NULL) {
1.20 deraadt 402: fprintf(stderr, "No user found with uid %u\n",
403: (u_int)getuid());
1.46 djm 404: ret = 1;
405: goto done;
1.12 markus 406: }
1.48 djm 407:
1.71 deraadt 408: for (i = 0; default_files[i]; i++) {
1.51 markus 409: snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
1.48 djm 410: default_files[i]);
1.52 markus 411: if (stat(buf, &st) < 0)
412: continue;
1.48 djm 413: if (do_file(ac, deleting, buf) == -1)
1.46 djm 414: ret = 1;
1.52 markus 415: else
416: count++;
1.46 djm 417: }
1.52 markus 418: if (count == 0)
419: ret = 1;
1.43 markus 420: } else {
1.71 deraadt 421: for (i = 0; i < argc; i++) {
1.49 deraadt 422: if (do_file(ac, deleting, argv[i]) == -1)
1.48 djm 423: ret = 1;
1.43 markus 424: }
1.12 markus 425: }
1.33 markus 426: clear_pass();
1.43 markus 427:
428: done:
1.12 markus 429: ssh_close_authentication_connection(ac);
1.46 djm 430: return ret;
1.1 deraadt 431: }
![[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