Annotation of src/usr.bin/ssh/ssh-add.c, Revision 1.53.2.1
1.1 deraadt 1: /*
1.13 deraadt 2: * Author: Tatu Ylonen <ylo@cs.hut.fi>
3: * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4: * All rights reserved
5: * Adds an identity to the authentication server, or removes an identity.
1.19 markus 6: *
1.22 deraadt 7: * As far as I am concerned, the code I have written for this software
8: * can be used freely for any purpose. Any derived versions of this
9: * software must be clearly marked as such, and if the derived work is
10: * incompatible with the protocol description in the RFC file, it must be
11: * called by a name other than "ssh" or "Secure Shell".
12: *
1.19 markus 13: * SSH2 implementation,
1.41 markus 14: * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
1.22 deraadt 15: *
16: * Redistribution and use in source and binary forms, with or without
17: * modification, are permitted provided that the following conditions
18: * are met:
19: * 1. Redistributions of source code must retain the above copyright
20: * notice, this list of conditions and the following disclaimer.
21: * 2. Redistributions in binary form must reproduce the above copyright
22: * notice, this list of conditions and the following disclaimer in the
23: * documentation and/or other materials provided with the distribution.
24: *
25: * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
26: * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
27: * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
28: * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
29: * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
30: * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
31: * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
32: * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33: * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34: * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1.13 deraadt 35: */
1.1 deraadt 36:
37: #include "includes.h"
1.53.2.1! jason 38: RCSID("$OpenBSD: ssh-add.c,v 1.61 2002/06/19 00:27:55 deraadt Exp $");
1.16 markus 39:
1.19 markus 40: #include <openssl/evp.h>
1.1 deraadt 41:
1.27 markus 42: #include "ssh.h"
1.1 deraadt 43: #include "rsa.h"
1.27 markus 44: #include "log.h"
1.1 deraadt 45: #include "xmalloc.h"
1.16 markus 46: #include "key.h"
1.18 markus 47: #include "authfd.h"
1.16 markus 48: #include "authfile.h"
1.25 markus 49: #include "pathnames.h"
1.27 markus 50: #include "readpass.h"
1.53.2.1! jason 51: #include "misc.h"
1.1 deraadt 52:
1.45 jakob 53: /* argv0 */
54: extern char *__progname;
55:
1.48 djm 56: /* Default files to add */
57: static char *default_files[] = {
58: _PATH_SSH_CLIENT_ID_RSA,
59: _PATH_SSH_CLIENT_ID_DSA,
1.51 markus 60: _PATH_SSH_CLIENT_IDENTITY,
1.48 djm 61: NULL
62: };
63:
1.53.2.1! jason 64: /* Default lifetime (0 == forever) */
! 65: static int lifetime = 0;
1.48 djm 66:
1.33 markus 67: /* we keep a cache of one passphrases */
68: static char *pass = NULL;
1.39 itojun 69: static void
1.33 markus 70: clear_pass(void)
71: {
72: if (pass) {
73: memset(pass, 0, strlen(pass));
74: xfree(pass);
75: pass = NULL;
76: }
77: }
78:
1.46 djm 79: static int
1.7 markus 80: delete_file(AuthenticationConnection *ac, const char *filename)
1.1 deraadt 81: {
1.16 markus 82: Key *public;
1.32 markus 83: char *comment = NULL;
1.46 djm 84: int ret = -1;
1.1 deraadt 85:
1.31 markus 86: public = key_load_public(filename, &comment);
87: if (public == NULL) {
88: printf("Bad key file %s\n", filename);
1.46 djm 89: return -1;
1.12 markus 90: }
1.46 djm 91: if (ssh_remove_identity(ac, public)) {
1.12 markus 92: fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
1.46 djm 93: ret = 0;
94: } else
1.12 markus 95: fprintf(stderr, "Could not remove identity: %s\n", filename);
1.46 djm 96:
1.16 markus 97: key_free(public);
1.12 markus 98: xfree(comment);
1.47 deraadt 99:
1.46 djm 100: return ret;
1.1 deraadt 101: }
102:
1.19 markus 103: /* Send a request to remove all identities. */
1.46 djm 104: static int
1.7 markus 105: delete_all(AuthenticationConnection *ac)
1.1 deraadt 106: {
1.46 djm 107: int ret = -1;
1.19 markus 108:
1.46 djm 109: if (ssh_remove_all_identities(ac, 1))
110: ret = 0;
1.19 markus 111: /* ignore error-code for ssh2 */
112: ssh_remove_all_identities(ac, 2);
113:
1.46 djm 114: if (ret == 0)
1.12 markus 115: fprintf(stderr, "All identities removed.\n");
116: else
1.24 markus 117: fprintf(stderr, "Failed to remove all identities.\n");
1.46 djm 118:
119: return ret;
1.1 deraadt 120: }
121:
1.46 djm 122: static int
1.7 markus 123: add_file(AuthenticationConnection *ac, const char *filename)
1.1 deraadt 124: {
1.19 markus 125: struct stat st;
1.16 markus 126: Key *private;
1.36 markus 127: char *comment = NULL;
128: char msg[1024];
1.46 djm 129: int ret = -1;
1.12 markus 130:
1.19 markus 131: if (stat(filename, &st) < 0) {
132: perror(filename);
1.46 djm 133: return -1;
1.19 markus 134: }
1.12 markus 135: /* At first, try empty passphrase */
1.31 markus 136: private = key_load_private(filename, "", &comment);
137: if (comment == NULL)
138: comment = xstrdup(filename);
1.33 markus 139: /* try last */
140: if (private == NULL && pass != NULL)
141: private = key_load_private(filename, pass, NULL);
1.31 markus 142: if (private == NULL) {
1.33 markus 143: /* clear passphrase since it did not work */
144: clear_pass();
1.37 markus 145: snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
1.36 markus 146: comment);
1.12 markus 147: for (;;) {
1.40 markus 148: pass = read_passphrase(msg, RP_ALLOW_STDIN);
1.12 markus 149: if (strcmp(pass, "") == 0) {
1.35 markus 150: clear_pass();
1.31 markus 151: xfree(comment);
1.46 djm 152: return -1;
1.12 markus 153: }
1.31 markus 154: private = key_load_private(filename, pass, &comment);
155: if (private != NULL)
1.12 markus 156: break;
1.33 markus 157: clear_pass();
1.37 markus 158: strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
1.12 markus 159: }
160: }
1.53.2.1! jason 161:
! 162: if (ssh_add_identity_constrained(ac, private, comment, lifetime)) {
1.31 markus 163: fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
1.46 djm 164: ret = 0;
1.53.2.1! jason 165: if (lifetime != 0)
! 166: fprintf(stderr,
! 167: "Lifetime set to %d seconds\n", lifetime);
! 168: } else if (ssh_add_identity(ac, private, comment)) {
! 169: fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
! 170: ret = 0;
! 171: } else {
1.12 markus 172: fprintf(stderr, "Could not add identity: %s\n", filename);
1.53.2.1! jason 173: }
1.46 djm 174:
1.31 markus 175: xfree(comment);
1.16 markus 176: key_free(private);
1.47 deraadt 177:
1.46 djm 178: return ret;
1.1 deraadt 179: }
180:
1.46 djm 181: static int
1.44 markus 182: update_card(AuthenticationConnection *ac, int add, const char *id)
1.42 markus 183: {
1.53 rees 184: char *pin;
185:
186: pin = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN);
187: if (pin == NULL)
188: return -1;
189:
190: if (ssh_update_card(ac, add, id, pin)) {
1.44 markus 191: fprintf(stderr, "Card %s: %s\n",
1.47 deraadt 192: add ? "added" : "removed", id);
1.46 djm 193: return 0;
194: } else {
1.44 markus 195: fprintf(stderr, "Could not %s card: %s\n",
1.47 deraadt 196: add ? "add" : "remove", id);
1.46 djm 197: return -1;
198: }
1.42 markus 199: }
200:
1.50 markus 201: static int
1.30 markus 202: list_identities(AuthenticationConnection *ac, int do_fp)
1.1 deraadt 203: {
1.19 markus 204: Key *key;
1.30 markus 205: char *comment, *fp;
1.19 markus 206: int had_identities = 0;
207: int version;
1.12 markus 208:
1.19 markus 209: for (version = 1; version <= 2; version++) {
210: for (key = ssh_get_first_identity(ac, &comment, version);
1.47 deraadt 211: key != NULL;
212: key = ssh_get_next_identity(ac, &comment, version)) {
1.19 markus 213: had_identities = 1;
1.30 markus 214: if (do_fp) {
215: fp = key_fingerprint(key, SSH_FP_MD5,
216: SSH_FP_HEX);
1.23 markus 217: printf("%d %s %s (%s)\n",
1.30 markus 218: key_size(key), fp, comment, key_type(key));
219: xfree(fp);
1.12 markus 220: } else {
1.19 markus 221: if (!key_write(key, stdout))
222: fprintf(stderr, "key_write failed");
223: fprintf(stdout, " %s\n", comment);
1.12 markus 224: }
1.19 markus 225: key_free(key);
226: xfree(comment);
1.12 markus 227: }
228: }
1.50 markus 229: if (!had_identities) {
1.12 markus 230: printf("The agent has no identities.\n");
1.50 markus 231: return -1;
232: }
233: return 0;
1.1 deraadt 234: }
235:
1.48 djm 236: static int
1.53.2.1! jason 237: lock_agent(AuthenticationConnection *ac, int lock)
! 238: {
! 239: char prompt[100], *p1, *p2;
! 240: int passok = 1, ret = -1;
! 241:
! 242: strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
! 243: p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
! 244: if (lock) {
! 245: strlcpy(prompt, "Again: ", sizeof prompt);
! 246: p2 = read_passphrase(prompt, RP_ALLOW_STDIN);
! 247: if (strcmp(p1, p2) != 0) {
! 248: fprintf(stderr, "Passwords do not match.\n");
! 249: passok = 0;
! 250: }
! 251: memset(p2, 0, strlen(p2));
! 252: xfree(p2);
! 253: }
! 254: if (passok && ssh_lock_agent(ac, lock, p1)) {
! 255: fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
! 256: ret = 0;
! 257: } else
! 258: fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
! 259: memset(p1, 0, strlen(p1));
! 260: xfree(p1);
! 261: return -1;
! 262: }
! 263:
! 264: static int
1.48 djm 265: do_file(AuthenticationConnection *ac, int deleting, char *file)
266: {
267: if (deleting) {
268: if (delete_file(ac, file) == -1)
269: return -1;
270: } else {
271: if (add_file(ac, file) == -1)
272: return -1;
273: }
274: return 0;
275: }
276:
1.42 markus 277: static void
278: usage(void)
279: {
1.45 jakob 280: fprintf(stderr, "Usage: %s [options]\n", __progname);
281: fprintf(stderr, "Options:\n");
282: fprintf(stderr, " -l List fingerprints of all identities.\n");
283: fprintf(stderr, " -L List public key parameters of all identities.\n");
284: fprintf(stderr, " -d Delete identity.\n");
285: fprintf(stderr, " -D Delete all identities.\n");
1.53.2.1! jason 286: fprintf(stderr, " -x Lock agent.\n");
! 287: fprintf(stderr, " -x Unlock agent.\n");
! 288: fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n");
1.45 jakob 289: #ifdef SMARTCARD
290: fprintf(stderr, " -s reader Add key in smartcard reader.\n");
291: fprintf(stderr, " -e reader Remove key in smartcard reader.\n");
292: #endif
1.42 markus 293: }
294:
1.2 provos 295: int
1.7 markus 296: main(int argc, char **argv)
1.1 deraadt 297: {
1.43 markus 298: extern char *optarg;
299: extern int optind;
1.12 markus 300: AuthenticationConnection *ac = NULL;
1.44 markus 301: char *sc_reader_id = NULL;
1.46 djm 302: int i, ch, deleting = 0, ret = 0;
1.12 markus 303:
1.28 stevesk 304: SSLeay_add_all_algorithms();
1.19 markus 305:
1.12 markus 306: /* At first, get a connection to the authentication agent. */
307: ac = ssh_get_authentication_connection();
308: if (ac == NULL) {
309: fprintf(stderr, "Could not open a connection to your authentication agent.\n");
1.50 markus 310: exit(2);
1.12 markus 311: }
1.53.2.1! jason 312: while ((ch = getopt(argc, argv, "lLdDxXe:s:t:")) != -1) {
1.43 markus 313: switch (ch) {
314: case 'l':
315: case 'L':
1.50 markus 316: if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
317: ret = 1;
1.43 markus 318: goto done;
319: break;
1.53.2.1! jason 320: case 'x':
! 321: case 'X':
! 322: if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
! 323: ret = 1;
! 324: goto done;
! 325: break;
1.43 markus 326: case 'd':
1.12 markus 327: deleting = 1;
1.43 markus 328: break;
329: case 'D':
1.46 djm 330: if (delete_all(ac) == -1)
331: ret = 1;
1.43 markus 332: goto done;
333: break;
334: case 's':
1.44 markus 335: sc_reader_id = optarg;
1.43 markus 336: break;
337: case 'e':
1.47 deraadt 338: deleting = 1;
1.44 markus 339: sc_reader_id = optarg;
1.53.2.1! jason 340: break;
! 341: case 't':
! 342: if ((lifetime = convtime(optarg)) == -1) {
! 343: fprintf(stderr, "Invalid lifetime\n");
! 344: ret = 1;
! 345: goto done;
! 346: }
1.43 markus 347: break;
348: default:
349: usage();
1.46 djm 350: ret = 1;
351: goto done;
1.42 markus 352: }
353: }
1.43 markus 354: argc -= optind;
355: argv += optind;
1.44 markus 356: if (sc_reader_id != NULL) {
1.46 djm 357: if (update_card(ac, !deleting, sc_reader_id) == -1)
358: ret = 1;
1.43 markus 359: goto done;
1.12 markus 360: }
1.43 markus 361: if (argc == 0) {
1.48 djm 362: char buf[MAXPATHLEN];
363: struct passwd *pw;
1.52 markus 364: struct stat st;
365: int count = 0;
1.48 djm 366:
367: if ((pw = getpwuid(getuid())) == NULL) {
1.20 deraadt 368: fprintf(stderr, "No user found with uid %u\n",
369: (u_int)getuid());
1.46 djm 370: ret = 1;
371: goto done;
1.12 markus 372: }
1.48 djm 373:
374: for(i = 0; default_files[i]; i++) {
1.51 markus 375: snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
1.48 djm 376: default_files[i]);
1.52 markus 377: if (stat(buf, &st) < 0)
378: continue;
1.48 djm 379: if (do_file(ac, deleting, buf) == -1)
1.46 djm 380: ret = 1;
1.52 markus 381: else
382: count++;
1.46 djm 383: }
1.52 markus 384: if (count == 0)
385: ret = 1;
1.43 markus 386: } else {
1.48 djm 387: for(i = 0; i < argc; i++) {
1.49 deraadt 388: if (do_file(ac, deleting, argv[i]) == -1)
1.48 djm 389: ret = 1;
1.43 markus 390: }
1.12 markus 391: }
1.33 markus 392: clear_pass();
1.43 markus 393:
394: done:
1.12 markus 395: ssh_close_authentication_connection(ac);
1.46 djm 396: return ret;
1.1 deraadt 397: }
![[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