djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 1 | /* $OpenBSD: ssh-add.c,v 1.115 2014/12/21 22:27:56 djm Exp $ */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 2 | /* |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
| 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| 5 | * All rights reserved |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 6 | * Adds an identity to the authentication server, or removes an identity. |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 7 | * |
Damien Miller | e4340be | 2000-09-16 13:29:08 +1100 | [diff] [blame] | 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 | * |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 14 | * SSH2 implementation, |
Ben Lindstrom | 4469723 | 2001-07-04 03:32:30 +0000 | [diff] [blame] | 15 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
Damien Miller | e4340be | 2000-09-16 13:29:08 +1100 | [diff] [blame] | 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. |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 36 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 37 | |
| 38 | #include "includes.h" |
Damien Miller | f17883e | 2006-03-15 11:45:54 +1100 | [diff] [blame] | 39 | |
| 40 | #include <sys/types.h> |
| 41 | #include <sys/stat.h> |
Damien Miller | 8dbffe7 | 2006-08-05 11:02:17 +1000 | [diff] [blame] | 42 | #include <sys/param.h> |
Damien Miller | eba71ba | 2000-04-29 23:57:08 +1000 | [diff] [blame] | 43 | |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 44 | #include <openssl/evp.h> |
Darren Tucker | bfaaf96 | 2008-02-28 19:13:52 +1100 | [diff] [blame] | 45 | #include "openbsd-compat/openssl-compat.h" |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 46 | |
Damien Miller | 57cf638 | 2006-07-10 21:13:46 +1000 | [diff] [blame] | 47 | #include <fcntl.h> |
Damien Miller | 9f2abc4 | 2006-07-10 20:53:08 +1000 | [diff] [blame] | 48 | #include <pwd.h> |
Damien Miller | ded319c | 2006-09-01 15:38:36 +1000 | [diff] [blame] | 49 | #include <stdarg.h> |
Damien Miller | a7a73ee | 2006-08-05 11:37:59 +1000 | [diff] [blame] | 50 | #include <stdio.h> |
Damien Miller | e7a1e5c | 2006-08-05 11:34:19 +1000 | [diff] [blame] | 51 | #include <stdlib.h> |
Damien Miller | e3476ed | 2006-07-24 14:13:33 +1000 | [diff] [blame] | 52 | #include <string.h> |
Damien Miller | e6b3b61 | 2006-07-24 14:01:23 +1000 | [diff] [blame] | 53 | #include <unistd.h> |
Damien Miller | 9f2abc4 | 2006-07-10 20:53:08 +1000 | [diff] [blame] | 54 | |
Damien Miller | d783435 | 2006-08-05 12:39:39 +1000 | [diff] [blame] | 55 | #include "xmalloc.h" |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 56 | #include "ssh.h" |
Ben Lindstrom | 226cfa0 | 2001-01-22 05:34:40 +0000 | [diff] [blame] | 57 | #include "rsa.h" |
| 58 | #include "log.h" |
Damien Miller | eba71ba | 2000-04-29 23:57:08 +1000 | [diff] [blame] | 59 | #include "key.h" |
Damien Miller | d783435 | 2006-08-05 12:39:39 +1000 | [diff] [blame] | 60 | #include "buffer.h" |
Damien Miller | 994cf14 | 2000-07-21 10:19:44 +1000 | [diff] [blame] | 61 | #include "authfd.h" |
Damien Miller | eba71ba | 2000-04-29 23:57:08 +1000 | [diff] [blame] | 62 | #include "authfile.h" |
Ben Lindstrom | 226cfa0 | 2001-01-22 05:34:40 +0000 | [diff] [blame] | 63 | #include "pathnames.h" |
Ben Lindstrom | 1775c9c | 2002-06-11 15:51:54 +0000 | [diff] [blame] | 64 | #include "misc.h" |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 65 | #include "ssherr.h" |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 66 | #include "digest.h" |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 67 | |
Ben Lindstrom | ddfb1e3 | 2001-08-06 22:06:35 +0000 | [diff] [blame] | 68 | /* argv0 */ |
| 69 | extern char *__progname; |
| 70 | |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 71 | /* Default files to add */ |
| 72 | static char *default_files[] = { |
| 73 | _PATH_SSH_CLIENT_ID_RSA, |
| 74 | _PATH_SSH_CLIENT_ID_DSA, |
Damien Miller | dd190dd | 2010-11-11 14:17:02 +1100 | [diff] [blame] | 75 | #ifdef OPENSSL_HAS_ECC |
Damien Miller | eb8b60e | 2010-08-31 22:41:14 +1000 | [diff] [blame] | 76 | _PATH_SSH_CLIENT_ID_ECDSA, |
Damien Miller | dd190dd | 2010-11-11 14:17:02 +1100 | [diff] [blame] | 77 | #endif |
Damien Miller | 059321d | 2013-12-18 17:49:48 +1100 | [diff] [blame] | 78 | _PATH_SSH_CLIENT_ID_ED25519, |
Ben Lindstrom | 6328ab3 | 2002-03-22 02:54:23 +0000 | [diff] [blame] | 79 | _PATH_SSH_CLIENT_IDENTITY, |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 80 | NULL |
| 81 | }; |
| 82 | |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 83 | static int fingerprint_hash = SSH_FP_HASH_DEFAULT; |
| 84 | |
Ben Lindstrom | 61d328a | 2002-06-06 21:54:57 +0000 | [diff] [blame] | 85 | /* Default lifetime (0 == forever) */ |
Ben Lindstrom | 1775c9c | 2002-06-11 15:51:54 +0000 | [diff] [blame] | 86 | static int lifetime = 0; |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 87 | |
Damien Miller | 6c71179 | 2003-01-24 11:36:23 +1100 | [diff] [blame] | 88 | /* User has to confirm key use */ |
| 89 | static int confirm = 0; |
| 90 | |
Ben Lindstrom | ee61794 | 2001-04-10 02:45:32 +0000 | [diff] [blame] | 91 | /* we keep a cache of one passphrases */ |
| 92 | static char *pass = NULL; |
Ben Lindstrom | bba8121 | 2001-06-25 05:01:22 +0000 | [diff] [blame] | 93 | static void |
Ben Lindstrom | ee61794 | 2001-04-10 02:45:32 +0000 | [diff] [blame] | 94 | clear_pass(void) |
| 95 | { |
| 96 | if (pass) { |
Damien Miller | a5103f4 | 2014-02-04 11:20:14 +1100 | [diff] [blame] | 97 | explicit_bzero(pass, strlen(pass)); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 98 | free(pass); |
Ben Lindstrom | ee61794 | 2001-04-10 02:45:32 +0000 | [diff] [blame] | 99 | pass = NULL; |
| 100 | } |
| 101 | } |
| 102 | |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 103 | static int |
Damien Miller | 33a8136 | 2012-12-03 09:50:24 +1100 | [diff] [blame] | 104 | delete_file(AuthenticationConnection *ac, const char *filename, int key_only) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 105 | { |
Damien Miller | 33a8136 | 2012-12-03 09:50:24 +1100 | [diff] [blame] | 106 | Key *public = NULL, *cert = NULL; |
| 107 | char *certpath = NULL, *comment = NULL; |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 108 | int ret = -1; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 109 | |
Ben Lindstrom | d0fca42 | 2001-03-26 13:44:06 +0000 | [diff] [blame] | 110 | public = key_load_public(filename, &comment); |
| 111 | if (public == NULL) { |
| 112 | printf("Bad key file %s\n", filename); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 113 | return -1; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 114 | } |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 115 | if (ssh_remove_identity(ac, public)) { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 116 | fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 117 | ret = 0; |
| 118 | } else |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 119 | fprintf(stderr, "Could not remove identity: %s\n", filename); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 120 | |
Damien Miller | 33a8136 | 2012-12-03 09:50:24 +1100 | [diff] [blame] | 121 | if (key_only) |
| 122 | goto out; |
| 123 | |
| 124 | /* Now try to delete the corresponding certificate too */ |
| 125 | free(comment); |
Darren Tucker | 8a96522 | 2012-12-07 13:07:02 +1100 | [diff] [blame] | 126 | comment = NULL; |
Damien Miller | 33a8136 | 2012-12-03 09:50:24 +1100 | [diff] [blame] | 127 | xasprintf(&certpath, "%s-cert.pub", filename); |
| 128 | if ((cert = key_load_public(certpath, &comment)) == NULL) |
| 129 | goto out; |
| 130 | if (!key_equal_public(cert, public)) |
| 131 | fatal("Certificate %s does not match private key %s", |
| 132 | certpath, filename); |
| 133 | |
| 134 | if (ssh_remove_identity(ac, cert)) { |
| 135 | fprintf(stderr, "Identity removed: %s (%s)\n", certpath, |
| 136 | comment); |
| 137 | ret = 0; |
| 138 | } else |
| 139 | fprintf(stderr, "Could not remove identity: %s\n", certpath); |
| 140 | |
| 141 | out: |
| 142 | if (cert != NULL) |
| 143 | key_free(cert); |
| 144 | if (public != NULL) |
| 145 | key_free(public); |
| 146 | free(certpath); |
| 147 | free(comment); |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 148 | |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 149 | return ret; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 150 | } |
| 151 | |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 152 | /* Send a request to remove all identities. */ |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 153 | static int |
Damien Miller | 01ab4a2 | 1999-10-28 15:23:30 +1000 | [diff] [blame] | 154 | delete_all(AuthenticationConnection *ac) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 155 | { |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 156 | int ret = -1; |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 157 | |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 158 | if (ssh_remove_all_identities(ac, 1)) |
| 159 | ret = 0; |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 160 | /* ignore error-code for ssh2 */ |
| 161 | ssh_remove_all_identities(ac, 2); |
| 162 | |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 163 | if (ret == 0) |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 164 | fprintf(stderr, "All identities removed.\n"); |
| 165 | else |
Ben Lindstrom | bf555ba | 2001-01-18 02:04:35 +0000 | [diff] [blame] | 166 | fprintf(stderr, "Failed to remove all identities.\n"); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 167 | |
| 168 | return ret; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 169 | } |
| 170 | |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 171 | static int |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 172 | add_file(AuthenticationConnection *ac, const char *filename, int key_only) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 173 | { |
Damien Miller | 0a80ca1 | 2010-02-27 07:55:05 +1100 | [diff] [blame] | 174 | Key *private, *cert; |
Ben Lindstrom | 5eb97b6 | 2001-04-19 20:33:07 +0000 | [diff] [blame] | 175 | char *comment = NULL; |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 176 | char msg[1024], *certpath = NULL; |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 177 | int r, fd, perms_ok, ret = -1; |
Damien Miller | 2ce12ef | 2011-05-05 14:17:18 +1000 | [diff] [blame] | 178 | Buffer keyblob; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 179 | |
Damien Miller | 2ce12ef | 2011-05-05 14:17:18 +1000 | [diff] [blame] | 180 | if (strcmp(filename, "-") == 0) { |
| 181 | fd = STDIN_FILENO; |
| 182 | filename = "(stdin)"; |
| 183 | } else if ((fd = open(filename, O_RDONLY)) < 0) { |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 184 | perror(filename); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 185 | return -1; |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 186 | } |
Damien Miller | 8275fad | 2006-03-15 12:06:23 +1100 | [diff] [blame] | 187 | |
| 188 | /* |
| 189 | * Since we'll try to load a keyfile multiple times, permission errors |
| 190 | * will occur multiple times, so check perms first and bail if wrong. |
| 191 | */ |
Damien Miller | 2ce12ef | 2011-05-05 14:17:18 +1000 | [diff] [blame] | 192 | if (fd != STDIN_FILENO) { |
| 193 | perms_ok = key_perm_ok(fd, filename); |
| 194 | if (!perms_ok) { |
| 195 | close(fd); |
| 196 | return -1; |
| 197 | } |
| 198 | } |
| 199 | buffer_init(&keyblob); |
| 200 | if (!key_load_file(fd, filename, &keyblob)) { |
| 201 | buffer_free(&keyblob); |
| 202 | close(fd); |
Damien Miller | 8275fad | 2006-03-15 12:06:23 +1100 | [diff] [blame] | 203 | return -1; |
Damien Miller | 2ce12ef | 2011-05-05 14:17:18 +1000 | [diff] [blame] | 204 | } |
| 205 | close(fd); |
Damien Miller | 8275fad | 2006-03-15 12:06:23 +1100 | [diff] [blame] | 206 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 207 | /* At first, try empty passphrase */ |
Damien Miller | ec3d0e2 | 2014-07-02 15:30:00 +1000 | [diff] [blame] | 208 | if ((r = sshkey_parse_private_fileblob(&keyblob, "", filename, |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 209 | &private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
Damien Miller | ec3d0e2 | 2014-07-02 15:30:00 +1000 | [diff] [blame] | 210 | fatal("Cannot parse %s: %s", filename, ssh_err(r)); |
Ben Lindstrom | ee61794 | 2001-04-10 02:45:32 +0000 | [diff] [blame] | 211 | /* try last */ |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 212 | if (private == NULL && pass != NULL) { |
Damien Miller | ec3d0e2 | 2014-07-02 15:30:00 +1000 | [diff] [blame] | 213 | if ((r = sshkey_parse_private_fileblob(&keyblob, pass, filename, |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 214 | &private, &comment)) != 0 && |
| 215 | r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
| 216 | fatal("Cannot parse %s: %s", filename, ssh_err(r)); |
| 217 | } |
Damien Miller | 1d0df32 | 2014-07-11 09:19:04 +1000 | [diff] [blame] | 218 | if (comment == NULL) |
| 219 | comment = xstrdup(filename); |
Ben Lindstrom | d0fca42 | 2001-03-26 13:44:06 +0000 | [diff] [blame] | 220 | if (private == NULL) { |
Ben Lindstrom | ee61794 | 2001-04-10 02:45:32 +0000 | [diff] [blame] | 221 | /* clear passphrase since it did not work */ |
| 222 | clear_pass(); |
Ben Lindstrom | 8a13713 | 2001-05-02 22:40:12 +0000 | [diff] [blame] | 223 | snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ", |
Damien Miller | 0dc1bef | 2005-07-17 17:22:45 +1000 | [diff] [blame] | 224 | comment); |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 225 | for (;;) { |
Ben Lindstrom | 949974b | 2001-06-25 05:20:31 +0000 | [diff] [blame] | 226 | pass = read_passphrase(msg, RP_ALLOW_STDIN); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 227 | if (strcmp(pass, "") == 0) { |
Ben Lindstrom | 7457f2a | 2001-04-14 23:10:09 +0000 | [diff] [blame] | 228 | clear_pass(); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 229 | free(comment); |
Damien Miller | 2ce12ef | 2011-05-05 14:17:18 +1000 | [diff] [blame] | 230 | buffer_free(&keyblob); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 231 | return -1; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 232 | } |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 233 | if ((r = sshkey_parse_private_fileblob(&keyblob, |
Damien Miller | ec3d0e2 | 2014-07-02 15:30:00 +1000 | [diff] [blame] | 234 | pass, filename, &private, NULL)) != 0 && |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 235 | r != SSH_ERR_KEY_WRONG_PASSPHRASE) |
| 236 | fatal("Cannot parse %s: %s", |
| 237 | filename, ssh_err(r)); |
Ben Lindstrom | d0fca42 | 2001-03-26 13:44:06 +0000 | [diff] [blame] | 238 | if (private != NULL) |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 239 | break; |
Ben Lindstrom | ee61794 | 2001-04-10 02:45:32 +0000 | [diff] [blame] | 240 | clear_pass(); |
Damien Miller | 80163e1 | 2003-06-18 20:29:18 +1000 | [diff] [blame] | 241 | snprintf(msg, sizeof msg, |
| 242 | "Bad passphrase, try again for %.200s: ", comment); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 243 | } |
| 244 | } |
Damien Miller | 2ce12ef | 2011-05-05 14:17:18 +1000 | [diff] [blame] | 245 | buffer_free(&keyblob); |
Ben Lindstrom | 2b266b7 | 2002-06-21 00:08:39 +0000 | [diff] [blame] | 246 | |
Damien Miller | a8e06ce | 2003-11-21 23:48:55 +1100 | [diff] [blame] | 247 | if (ssh_add_identity_constrained(ac, private, comment, lifetime, |
| 248 | confirm)) { |
Ben Lindstrom | d0fca42 | 2001-03-26 13:44:06 +0000 | [diff] [blame] | 249 | fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 250 | ret = 0; |
Ben Lindstrom | 2b266b7 | 2002-06-21 00:08:39 +0000 | [diff] [blame] | 251 | if (lifetime != 0) |
Ben Lindstrom | 93576d9 | 2002-12-23 02:06:19 +0000 | [diff] [blame] | 252 | fprintf(stderr, |
Ben Lindstrom | 2b266b7 | 2002-06-21 00:08:39 +0000 | [diff] [blame] | 253 | "Lifetime set to %d seconds\n", lifetime); |
Damien Miller | a8e06ce | 2003-11-21 23:48:55 +1100 | [diff] [blame] | 254 | if (confirm != 0) |
Damien Miller | 6c71179 | 2003-01-24 11:36:23 +1100 | [diff] [blame] | 255 | fprintf(stderr, |
Damien Miller | c6afb5f | 2010-05-21 14:56:47 +1000 | [diff] [blame] | 256 | "The user must confirm each use of the key\n"); |
Ben Lindstrom | 2b266b7 | 2002-06-21 00:08:39 +0000 | [diff] [blame] | 257 | } else { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 258 | fprintf(stderr, "Could not add identity: %s\n", filename); |
Ben Lindstrom | 61d328a | 2002-06-06 21:54:57 +0000 | [diff] [blame] | 259 | } |
| 260 | |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 261 | /* Skip trying to load the cert if requested */ |
| 262 | if (key_only) |
| 263 | goto out; |
Damien Miller | 0a80ca1 | 2010-02-27 07:55:05 +1100 | [diff] [blame] | 264 | |
| 265 | /* Now try to add the certificate flavour too */ |
| 266 | xasprintf(&certpath, "%s-cert.pub", filename); |
Damien Miller | c6afb5f | 2010-05-21 14:56:47 +1000 | [diff] [blame] | 267 | if ((cert = key_load_public(certpath, NULL)) == NULL) |
| 268 | goto out; |
| 269 | |
| 270 | if (!key_equal_public(cert, private)) { |
| 271 | error("Certificate %s does not match private key %s", |
| 272 | certpath, filename); |
Damien Miller | 0a80ca1 | 2010-02-27 07:55:05 +1100 | [diff] [blame] | 273 | key_free(cert); |
Damien Miller | c6afb5f | 2010-05-21 14:56:47 +1000 | [diff] [blame] | 274 | goto out; |
| 275 | } |
Damien Miller | 0a80ca1 | 2010-02-27 07:55:05 +1100 | [diff] [blame] | 276 | |
Damien Miller | c6afb5f | 2010-05-21 14:56:47 +1000 | [diff] [blame] | 277 | /* Graft with private bits */ |
| 278 | if (key_to_certified(private, key_cert_is_legacy(cert)) != 0) { |
| 279 | error("%s: key_to_certified failed", __func__); |
| 280 | key_free(cert); |
| 281 | goto out; |
Damien Miller | 0bd4186 | 2010-03-03 10:25:41 +1100 | [diff] [blame] | 282 | } |
Damien Miller | c6afb5f | 2010-05-21 14:56:47 +1000 | [diff] [blame] | 283 | key_cert_copy(cert, private); |
| 284 | key_free(cert); |
Damien Miller | 0a80ca1 | 2010-02-27 07:55:05 +1100 | [diff] [blame] | 285 | |
Damien Miller | c6afb5f | 2010-05-21 14:56:47 +1000 | [diff] [blame] | 286 | if (!ssh_add_identity_constrained(ac, private, comment, |
| 287 | lifetime, confirm)) { |
| 288 | error("Certificate %s (%s) add failed", certpath, |
| 289 | private->cert->key_id); |
| 290 | } |
| 291 | fprintf(stderr, "Certificate added: %s (%s)\n", certpath, |
| 292 | private->cert->key_id); |
| 293 | if (lifetime != 0) |
| 294 | fprintf(stderr, "Lifetime set to %d seconds\n", lifetime); |
| 295 | if (confirm != 0) |
| 296 | fprintf(stderr, "The user must confirm each use of the key\n"); |
| 297 | out: |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 298 | if (certpath != NULL) |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 299 | free(certpath); |
| 300 | free(comment); |
Damien Miller | eba71ba | 2000-04-29 23:57:08 +1000 | [diff] [blame] | 301 | key_free(private); |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 302 | |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 303 | return ret; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 304 | } |
| 305 | |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 306 | static int |
Ben Lindstrom | f7db3bb | 2001-08-06 21:35:51 +0000 | [diff] [blame] | 307 | update_card(AuthenticationConnection *ac, int add, const char *id) |
Ben Lindstrom | 036a6b2 | 2001-07-04 03:50:02 +0000 | [diff] [blame] | 308 | { |
Damien Miller | ef275ea | 2013-12-29 17:44:07 +1100 | [diff] [blame] | 309 | char *pin = NULL; |
Damien Miller | 0011138 | 2003-03-10 11:21:17 +1100 | [diff] [blame] | 310 | int ret = -1; |
Ben Lindstrom | ba72d30 | 2002-03-22 03:51:06 +0000 | [diff] [blame] | 311 | |
Damien Miller | ef275ea | 2013-12-29 17:44:07 +1100 | [diff] [blame] | 312 | if (add) { |
| 313 | if ((pin = read_passphrase("Enter passphrase for PKCS#11: ", |
| 314 | RP_ALLOW_STDIN)) == NULL) |
| 315 | return -1; |
| 316 | } |
Ben Lindstrom | ba72d30 | 2002-03-22 03:51:06 +0000 | [diff] [blame] | 317 | |
Damien Miller | ef275ea | 2013-12-29 17:44:07 +1100 | [diff] [blame] | 318 | if (ssh_update_card(ac, add, id, pin == NULL ? "" : pin, |
| 319 | lifetime, confirm)) { |
Ben Lindstrom | f7db3bb | 2001-08-06 21:35:51 +0000 | [diff] [blame] | 320 | fprintf(stderr, "Card %s: %s\n", |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 321 | add ? "added" : "removed", id); |
Damien Miller | 0011138 | 2003-03-10 11:21:17 +1100 | [diff] [blame] | 322 | ret = 0; |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 323 | } else { |
Ben Lindstrom | f7db3bb | 2001-08-06 21:35:51 +0000 | [diff] [blame] | 324 | fprintf(stderr, "Could not %s card: %s\n", |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 325 | add ? "add" : "remove", id); |
Damien Miller | 0011138 | 2003-03-10 11:21:17 +1100 | [diff] [blame] | 326 | ret = -1; |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 327 | } |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 328 | free(pin); |
Damien Miller | 0011138 | 2003-03-10 11:21:17 +1100 | [diff] [blame] | 329 | return ret; |
Ben Lindstrom | 036a6b2 | 2001-07-04 03:50:02 +0000 | [diff] [blame] | 330 | } |
| 331 | |
Damien Miller | 43cba34 | 2002-02-05 12:12:49 +1100 | [diff] [blame] | 332 | static int |
Ben Lindstrom | cfccef9 | 2001-03-13 04:57:58 +0000 | [diff] [blame] | 333 | list_identities(AuthenticationConnection *ac, int do_fp) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 334 | { |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 335 | Key *key; |
Ben Lindstrom | cfccef9 | 2001-03-13 04:57:58 +0000 | [diff] [blame] | 336 | char *comment, *fp; |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 337 | int had_identities = 0; |
| 338 | int version; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 339 | |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 340 | for (version = 1; version <= 2; version++) { |
| 341 | for (key = ssh_get_first_identity(ac, &comment, version); |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 342 | key != NULL; |
| 343 | key = ssh_get_next_identity(ac, &comment, version)) { |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 344 | had_identities = 1; |
Ben Lindstrom | cfccef9 | 2001-03-13 04:57:58 +0000 | [diff] [blame] | 345 | if (do_fp) { |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 346 | fp = key_fingerprint(key, fingerprint_hash, |
| 347 | SSH_FP_DEFAULT); |
Damien Miller | 0bc1bd8 | 2000-11-13 22:57:25 +1100 | [diff] [blame] | 348 | printf("%d %s %s (%s)\n", |
Ben Lindstrom | cfccef9 | 2001-03-13 04:57:58 +0000 | [diff] [blame] | 349 | key_size(key), fp, comment, key_type(key)); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 350 | free(fp); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 351 | } else { |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 352 | if (!key_write(key, stdout)) |
| 353 | fprintf(stderr, "key_write failed"); |
| 354 | fprintf(stdout, " %s\n", comment); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 355 | } |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 356 | key_free(key); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 357 | free(comment); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 358 | } |
Damien Miller | 10f6f6b | 1999-11-17 17:29:08 +1100 | [diff] [blame] | 359 | } |
Damien Miller | 43cba34 | 2002-02-05 12:12:49 +1100 | [diff] [blame] | 360 | if (!had_identities) { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 361 | printf("The agent has no identities.\n"); |
Damien Miller | 43cba34 | 2002-02-05 12:12:49 +1100 | [diff] [blame] | 362 | return -1; |
| 363 | } |
| 364 | return 0; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 365 | } |
| 366 | |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 367 | static int |
Ben Lindstrom | 2f71704 | 2002-06-06 21:52:03 +0000 | [diff] [blame] | 368 | lock_agent(AuthenticationConnection *ac, int lock) |
| 369 | { |
| 370 | char prompt[100], *p1, *p2; |
| 371 | int passok = 1, ret = -1; |
Ben Lindstrom | cb72e4f | 2002-06-21 00:41:51 +0000 | [diff] [blame] | 372 | |
Ben Lindstrom | 2f71704 | 2002-06-06 21:52:03 +0000 | [diff] [blame] | 373 | strlcpy(prompt, "Enter lock password: ", sizeof(prompt)); |
| 374 | p1 = read_passphrase(prompt, RP_ALLOW_STDIN); |
| 375 | if (lock) { |
| 376 | strlcpy(prompt, "Again: ", sizeof prompt); |
| 377 | p2 = read_passphrase(prompt, RP_ALLOW_STDIN); |
| 378 | if (strcmp(p1, p2) != 0) { |
| 379 | fprintf(stderr, "Passwords do not match.\n"); |
| 380 | passok = 0; |
| 381 | } |
Damien Miller | a5103f4 | 2014-02-04 11:20:14 +1100 | [diff] [blame] | 382 | explicit_bzero(p2, strlen(p2)); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 383 | free(p2); |
Ben Lindstrom | 2f71704 | 2002-06-06 21:52:03 +0000 | [diff] [blame] | 384 | } |
| 385 | if (passok && ssh_lock_agent(ac, lock, p1)) { |
| 386 | fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un"); |
| 387 | ret = 0; |
| 388 | } else |
| 389 | fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un"); |
Damien Miller | a5103f4 | 2014-02-04 11:20:14 +1100 | [diff] [blame] | 390 | explicit_bzero(p1, strlen(p1)); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 391 | free(p1); |
Ben Lindstrom | 3390749 | 2002-06-27 00:21:59 +0000 | [diff] [blame] | 392 | return (ret); |
Ben Lindstrom | 2f71704 | 2002-06-06 21:52:03 +0000 | [diff] [blame] | 393 | } |
| 394 | |
| 395 | static int |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 396 | do_file(AuthenticationConnection *ac, int deleting, int key_only, char *file) |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 397 | { |
| 398 | if (deleting) { |
Damien Miller | 33a8136 | 2012-12-03 09:50:24 +1100 | [diff] [blame] | 399 | if (delete_file(ac, file, key_only) == -1) |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 400 | return -1; |
| 401 | } else { |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 402 | if (add_file(ac, file, key_only) == -1) |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 403 | return -1; |
| 404 | } |
| 405 | return 0; |
| 406 | } |
| 407 | |
Ben Lindstrom | 036a6b2 | 2001-07-04 03:50:02 +0000 | [diff] [blame] | 408 | static void |
| 409 | usage(void) |
| 410 | { |
Damien Miller | 5cbe7ca | 2007-09-17 16:05:50 +1000 | [diff] [blame] | 411 | fprintf(stderr, "usage: %s [options] [file ...]\n", __progname); |
Ben Lindstrom | ddfb1e3 | 2001-08-06 22:06:35 +0000 | [diff] [blame] | 412 | fprintf(stderr, "Options:\n"); |
| 413 | fprintf(stderr, " -l List fingerprints of all identities.\n"); |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 414 | fprintf(stderr, " -E hash Specify hash algorithm used for fingerprints.\n"); |
Ben Lindstrom | ddfb1e3 | 2001-08-06 22:06:35 +0000 | [diff] [blame] | 415 | fprintf(stderr, " -L List public key parameters of all identities.\n"); |
Darren Tucker | e68cf84 | 2011-11-04 10:51:51 +1100 | [diff] [blame] | 416 | fprintf(stderr, " -k Load only keys and not certificates.\n"); |
| 417 | fprintf(stderr, " -c Require confirmation to sign using identities\n"); |
| 418 | fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n"); |
Ben Lindstrom | ddfb1e3 | 2001-08-06 22:06:35 +0000 | [diff] [blame] | 419 | fprintf(stderr, " -d Delete identity.\n"); |
| 420 | fprintf(stderr, " -D Delete all identities.\n"); |
Ben Lindstrom | 163f3b8 | 2002-06-06 21:53:11 +0000 | [diff] [blame] | 421 | fprintf(stderr, " -x Lock agent.\n"); |
Damien Miller | 2138d15 | 2002-09-22 01:26:00 +1000 | [diff] [blame] | 422 | fprintf(stderr, " -X Unlock agent.\n"); |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 423 | fprintf(stderr, " -s pkcs11 Add keys from PKCS#11 provider.\n"); |
| 424 | fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n"); |
Ben Lindstrom | 036a6b2 | 2001-07-04 03:50:02 +0000 | [diff] [blame] | 425 | } |
| 426 | |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 427 | int |
Damien Miller | 01ab4a2 | 1999-10-28 15:23:30 +1000 | [diff] [blame] | 428 | main(int argc, char **argv) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 429 | { |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 430 | extern char *optarg; |
| 431 | extern int optind; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 432 | AuthenticationConnection *ac = NULL; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 433 | char *pkcs11provider = NULL; |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 434 | int i, ch, deleting = 0, ret = 0, key_only = 0; |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 435 | int xflag = 0, lflag = 0, Dflag = 0; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 436 | |
Darren Tucker | ce321d8 | 2005-10-03 18:11:24 +1000 | [diff] [blame] | 437 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ |
| 438 | sanitise_stdfd(); |
| 439 | |
Damien Miller | 59d3d5b | 2003-08-22 09:34:41 +1000 | [diff] [blame] | 440 | __progname = ssh_get_progname(argv[0]); |
Ben Lindstrom | 93d1fe8 | 2001-05-06 02:57:20 +0000 | [diff] [blame] | 441 | seed_rng(); |
Damien Miller | f9b625c | 2000-07-09 22:42:32 +1000 | [diff] [blame] | 442 | |
Damien Miller | 4314c2b | 2010-09-10 11:12:09 +1000 | [diff] [blame] | 443 | OpenSSL_add_all_algorithms(); |
Damien Miller | ad833b3 | 2000-08-23 10:46:23 +1000 | [diff] [blame] | 444 | |
millert@openbsd.org | db995f2 | 2014-11-26 18:34:51 +0000 | [diff] [blame] | 445 | setvbuf(stdout, NULL, _IOLBF, 0); |
Damien Miller | d7ca2cd | 2014-07-03 21:23:01 +1000 | [diff] [blame] | 446 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 447 | /* At first, get a connection to the authentication agent. */ |
| 448 | ac = ssh_get_authentication_connection(); |
| 449 | if (ac == NULL) { |
Darren Tucker | b736d8d | 2005-11-22 19:37:08 +1100 | [diff] [blame] | 450 | fprintf(stderr, |
| 451 | "Could not open a connection to your authentication agent.\n"); |
Damien Miller | 43cba34 | 2002-02-05 12:12:49 +1100 | [diff] [blame] | 452 | exit(2); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 453 | } |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 454 | while ((ch = getopt(argc, argv, "klLcdDxXE:e:s:t:")) != -1) { |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 455 | switch (ch) { |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 456 | case 'E': |
| 457 | fingerprint_hash = ssh_digest_alg_by_name(optarg); |
| 458 | if (fingerprint_hash == -1) |
| 459 | fatal("Invalid hash algorithm \"%s\"", optarg); |
| 460 | break; |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 461 | case 'k': |
| 462 | key_only = 1; |
| 463 | break; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 464 | case 'l': |
| 465 | case 'L': |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 466 | if (lflag != 0) |
| 467 | fatal("-%c flag already specified", lflag); |
| 468 | lflag = ch; |
| 469 | break; |
Ben Lindstrom | 2f71704 | 2002-06-06 21:52:03 +0000 | [diff] [blame] | 470 | case 'x': |
| 471 | case 'X': |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 472 | if (xflag != 0) |
| 473 | fatal("-%c flag already specified", xflag); |
| 474 | xflag = ch; |
| 475 | break; |
Damien Miller | 6c71179 | 2003-01-24 11:36:23 +1100 | [diff] [blame] | 476 | case 'c': |
| 477 | confirm = 1; |
| 478 | break; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 479 | case 'd': |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 480 | deleting = 1; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 481 | break; |
| 482 | case 'D': |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 483 | Dflag = 1; |
| 484 | break; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 485 | case 's': |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 486 | pkcs11provider = optarg; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 487 | break; |
| 488 | case 'e': |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 489 | deleting = 1; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 490 | pkcs11provider = optarg; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 491 | break; |
Ben Lindstrom | 61d328a | 2002-06-06 21:54:57 +0000 | [diff] [blame] | 492 | case 't': |
Ben Lindstrom | 1775c9c | 2002-06-11 15:51:54 +0000 | [diff] [blame] | 493 | if ((lifetime = convtime(optarg)) == -1) { |
| 494 | fprintf(stderr, "Invalid lifetime\n"); |
| 495 | ret = 1; |
| 496 | goto done; |
| 497 | } |
Ben Lindstrom | 61d328a | 2002-06-06 21:54:57 +0000 | [diff] [blame] | 498 | break; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 499 | default: |
| 500 | usage(); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 501 | ret = 1; |
| 502 | goto done; |
Ben Lindstrom | 036a6b2 | 2001-07-04 03:50:02 +0000 | [diff] [blame] | 503 | } |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 504 | } |
djm@openbsd.org | 56d1c83 | 2014-12-21 22:27:55 +0000 | [diff] [blame] | 505 | |
| 506 | if ((xflag != 0) + (lflag != 0) + (Dflag != 0) > 1) |
| 507 | fatal("Invalid combination of actions"); |
| 508 | else if (xflag) { |
| 509 | if (lock_agent(ac, xflag == 'x' ? 1 : 0) == -1) |
| 510 | ret = 1; |
| 511 | goto done; |
| 512 | } else if (lflag) { |
| 513 | if (list_identities(ac, lflag == 'l' ? 1 : 0) == -1) |
| 514 | ret = 1; |
| 515 | goto done; |
| 516 | } else if (Dflag) { |
| 517 | if (delete_all(ac) == -1) |
| 518 | ret = 1; |
| 519 | goto done; |
| 520 | } |
| 521 | |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 522 | argc -= optind; |
| 523 | argv += optind; |
Damien Miller | 7ea845e | 2010-02-12 09:21:02 +1100 | [diff] [blame] | 524 | if (pkcs11provider != NULL) { |
| 525 | if (update_card(ac, !deleting, pkcs11provider) == -1) |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 526 | ret = 1; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 527 | goto done; |
Ben Lindstrom | 036a6b2 | 2001-07-04 03:50:02 +0000 | [diff] [blame] | 528 | } |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 529 | if (argc == 0) { |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 530 | char buf[MAXPATHLEN]; |
| 531 | struct passwd *pw; |
Ben Lindstrom | 58b391b | 2002-03-22 03:21:16 +0000 | [diff] [blame] | 532 | struct stat st; |
| 533 | int count = 0; |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 534 | |
| 535 | if ((pw = getpwuid(getuid())) == NULL) { |
Damien Miller | caf6dd6 | 2000-08-29 11:33:50 +1100 | [diff] [blame] | 536 | fprintf(stderr, "No user found with uid %u\n", |
| 537 | (u_int)getuid()); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 538 | ret = 1; |
| 539 | goto done; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 540 | } |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 541 | |
Darren Tucker | 47eede7 | 2005-03-14 23:08:12 +1100 | [diff] [blame] | 542 | for (i = 0; default_files[i]; i++) { |
Ben Lindstrom | 6328ab3 | 2002-03-22 02:54:23 +0000 | [diff] [blame] | 543 | snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 544 | default_files[i]); |
Ben Lindstrom | 58b391b | 2002-03-22 03:21:16 +0000 | [diff] [blame] | 545 | if (stat(buf, &st) < 0) |
| 546 | continue; |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 547 | if (do_file(ac, deleting, key_only, buf) == -1) |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 548 | ret = 1; |
Ben Lindstrom | 58b391b | 2002-03-22 03:21:16 +0000 | [diff] [blame] | 549 | else |
| 550 | count++; |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 551 | } |
Ben Lindstrom | 58b391b | 2002-03-22 03:21:16 +0000 | [diff] [blame] | 552 | if (count == 0) |
| 553 | ret = 1; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 554 | } else { |
Darren Tucker | 47eede7 | 2005-03-14 23:08:12 +1100 | [diff] [blame] | 555 | for (i = 0; i < argc; i++) { |
Damien Miller | 8f4279e | 2011-10-18 16:06:33 +1100 | [diff] [blame] | 556 | if (do_file(ac, deleting, key_only, argv[i]) == -1) |
Damien Miller | 6e1057c | 2002-01-22 23:05:59 +1100 | [diff] [blame] | 557 | ret = 1; |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 558 | } |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 559 | } |
Ben Lindstrom | ee61794 | 2001-04-10 02:45:32 +0000 | [diff] [blame] | 560 | clear_pass(); |
Ben Lindstrom | 44e49af | 2001-07-04 05:03:51 +0000 | [diff] [blame] | 561 | |
| 562 | done: |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 563 | ssh_close_authentication_connection(ac); |
Ben Lindstrom | 569f88d | 2001-10-03 17:43:01 +0000 | [diff] [blame] | 564 | return ret; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 565 | } |