]>
Commit | Line | Data |
---|---|---|
8efc0c15 | 1 | /* |
5260325f | 2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | |
4 | * All rights reserved | |
5260325f | 5 | * Adds an identity to the authentication server, or removes an identity. |
2e73a022 | 6 | * |
bcbf86ec | 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 | * | |
2e73a022 | 13 | * SSH2 implementation, |
a96070d4 | 14 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
bcbf86ec | 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. | |
5260325f | 35 | */ |
8efc0c15 | 36 | |
37 | #include "includes.h" | |
3db7f994 | 38 | RCSID("$OpenBSD: ssh-add.c,v 1.54 2002/06/05 19:57:12 markus Exp $"); |
8efc0c15 | 39 | |
2e73a022 | 40 | #include <openssl/evp.h> |
a306f2dd | 41 | |
8efc0c15 | 42 | #include "ssh.h" |
42f11eb2 | 43 | #include "rsa.h" |
44 | #include "log.h" | |
8efc0c15 | 45 | #include "xmalloc.h" |
a306f2dd | 46 | #include "key.h" |
4c8722d9 | 47 | #include "authfd.h" |
a306f2dd | 48 | #include "authfile.h" |
42f11eb2 | 49 | #include "pathnames.h" |
50 | #include "readpass.h" | |
8efc0c15 | 51 | |
f601d847 | 52 | #ifdef HAVE___PROGNAME |
53 | extern char *__progname; | |
260d427b | 54 | #else |
55 | char *__progname; | |
56 | #endif | |
f601d847 | 57 | |
33e766d2 | 58 | /* argv0 */ |
59 | extern char *__progname; | |
60 | ||
67656ffc | 61 | /* Default files to add */ |
62 | static char *default_files[] = { | |
63 | _PATH_SSH_CLIENT_ID_RSA, | |
64 | _PATH_SSH_CLIENT_ID_DSA, | |
762715ce | 65 | _PATH_SSH_CLIENT_IDENTITY, |
67656ffc | 66 | NULL |
67 | }; | |
68 | ||
69 | ||
a8666d84 | 70 | /* we keep a cache of one passphrases */ |
71 | static char *pass = NULL; | |
396c147e | 72 | static void |
a8666d84 | 73 | clear_pass(void) |
74 | { | |
75 | if (pass) { | |
76 | memset(pass, 0, strlen(pass)); | |
77 | xfree(pass); | |
78 | pass = NULL; | |
79 | } | |
80 | } | |
81 | ||
e0543e42 | 82 | static int |
5068f573 | 83 | delete_file(AuthenticationConnection *ac, const char *filename) |
8efc0c15 | 84 | { |
a306f2dd | 85 | Key *public; |
d64050ef | 86 | char *comment = NULL; |
e0543e42 | 87 | int ret = -1; |
5260325f | 88 | |
aeaa3d9e | 89 | public = key_load_public(filename, &comment); |
90 | if (public == NULL) { | |
91 | printf("Bad key file %s\n", filename); | |
e0543e42 | 92 | return -1; |
5260325f | 93 | } |
e0543e42 | 94 | if (ssh_remove_identity(ac, public)) { |
5260325f | 95 | fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment); |
e0543e42 | 96 | ret = 0; |
97 | } else | |
5260325f | 98 | fprintf(stderr, "Could not remove identity: %s\n", filename); |
e0543e42 | 99 | |
a306f2dd | 100 | key_free(public); |
5260325f | 101 | xfree(comment); |
184eed6a | 102 | |
e0543e42 | 103 | return ret; |
8efc0c15 | 104 | } |
105 | ||
2e73a022 | 106 | /* Send a request to remove all identities. */ |
e0543e42 | 107 | static int |
5068f573 | 108 | delete_all(AuthenticationConnection *ac) |
8efc0c15 | 109 | { |
e0543e42 | 110 | int ret = -1; |
2e73a022 | 111 | |
e0543e42 | 112 | if (ssh_remove_all_identities(ac, 1)) |
113 | ret = 0; | |
2e73a022 | 114 | /* ignore error-code for ssh2 */ |
115 | ssh_remove_all_identities(ac, 2); | |
116 | ||
e0543e42 | 117 | if (ret == 0) |
5260325f | 118 | fprintf(stderr, "All identities removed.\n"); |
119 | else | |
b5c334cc | 120 | fprintf(stderr, "Failed to remove all identities.\n"); |
e0543e42 | 121 | |
122 | return ret; | |
8efc0c15 | 123 | } |
124 | ||
e0543e42 | 125 | static int |
5068f573 | 126 | add_file(AuthenticationConnection *ac, const char *filename) |
8efc0c15 | 127 | { |
2e73a022 | 128 | struct stat st; |
a306f2dd | 129 | Key *private; |
561e5254 | 130 | char *comment = NULL; |
131 | char msg[1024]; | |
e0543e42 | 132 | int ret = -1; |
5260325f | 133 | |
2e73a022 | 134 | if (stat(filename, &st) < 0) { |
135 | perror(filename); | |
e0543e42 | 136 | return -1; |
2e73a022 | 137 | } |
5260325f | 138 | /* At first, try empty passphrase */ |
aeaa3d9e | 139 | private = key_load_private(filename, "", &comment); |
140 | if (comment == NULL) | |
141 | comment = xstrdup(filename); | |
a8666d84 | 142 | /* try last */ |
143 | if (private == NULL && pass != NULL) | |
144 | private = key_load_private(filename, pass, NULL); | |
aeaa3d9e | 145 | if (private == NULL) { |
a8666d84 | 146 | /* clear passphrase since it did not work */ |
147 | clear_pass(); | |
065604bb | 148 | snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ", |
561e5254 | 149 | comment); |
aa3378df | 150 | for (;;) { |
1843a425 | 151 | pass = read_passphrase(msg, RP_ALLOW_STDIN); |
5260325f | 152 | if (strcmp(pass, "") == 0) { |
eae942e2 | 153 | clear_pass(); |
aeaa3d9e | 154 | xfree(comment); |
e0543e42 | 155 | return -1; |
5260325f | 156 | } |
aeaa3d9e | 157 | private = key_load_private(filename, pass, &comment); |
aeaa3d9e | 158 | if (private != NULL) |
5260325f | 159 | break; |
a8666d84 | 160 | clear_pass(); |
065604bb | 161 | strlcpy(msg, "Bad passphrase, try again: ", sizeof msg); |
5260325f | 162 | } |
163 | } | |
e0543e42 | 164 | if (ssh_add_identity(ac, private, comment)) { |
aeaa3d9e | 165 | fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); |
e0543e42 | 166 | ret = 0; |
167 | } else | |
5260325f | 168 | fprintf(stderr, "Could not add identity: %s\n", filename); |
e0543e42 | 169 | |
aeaa3d9e | 170 | xfree(comment); |
a306f2dd | 171 | key_free(private); |
184eed6a | 172 | |
e0543e42 | 173 | return ret; |
8efc0c15 | 174 | } |
175 | ||
e0543e42 | 176 | static int |
9ff6f66f | 177 | update_card(AuthenticationConnection *ac, int add, const char *id) |
983def13 | 178 | { |
76139bd8 | 179 | char *pin; |
180 | ||
181 | pin = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN); | |
182 | if (pin == NULL) | |
183 | return -1; | |
184 | ||
185 | if (ssh_update_card(ac, add, id, pin)) { | |
9ff6f66f | 186 | fprintf(stderr, "Card %s: %s\n", |
184eed6a | 187 | add ? "added" : "removed", id); |
e0543e42 | 188 | return 0; |
189 | } else { | |
9ff6f66f | 190 | fprintf(stderr, "Could not %s card: %s\n", |
184eed6a | 191 | add ? "add" : "remove", id); |
e0543e42 | 192 | return -1; |
193 | } | |
983def13 | 194 | } |
195 | ||
a2863956 | 196 | static int |
22138a36 | 197 | list_identities(AuthenticationConnection *ac, int do_fp) |
8efc0c15 | 198 | { |
2e73a022 | 199 | Key *key; |
22138a36 | 200 | char *comment, *fp; |
2e73a022 | 201 | int had_identities = 0; |
202 | int version; | |
203 | ||
204 | for (version = 1; version <= 2; version++) { | |
205 | for (key = ssh_get_first_identity(ac, &comment, version); | |
184eed6a | 206 | key != NULL; |
207 | key = ssh_get_next_identity(ac, &comment, version)) { | |
2e73a022 | 208 | had_identities = 1; |
22138a36 | 209 | if (do_fp) { |
210 | fp = key_fingerprint(key, SSH_FP_MD5, | |
211 | SSH_FP_HEX); | |
fa08c86b | 212 | printf("%d %s %s (%s)\n", |
22138a36 | 213 | key_size(key), fp, comment, key_type(key)); |
214 | xfree(fp); | |
5260325f | 215 | } else { |
2e73a022 | 216 | if (!key_write(key, stdout)) |
217 | fprintf(stderr, "key_write failed"); | |
218 | fprintf(stdout, " %s\n", comment); | |
5260325f | 219 | } |
2e73a022 | 220 | key_free(key); |
221 | xfree(comment); | |
5260325f | 222 | } |
f095fcc7 | 223 | } |
a2863956 | 224 | if (!had_identities) { |
5260325f | 225 | printf("The agent has no identities.\n"); |
a2863956 | 226 | return -1; |
227 | } | |
228 | return 0; | |
8efc0c15 | 229 | } |
230 | ||
3db7f994 | 231 | static int |
232 | lock_agent(AuthenticationConnection *ac, int lock) | |
233 | { | |
234 | char prompt[100], *p1, *p2; | |
235 | int passok = 1, ret = -1; | |
236 | ||
237 | strlcpy(prompt, "Enter lock password: ", sizeof(prompt)); | |
238 | p1 = read_passphrase(prompt, RP_ALLOW_STDIN); | |
239 | if (lock) { | |
240 | strlcpy(prompt, "Again: ", sizeof prompt); | |
241 | p2 = read_passphrase(prompt, RP_ALLOW_STDIN); | |
242 | if (strcmp(p1, p2) != 0) { | |
243 | fprintf(stderr, "Passwords do not match.\n"); | |
244 | passok = 0; | |
245 | } | |
246 | memset(p2, 0, strlen(p2)); | |
247 | xfree(p2); | |
248 | } | |
249 | if (passok && ssh_lock_agent(ac, lock, p1)) { | |
250 | fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un"); | |
251 | ret = 0; | |
252 | } else | |
253 | fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un"); | |
254 | memset(p1, 0, strlen(p1)); | |
255 | xfree(p1); | |
256 | return -1; | |
257 | } | |
258 | ||
67656ffc | 259 | static int |
260 | do_file(AuthenticationConnection *ac, int deleting, char *file) | |
261 | { | |
262 | if (deleting) { | |
263 | if (delete_file(ac, file) == -1) | |
264 | return -1; | |
265 | } else { | |
266 | if (add_file(ac, file) == -1) | |
267 | return -1; | |
268 | } | |
269 | return 0; | |
270 | } | |
271 | ||
983def13 | 272 | static void |
273 | usage(void) | |
274 | { | |
33e766d2 | 275 | fprintf(stderr, "Usage: %s [options]\n", __progname); |
276 | fprintf(stderr, "Options:\n"); | |
277 | fprintf(stderr, " -l List fingerprints of all identities.\n"); | |
278 | fprintf(stderr, " -L List public key parameters of all identities.\n"); | |
279 | fprintf(stderr, " -d Delete identity.\n"); | |
280 | fprintf(stderr, " -D Delete all identities.\n"); | |
281 | #ifdef SMARTCARD | |
282 | fprintf(stderr, " -s reader Add key in smartcard reader.\n"); | |
283 | fprintf(stderr, " -e reader Remove key in smartcard reader.\n"); | |
284 | #endif | |
983def13 | 285 | } |
286 | ||
8efc0c15 | 287 | int |
5068f573 | 288 | main(int argc, char **argv) |
8efc0c15 | 289 | { |
34e02b83 | 290 | extern char *optarg; |
291 | extern int optind; | |
5260325f | 292 | AuthenticationConnection *ac = NULL; |
9ff6f66f | 293 | char *sc_reader_id = NULL; |
e0543e42 | 294 | int i, ch, deleting = 0, ret = 0; |
5260325f | 295 | |
260d427b | 296 | __progname = get_progname(argv[0]); |
264dce47 | 297 | init_rng(); |
044b0662 | 298 | seed_rng(); |
264dce47 | 299 | |
2b87da3b | 300 | SSLeay_add_all_algorithms(); |
2e73a022 | 301 | |
5260325f | 302 | /* At first, get a connection to the authentication agent. */ |
303 | ac = ssh_get_authentication_connection(); | |
304 | if (ac == NULL) { | |
305 | fprintf(stderr, "Could not open a connection to your authentication agent.\n"); | |
a2863956 | 306 | exit(2); |
8efc0c15 | 307 | } |
3db7f994 | 308 | while ((ch = getopt(argc, argv, "lLdDxXe:s:")) != -1) { |
34e02b83 | 309 | switch (ch) { |
310 | case 'l': | |
311 | case 'L': | |
a2863956 | 312 | if (list_identities(ac, ch == 'l' ? 1 : 0) == -1) |
313 | ret = 1; | |
34e02b83 | 314 | goto done; |
315 | break; | |
3db7f994 | 316 | case 'x': |
317 | case 'X': | |
318 | if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1) | |
319 | ret = 1; | |
320 | goto done; | |
321 | break; | |
34e02b83 | 322 | case 'd': |
5260325f | 323 | deleting = 1; |
34e02b83 | 324 | break; |
325 | case 'D': | |
e0543e42 | 326 | if (delete_all(ac) == -1) |
327 | ret = 1; | |
34e02b83 | 328 | goto done; |
329 | break; | |
330 | case 's': | |
9ff6f66f | 331 | sc_reader_id = optarg; |
34e02b83 | 332 | break; |
333 | case 'e': | |
184eed6a | 334 | deleting = 1; |
9ff6f66f | 335 | sc_reader_id = optarg; |
34e02b83 | 336 | break; |
337 | default: | |
338 | usage(); | |
e0543e42 | 339 | ret = 1; |
340 | goto done; | |
983def13 | 341 | } |
8efc0c15 | 342 | } |
34e02b83 | 343 | argc -= optind; |
344 | argv += optind; | |
9ff6f66f | 345 | if (sc_reader_id != NULL) { |
e0543e42 | 346 | if (update_card(ac, !deleting, sc_reader_id) == -1) |
347 | ret = 1; | |
34e02b83 | 348 | goto done; |
983def13 | 349 | } |
34e02b83 | 350 | if (argc == 0) { |
67656ffc | 351 | char buf[MAXPATHLEN]; |
352 | struct passwd *pw; | |
256debd0 | 353 | struct stat st; |
354 | int count = 0; | |
67656ffc | 355 | |
356 | if ((pw = getpwuid(getuid())) == NULL) { | |
14a9a859 | 357 | fprintf(stderr, "No user found with uid %u\n", |
358 | (u_int)getuid()); | |
e0543e42 | 359 | ret = 1; |
360 | goto done; | |
5260325f | 361 | } |
67656ffc | 362 | |
363 | for(i = 0; default_files[i]; i++) { | |
762715ce | 364 | snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, |
67656ffc | 365 | default_files[i]); |
256debd0 | 366 | if (stat(buf, &st) < 0) |
367 | continue; | |
67656ffc | 368 | if (do_file(ac, deleting, buf) == -1) |
e0543e42 | 369 | ret = 1; |
256debd0 | 370 | else |
371 | count++; | |
e0543e42 | 372 | } |
256debd0 | 373 | if (count == 0) |
374 | ret = 1; | |
34e02b83 | 375 | } else { |
67656ffc | 376 | for(i = 0; i < argc; i++) { |
0e0bba68 | 377 | if (do_file(ac, deleting, argv[i]) == -1) |
67656ffc | 378 | ret = 1; |
34e02b83 | 379 | } |
8efc0c15 | 380 | } |
a8666d84 | 381 | clear_pass(); |
34e02b83 | 382 | |
383 | done: | |
5260325f | 384 | ssh_close_authentication_connection(ac); |
e0543e42 | 385 | return ret; |
8efc0c15 | 386 | } |