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