/*
+ * 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.
+ *
+ * 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".
+ *
+ * SSH2 implementation,
+ * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
+ *
+ * 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.
+ */
-ssh-add.c
+#include "includes.h"
+RCSID("$OpenBSD: ssh-add.c,v 1.43 2001/06/27 06:26:36 markus Exp $");
-Author: Tatu Ylonen <ylo@cs.hut.fi>
+#include <openssl/evp.h>
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
- All rights reserved
+#include "ssh.h"
+#include "rsa.h"
+#include "log.h"
+#include "xmalloc.h"
+#include "key.h"
+#include "authfd.h"
+#include "authfile.h"
+#include "pathnames.h"
+#include "readpass.h"
-Created: Thu Apr 6 00:52:24 1995 ylo
+#ifdef HAVE___PROGNAME
+extern char *__progname;
+#else
+char *__progname;
+#endif
-Adds an identity to the authentication server, or removes an identity.
+/* we keep a cache of one passphrases */
+static char *pass = NULL;
+static void
+clear_pass(void)
+{
+ if (pass) {
+ memset(pass, 0, strlen(pass));
+ xfree(pass);
+ pass = NULL;
+ }
+}
-*/
+static void
+delete_file(AuthenticationConnection *ac, const char *filename)
+{
+ Key *public;
+ char *comment = NULL;
-#include "includes.h"
-RCSID("$Id$");
+ public = key_load_public(filename, &comment);
+ if (public == NULL) {
+ printf("Bad key file %s\n", filename);
+ return;
+ }
+ if (ssh_remove_identity(ac, public))
+ fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
+ else
+ fprintf(stderr, "Could not remove identity: %s\n", filename);
+ key_free(public);
+ xfree(comment);
+}
-#include "rsa.h"
-#include "ssh.h"
-#include "xmalloc.h"
-#include "authfd.h"
+/* Send a request to remove all identities. */
+static void
+delete_all(AuthenticationConnection *ac)
+{
+ int success = 1;
-void
-delete_file(const char *filename)
+ if (!ssh_remove_all_identities(ac, 1))
+ success = 0;
+ /* ignore error-code for ssh2 */
+ ssh_remove_all_identities(ac, 2);
+
+ if (success)
+ fprintf(stderr, "All identities removed.\n");
+ else
+ fprintf(stderr, "Failed to remove all identities.\n");
+}
+
+static void
+add_file(AuthenticationConnection *ac, const char *filename)
{
- RSA *key;
- char *comment;
- AuthenticationConnection *ac;
-
- key = RSA_new();
- if (!load_public_key(filename, key, &comment))
- {
- printf("Bad key file %s: %s\n", filename, strerror(errno));
- return;
- }
-
- /* Send the request to the authentication agent. */
- ac = ssh_get_authentication_connection();
- if (!ac)
- {
- fprintf(stderr,
- "Could not open a connection to your authentication agent.\n");
- RSA_free(key);
- xfree(comment);
- return;
- }
- if (ssh_remove_identity(ac, key))
- fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
- else
- fprintf(stderr, "Could not remove identity: %s\n", filename);
- RSA_free(key);
- xfree(comment);
- ssh_close_authentication_connection(ac);
+ struct stat st;
+ Key *private;
+ char *comment = NULL;
+ char msg[1024];
+
+ if (stat(filename, &st) < 0) {
+ perror(filename);
+ exit(1);
+ }
+ /* At first, try empty passphrase */
+ private = key_load_private(filename, "", &comment);
+ if (comment == NULL)
+ comment = xstrdup(filename);
+ /* try last */
+ if (private == NULL && pass != NULL)
+ private = key_load_private(filename, pass, NULL);
+ if (private == NULL) {
+ /* clear passphrase since it did not work */
+ clear_pass();
+ snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
+ comment);
+ for (;;) {
+ pass = read_passphrase(msg, RP_ALLOW_STDIN);
+ if (strcmp(pass, "") == 0) {
+ clear_pass();
+ xfree(comment);
+ return;
+ }
+ private = key_load_private(filename, pass, &comment);
+ if (private != NULL)
+ break;
+ clear_pass();
+ strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
+ }
+ }
+ if (ssh_add_identity(ac, private, comment))
+ fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
+ else
+ fprintf(stderr, "Could not add identity: %s\n", filename);
+ xfree(comment);
+ key_free(private);
}
-void
-delete_all()
+static void
+update_card(AuthenticationConnection *ac, int add, int id)
{
- AuthenticationConnection *ac;
-
- /* Get a connection to the agent. */
- ac = ssh_get_authentication_connection();
- if (!ac)
- {
- fprintf(stderr,
- "Could not open a connection to your authentication agent.\n");
- return;
- }
-
- /* Send a request to remove all identities. */
- if (ssh_remove_all_identities(ac))
- fprintf(stderr, "All identities removed.\n");
- else
- fprintf(stderr, "Failed to remove all identitities.\n");
-
- /* Close the connection to the agent. */
- ssh_close_authentication_connection(ac);
+ if (ssh_update_card(ac, add, id))
+ fprintf(stderr, "Card %s: %d\n",
+ add ? "added" : "removed", id);
+ else
+ fprintf(stderr, "Could not %s card: %d\n",
+ add ? "add" : "remove", id);
}
-void
-add_file(const char *filename)
+static void
+list_identities(AuthenticationConnection *ac, int do_fp)
{
- RSA *key;
- RSA *public_key;
- AuthenticationConnection *ac;
- char *saved_comment, *comment, *pass;
- int first;
-
- key = RSA_new();
- public_key = RSA_new();
- if (!load_public_key(filename, public_key, &saved_comment))
- {
- printf("Bad key file %s: %s\n", filename, strerror(errno));
- return;
- }
- RSA_free(public_key);
-
- pass = xstrdup("");
- first = 1;
- while (!load_private_key(filename, pass, key, &comment))
- {
- /* Free the old passphrase. */
- memset(pass, 0, strlen(pass));
- xfree(pass);
-
- /* Ask for a passphrase. */
- if (getenv("DISPLAY") && !isatty(fileno(stdin)))
- {
- xfree(saved_comment);
- return;
- }
- else
- {
- if (first)
- printf("Need passphrase for %s (%s).\n", filename, saved_comment);
- else
- printf("Bad passphrase.\n");
- pass = read_passphrase("Enter passphrase: ", 1);
- if (strcmp(pass, "") == 0)
- {
- xfree(saved_comment);
- xfree(pass);
- return;
- }
+ Key *key;
+ char *comment, *fp;
+ 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;
+ if (do_fp) {
+ fp = key_fingerprint(key, SSH_FP_MD5,
+ SSH_FP_HEX);
+ printf("%d %s %s (%s)\n",
+ key_size(key), fp, comment, key_type(key));
+ xfree(fp);
+ } else {
+ if (!key_write(key, stdout))
+ fprintf(stderr, "key_write failed");
+ fprintf(stdout, " %s\n", comment);
+ }
+ key_free(key);
+ xfree(comment);
+ }
}
- first = 0;
- }
- memset(pass, 0, strlen(pass));
- xfree(pass);
-
- xfree(saved_comment);
-
- /* Send the key to the authentication agent. */
- ac = ssh_get_authentication_connection();
- if (!ac)
- {
- fprintf(stderr,
- "Could not open a connection to your authentication agent.\n");
- RSA_free(key);
- xfree(comment);
- return;
- }
- if (ssh_add_identity(ac, key, comment))
- fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
- else
- fprintf(stderr, "Could not add identity: %s\n", filename);
- RSA_free(key);
- xfree(comment);
- ssh_close_authentication_connection(ac);
+ if (!had_identities)
+ printf("The agent has no identities.\n");
}
-void
-list_identities()
+static void
+usage(void)
{
- AuthenticationConnection *ac;
- BIGNUM *e, *n;
- int bits, status;
- char *comment;
- int had_identities;
-
- ac = ssh_get_authentication_connection();
- if (!ac)
- {
- fprintf(stderr, "Could not connect to authentication server.\n");
- return;
- }
- e = BN_new();
- n = BN_new();
- had_identities = 0;
- for (status = ssh_get_first_identity(ac, &bits, e, n, &comment);
- status;
- status = ssh_get_next_identity(ac, &bits, e, n, &comment))
- {
- char *buf;
- had_identities = 1;
- printf("%d ", bits);
- buf = BN_bn2dec(e);
- assert(buf != NULL);
- printf("%s ", buf);
- free (buf);
- buf = BN_bn2dec(n);
- assert(buf != NULL);
- printf("%s %s\n", buf, comment);
- free (buf);
- xfree(comment);
- }
- BN_clear_free(e);
- BN_clear_free(n);
- if (!had_identities)
- printf("The agent has no identities.\n");
- ssh_close_authentication_connection(ac);
+ printf("Usage: ssh-add [options]\n");
+ printf(" -l, -L : list identities\n");
+ printf(" -d : delete identity\n");
+ printf(" -D : delete all identities\n");
+ printf(" -s reader_num : add key in the smartcard in reader_num.\n");
+ printf(" -e reader_num : remove key in the smartcard in reader_num.\n");
}
int
-main(int ac, char **av)
+main(int argc, char **argv)
{
- struct passwd *pw;
- char buf[1024];
- int no_files = 1;
- int i;
- int deleting = 0;
-
- /* check if RSA support exists */
- if (rsa_alive() == 0) {
- extern char *__progname;
-
- fprintf(stderr,
- "%s: no RSA support in libssl and libcrypto. See ssl(8).\n",
- __progname);
- exit(1);
- }
-
- for (i = 1; i < ac; i++)
- {
- if (strcmp(av[i], "-l") == 0)
- {
- list_identities();
- no_files = 0; /* Don't default-add/delete if -l. */
- continue;
+ extern char *optarg;
+ extern int optind;
+ AuthenticationConnection *ac = NULL;
+ struct passwd *pw;
+ char buf[1024];
+ int i, ch, deleting = 0, sc_reader_num = -1;
+
+ __progname = get_progname(argv[0]);
+ init_rng();
+ seed_rng();
+
+ SSLeay_add_all_algorithms();
+
+ /* 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);
}
- if (strcmp(av[i], "-d") == 0)
- {
- deleting = 1;
- continue;
+ 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':
+ deleting = 1;
+ break;
+ case 'D':
+ delete_all(ac);
+ goto done;
+ break;
+ case 's':
+ sc_reader_num = atoi(optarg);
+ break;
+ case 'e':
+ deleting = 1;
+ sc_reader_num = atoi(optarg);
+ break;
+ default:
+ usage();
+ exit(1);
+ break;
+ }
}
- if (strcmp(av[i], "-D") == 0)
- {
- delete_all();
- no_files = 0;
- continue;
+ argc -= optind;
+ argv += optind;
+ if (sc_reader_num != -1) {
+ update_card(ac, !deleting, sc_reader_num);
+ goto done;
}
- no_files = 0;
- if (deleting)
- delete_file(av[i]);
- else
- add_file(av[i]);
- }
- if (no_files)
- {
- pw = getpwuid(getuid());
- if (!pw)
- {
- fprintf(stderr, "No user found with uid %d\n", (int)getuid());
- exit(1);
+ if (argc == 0) {
+ pw = getpwuid(getuid());
+ if (!pw) {
+ fprintf(stderr, "No user found with uid %u\n",
+ (u_int)getuid());
+ ssh_close_authentication_connection(ac);
+ exit(1);
+ }
+ snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, _PATH_SSH_CLIENT_IDENTITY);
+ if (deleting)
+ delete_file(ac, buf);
+ else
+ add_file(ac, buf);
+ } else {
+ for (i = 0; i < argc; i++) {
+ if (deleting)
+ delete_file(ac, argv[i]);
+ else
+ add_file(ac, argv[i]);
+ }
}
- snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, SSH_CLIENT_IDENTITY);
- if (deleting)
- delete_file(buf);
- else
- add_file(buf);
- }
- exit(0);
+ clear_pass();
+
+done:
+ ssh_close_authentication_connection(ac);
+ exit(0);
}
andersk / openssh.git / blobdiff