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