1999-10-27 03:42:43 +00:00
|
|
|
/*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
* All rights reserved
|
|
|
|
* Adds an identity to the authentication server, or removes an identity.
|
2000-08-23 00:46:23 +00:00
|
|
|
*
|
2000-09-16 02:29:08 +00:00
|
|
|
* As far as I am concerned, the code I have written for this software
|
|
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
|
|
* software must be clearly marked as such, and if the derived work is
|
|
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
|
|
*
|
2000-08-23 00:46:23 +00:00
|
|
|
* SSH2 implementation,
|
2001-07-04 03:32:30 +00:00
|
|
|
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
|
2000-09-16 02:29:08 +00:00
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
1999-11-24 13:26:21 +00:00
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "includes.h"
|
2001-08-06 22:06:35 +00:00
|
|
|
RCSID("$OpenBSD: ssh-add.c,v 1.45 2001/08/03 10:31:30 jakob Exp $");
|
2000-04-29 13:57:08 +00:00
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
#include <openssl/evp.h>
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "ssh.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "rsa.h"
|
|
|
|
#include "log.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
#include "xmalloc.h"
|
2000-04-29 13:57:08 +00:00
|
|
|
#include "key.h"
|
2000-07-21 00:19:44 +00:00
|
|
|
#include "authfd.h"
|
2000-04-29 13:57:08 +00:00
|
|
|
#include "authfile.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "pathnames.h"
|
|
|
|
#include "readpass.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-15 06:10:57 +00:00
|
|
|
#ifdef HAVE___PROGNAME
|
|
|
|
extern char *__progname;
|
2000-11-17 03:47:20 +00:00
|
|
|
#else
|
|
|
|
char *__progname;
|
|
|
|
#endif
|
1999-11-15 06:10:57 +00:00
|
|
|
|
2001-08-06 22:06:35 +00:00
|
|
|
/* argv0 */
|
|
|
|
extern char *__progname;
|
|
|
|
|
2001-04-10 02:45:32 +00:00
|
|
|
/* we keep a cache of one passphrases */
|
|
|
|
static char *pass = NULL;
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2001-04-10 02:45:32 +00:00
|
|
|
clear_pass(void)
|
|
|
|
{
|
|
|
|
if (pass) {
|
|
|
|
memset(pass, 0, strlen(pass));
|
|
|
|
xfree(pass);
|
|
|
|
pass = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-10-28 05:23:30 +00:00
|
|
|
delete_file(AuthenticationConnection *ac, const char *filename)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-04-29 13:57:08 +00:00
|
|
|
Key *public;
|
2001-04-08 18:04:36 +00:00
|
|
|
char *comment = NULL;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2001-03-26 13:44:06 +00:00
|
|
|
public = key_load_public(filename, &comment);
|
|
|
|
if (public == NULL) {
|
|
|
|
printf("Bad key file %s\n", filename);
|
|
|
|
return;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2000-08-23 00:46:23 +00:00
|
|
|
if (ssh_remove_identity(ac, public))
|
1999-11-24 13:26:21 +00:00
|
|
|
fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
|
|
|
|
else
|
|
|
|
fprintf(stderr, "Could not remove identity: %s\n", filename);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(public);
|
1999-11-24 13:26:21 +00:00
|
|
|
xfree(comment);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
/* Send a request to remove all identities. */
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-10-28 05:23:30 +00:00
|
|
|
delete_all(AuthenticationConnection *ac)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-08-23 00:46:23 +00:00
|
|
|
int success = 1;
|
|
|
|
|
|
|
|
if (!ssh_remove_all_identities(ac, 1))
|
|
|
|
success = 0;
|
|
|
|
/* ignore error-code for ssh2 */
|
|
|
|
ssh_remove_all_identities(ac, 2);
|
|
|
|
|
|
|
|
if (success)
|
1999-11-24 13:26:21 +00:00
|
|
|
fprintf(stderr, "All identities removed.\n");
|
|
|
|
else
|
2001-01-18 02:04:35 +00:00
|
|
|
fprintf(stderr, "Failed to remove all identities.\n");
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-10-28 05:23:30 +00:00
|
|
|
add_file(AuthenticationConnection *ac, const char *filename)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-08-23 00:46:23 +00:00
|
|
|
struct stat st;
|
2000-04-29 13:57:08 +00:00
|
|
|
Key *private;
|
2001-04-19 20:33:07 +00:00
|
|
|
char *comment = NULL;
|
|
|
|
char msg[1024];
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2000-08-23 00:46:23 +00:00
|
|
|
if (stat(filename, &st) < 0) {
|
|
|
|
perror(filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
/* At first, try empty passphrase */
|
2001-03-26 13:44:06 +00:00
|
|
|
private = key_load_private(filename, "", &comment);
|
|
|
|
if (comment == NULL)
|
|
|
|
comment = xstrdup(filename);
|
2001-04-10 02:45:32 +00:00
|
|
|
/* try last */
|
|
|
|
if (private == NULL && pass != NULL)
|
|
|
|
private = key_load_private(filename, pass, NULL);
|
2001-03-26 13:44:06 +00:00
|
|
|
if (private == NULL) {
|
2001-04-10 02:45:32 +00:00
|
|
|
/* clear passphrase since it did not work */
|
|
|
|
clear_pass();
|
2001-05-02 22:40:12 +00:00
|
|
|
snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
|
2001-04-19 20:33:07 +00:00
|
|
|
comment);
|
1999-11-25 00:54:57 +00:00
|
|
|
for (;;) {
|
2001-06-25 05:20:31 +00:00
|
|
|
pass = read_passphrase(msg, RP_ALLOW_STDIN);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (strcmp(pass, "") == 0) {
|
2001-04-14 23:10:09 +00:00
|
|
|
clear_pass();
|
2001-03-26 13:44:06 +00:00
|
|
|
xfree(comment);
|
1999-11-24 13:26:21 +00:00
|
|
|
return;
|
|
|
|
}
|
2001-03-26 13:44:06 +00:00
|
|
|
private = key_load_private(filename, pass, &comment);
|
|
|
|
if (private != NULL)
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
2001-04-10 02:45:32 +00:00
|
|
|
clear_pass();
|
2001-05-02 22:40:12 +00:00
|
|
|
strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
}
|
2001-03-26 13:44:06 +00:00
|
|
|
if (ssh_add_identity(ac, private, comment))
|
|
|
|
fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
|
1999-11-24 13:26:21 +00:00
|
|
|
else
|
|
|
|
fprintf(stderr, "Could not add identity: %s\n", filename);
|
2001-03-26 13:44:06 +00:00
|
|
|
xfree(comment);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-07-04 03:50:02 +00:00
|
|
|
static void
|
2001-08-06 21:35:51 +00:00
|
|
|
update_card(AuthenticationConnection *ac, int add, const char *id)
|
2001-07-04 03:50:02 +00:00
|
|
|
{
|
|
|
|
if (ssh_update_card(ac, add, id))
|
2001-08-06 21:35:51 +00:00
|
|
|
fprintf(stderr, "Card %s: %s\n",
|
2001-07-04 03:50:02 +00:00
|
|
|
add ? "added" : "removed", id);
|
|
|
|
else
|
2001-08-06 21:35:51 +00:00
|
|
|
fprintf(stderr, "Could not %s card: %s\n",
|
2001-07-04 03:50:02 +00:00
|
|
|
add ? "add" : "remove", id);
|
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2001-03-13 04:57:58 +00:00
|
|
|
list_identities(AuthenticationConnection *ac, int do_fp)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-08-23 00:46:23 +00:00
|
|
|
Key *key;
|
2001-03-13 04:57:58 +00:00
|
|
|
char *comment, *fp;
|
2000-08-23 00:46:23 +00:00
|
|
|
int had_identities = 0;
|
|
|
|
int version;
|
|
|
|
|
|
|
|
for (version = 1; version <= 2; version++) {
|
|
|
|
for (key = ssh_get_first_identity(ac, &comment, version);
|
|
|
|
key != NULL;
|
|
|
|
key = ssh_get_next_identity(ac, &comment, version)) {
|
|
|
|
had_identities = 1;
|
2001-03-13 04:57:58 +00:00
|
|
|
if (do_fp) {
|
|
|
|
fp = key_fingerprint(key, SSH_FP_MD5,
|
|
|
|
SSH_FP_HEX);
|
2000-11-13 11:57:25 +00:00
|
|
|
printf("%d %s %s (%s)\n",
|
2001-03-13 04:57:58 +00:00
|
|
|
key_size(key), fp, comment, key_type(key));
|
|
|
|
xfree(fp);
|
1999-11-24 13:26:21 +00:00
|
|
|
} else {
|
2000-08-23 00:46:23 +00:00
|
|
|
if (!key_write(key, stdout))
|
|
|
|
fprintf(stderr, "key_write failed");
|
|
|
|
fprintf(stdout, " %s\n", comment);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2000-08-23 00:46:23 +00:00
|
|
|
key_free(key);
|
|
|
|
xfree(comment);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
1999-11-17 06:29:08 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
if (!had_identities)
|
|
|
|
printf("The agent has no identities.\n");
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-07-04 03:50:02 +00:00
|
|
|
static void
|
|
|
|
usage(void)
|
|
|
|
{
|
2001-08-06 22:06:35 +00:00
|
|
|
fprintf(stderr, "Usage: %s [options]\n", __progname);
|
|
|
|
fprintf(stderr, "Options:\n");
|
|
|
|
fprintf(stderr, " -l List fingerprints of all identities.\n");
|
|
|
|
fprintf(stderr, " -L List public key parameters of all identities.\n");
|
|
|
|
fprintf(stderr, " -d Delete identity.\n");
|
|
|
|
fprintf(stderr, " -D Delete all identities.\n");
|
|
|
|
#ifdef SMARTCARD
|
|
|
|
fprintf(stderr, " -s reader Add key in smartcard reader.\n");
|
|
|
|
fprintf(stderr, " -e reader Remove key in smartcard reader.\n");
|
|
|
|
#endif
|
2001-07-04 03:50:02 +00:00
|
|
|
}
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
int
|
1999-10-28 05:23:30 +00:00
|
|
|
main(int argc, char **argv)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2001-07-04 05:03:51 +00:00
|
|
|
extern char *optarg;
|
|
|
|
extern int optind;
|
1999-11-24 13:26:21 +00:00
|
|
|
AuthenticationConnection *ac = NULL;
|
|
|
|
struct passwd *pw;
|
|
|
|
char buf[1024];
|
2001-08-06 21:35:51 +00:00
|
|
|
char *sc_reader_id = NULL;
|
|
|
|
int i, ch, deleting = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2000-11-17 03:47:20 +00:00
|
|
|
__progname = get_progname(argv[0]);
|
2000-07-09 12:42:32 +00:00
|
|
|
init_rng();
|
2001-05-06 02:57:20 +00:00
|
|
|
seed_rng();
|
2000-07-09 12:42:32 +00:00
|
|
|
|
2001-02-05 12:42:17 +00:00
|
|
|
SSLeay_add_all_algorithms();
|
2000-08-23 00:46:23 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* At first, get a connection to the authentication agent. */
|
|
|
|
ac = ssh_get_authentication_connection();
|
|
|
|
if (ac == NULL) {
|
|
|
|
fprintf(stderr, "Could not open a connection to your authentication agent.\n");
|
|
|
|
exit(1);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2001-07-04 05:03:51 +00:00
|
|
|
while ((ch = getopt(argc, argv, "lLdDe:s:")) != -1) {
|
|
|
|
switch (ch) {
|
|
|
|
case 'l':
|
|
|
|
case 'L':
|
|
|
|
list_identities(ac, ch == 'l' ? 1 : 0);
|
|
|
|
goto done;
|
|
|
|
break;
|
|
|
|
case 'd':
|
1999-11-24 13:26:21 +00:00
|
|
|
deleting = 1;
|
2001-07-04 05:03:51 +00:00
|
|
|
break;
|
|
|
|
case 'D':
|
1999-11-24 13:26:21 +00:00
|
|
|
delete_all(ac);
|
2001-07-04 05:03:51 +00:00
|
|
|
goto done;
|
|
|
|
break;
|
|
|
|
case 's':
|
2001-08-06 21:35:51 +00:00
|
|
|
sc_reader_id = optarg;
|
2001-07-04 05:03:51 +00:00
|
|
|
break;
|
|
|
|
case 'e':
|
2001-07-04 03:50:02 +00:00
|
|
|
deleting = 1;
|
2001-08-06 21:35:51 +00:00
|
|
|
sc_reader_id = optarg;
|
2001-07-04 05:03:51 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
exit(1);
|
|
|
|
break;
|
2001-07-04 03:50:02 +00:00
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2001-07-04 05:03:51 +00:00
|
|
|
argc -= optind;
|
|
|
|
argv += optind;
|
2001-08-06 21:35:51 +00:00
|
|
|
if (sc_reader_id != NULL) {
|
|
|
|
update_card(ac, !deleting, sc_reader_id);
|
2001-07-04 05:03:51 +00:00
|
|
|
goto done;
|
2001-07-04 03:50:02 +00:00
|
|
|
}
|
2001-07-04 05:03:51 +00:00
|
|
|
if (argc == 0) {
|
1999-11-24 13:26:21 +00:00
|
|
|
pw = getpwuid(getuid());
|
|
|
|
if (!pw) {
|
2000-08-29 00:33:50 +00:00
|
|
|
fprintf(stderr, "No user found with uid %u\n",
|
|
|
|
(u_int)getuid());
|
1999-11-24 13:26:21 +00:00
|
|
|
ssh_close_authentication_connection(ac);
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-01-22 05:34:40 +00:00
|
|
|
snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, _PATH_SSH_CLIENT_IDENTITY);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (deleting)
|
|
|
|
delete_file(ac, buf);
|
|
|
|
else
|
|
|
|
add_file(ac, buf);
|
2001-07-04 05:03:51 +00:00
|
|
|
} else {
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
if (deleting)
|
|
|
|
delete_file(ac, argv[i]);
|
|
|
|
else
|
|
|
|
add_file(ac, argv[i]);
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2001-04-10 02:45:32 +00:00
|
|
|
clear_pass();
|
2001-07-04 05:03:51 +00:00
|
|
|
|
|
|
|
done:
|
1999-11-24 13:26:21 +00:00
|
|
|
ssh_close_authentication_connection(ac);
|
|
|
|
exit(0);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|