* called by a name other than "ssh" or "Secure Shell".
*
* SSH2 implementation,
- * Copyright (c) 2000 Markus Friedl. All rights reserved.
+ * 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
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.28 2001/02/04 15:32:25 stevesk Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.44 2001/08/01 22:03:33 markus Exp $");
#include <openssl/evp.h>
char *__progname;
#endif
-void
+/* 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;
+ char *comment = NULL;
- public = key_new(KEY_RSA1);
- if (!load_public_key(filename, public, &comment)) {
- key_free(public);
- public = key_new(KEY_UNSPEC);
- if (!try_load_public_key(filename, public, &comment)) {
- printf("Bad key file %s\n", filename);
- return;
- }
+ 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);
}
/* Send a request to remove all identities. */
-void
+static void
delete_all(AuthenticationConnection *ac)
{
int success = 1;
fprintf(stderr, "Failed to remove all identities.\n");
}
-char *
-ssh_askpass(char *askpass, char *msg)
-{
- pid_t pid;
- size_t len;
- char *nl, *pass;
- int p[2], status;
- char buf[1024];
-
- if (fflush(stdout) != 0)
- error("ssh_askpass: fflush: %s", strerror(errno));
- if (askpass == NULL)
- fatal("internal error: askpass undefined");
- if (pipe(p) < 0)
- fatal("ssh_askpass: pipe: %s", strerror(errno));
- if ((pid = fork()) < 0)
- fatal("ssh_askpass: fork: %s", strerror(errno));
- if (pid == 0) {
- close(p[0]);
- if (dup2(p[1], STDOUT_FILENO) < 0)
- fatal("ssh_askpass: dup2: %s", strerror(errno));
- execlp(askpass, askpass, msg, (char *) 0);
- fatal("ssh_askpass: exec(%s): %s", askpass, strerror(errno));
- }
- close(p[1]);
- len = read(p[0], buf, sizeof buf);
- close(p[0]);
- while (waitpid(pid, &status, 0) < 0)
- if (errno != EINTR)
- break;
- if (len <= 1)
- return xstrdup("");
- nl = strchr(buf, '\n');
- if (nl)
- *nl = '\0';
- pass = xstrdup(buf);
- memset(buf, 0, sizeof(buf));
- return pass;
-}
-
-void
+static void
add_file(AuthenticationConnection *ac, const char *filename)
{
struct stat st;
- Key *public;
Key *private;
- char *saved_comment, *comment, *askpass = NULL;
- char buf[1024], msg[1024];
- int success;
- int interactive = isatty(STDIN_FILENO);
- int type = KEY_RSA1;
+ char *comment = NULL;
+ char msg[1024];
if (stat(filename, &st) < 0) {
perror(filename);
exit(1);
}
- /*
- * try to load the public key. right now this only works for RSA,
- * since DSA keys are fully encrypted
- */
- public = key_new(KEY_RSA1);
- if (!load_public_key(filename, public, &saved_comment)) {
- /* ok, so we will assume this is 'some' key */
- type = KEY_UNSPEC;
- saved_comment = xstrdup(filename);
- }
- key_free(public);
-
- if (!interactive && getenv("DISPLAY")) {
- if (getenv(SSH_ASKPASS_ENV))
- askpass = getenv(SSH_ASKPASS_ENV);
- else
- askpass = _PATH_SSH_ASKPASS_DEFAULT;
- }
-
/* At first, try empty passphrase */
- private = key_new(type);
- success = load_private_key(filename, "", private, &comment);
- if (!success) {
- printf("Need passphrase for %.200s\n", filename);
- if (!interactive && askpass == NULL) {
- xfree(saved_comment);
- return;
- }
- snprintf(msg, sizeof msg, "Enter passphrase for %.200s", saved_comment);
+ 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 (;;) {
- char *pass;
- if (interactive) {
- snprintf(buf, sizeof buf, "%s: ", msg);
- pass = read_passphrase(buf, 1);
- } else {
- pass = ssh_askpass(askpass, msg);
- }
+ pass = read_passphrase(msg, RP_ALLOW_STDIN);
if (strcmp(pass, "") == 0) {
- xfree(pass);
- xfree(saved_comment);
+ clear_pass();
+ xfree(comment);
return;
}
- success = load_private_key(filename, pass, private, &comment);
- memset(pass, 0, strlen(pass));
- xfree(pass);
- if (success)
+ private = key_load_private(filename, pass, &comment);
+ if (private != NULL)
break;
- strlcpy(msg, "Bad passphrase, try again", sizeof msg);
+ clear_pass();
+ strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
}
}
- xfree(comment);
- if (ssh_add_identity(ac, private, saved_comment))
- fprintf(stderr, "Identity added: %s (%s)\n", filename, saved_comment);
+ 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);
- xfree(saved_comment);
}
-void
-list_identities(AuthenticationConnection *ac, int fp)
+static void
+update_card(AuthenticationConnection *ac, int add, const char *id)
+{
+ if (ssh_update_card(ac, add, id))
+ fprintf(stderr, "Card %s: %s\n",
+ add ? "added" : "removed", id);
+ else
+ fprintf(stderr, "Could not %s card: %s\n",
+ add ? "add" : "remove", id);
+}
+
+static void
+list_identities(AuthenticationConnection *ac, int do_fp)
{
Key *key;
- char *comment;
+ char *comment, *fp;
int had_identities = 0;
int version;
key != NULL;
key = ssh_get_next_identity(ac, &comment, version)) {
had_identities = 1;
- if (fp) {
+ if (do_fp) {
+ fp = key_fingerprint(key, SSH_FP_MD5,
+ SSH_FP_HEX);
printf("%d %s %s (%s)\n",
- key_size(key), key_fingerprint(key),
- comment, key_type(key));
+ key_size(key), fp, comment, key_type(key));
+ xfree(fp);
} else {
if (!key_write(key, stdout))
fprintf(stderr, "key_write failed");
printf("The agent has no identities.\n");
}
+static void
+usage(void)
+{
+ 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 argc, char **argv)
{
+ extern char *optarg;
+ extern int optind;
AuthenticationConnection *ac = NULL;
struct passwd *pw;
char buf[1024];
- int no_files = 1;
- int i;
- int deleting = 0;
+ char *sc_reader_id = NULL;
+ int i, ch, deleting = 0;
__progname = get_progname(argv[0]);
init_rng();
+ seed_rng();
SSLeay_add_all_algorithms();
fprintf(stderr, "Could not open a connection to your authentication agent.\n");
exit(1);
}
- for (i = 1; i < argc; i++) {
- if ((strcmp(argv[i], "-l") == 0) ||
- (strcmp(argv[i], "-L") == 0)) {
- list_identities(ac, argv[i][1] == 'l' ? 1 : 0);
- /* Don't default-add/delete if -l. */
- no_files = 0;
- continue;
- }
- if (strcmp(argv[i], "-d") == 0) {
+ 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;
- continue;
- }
- if (strcmp(argv[i], "-D") == 0) {
+ break;
+ case 'D':
delete_all(ac);
- no_files = 0;
- continue;
+ goto done;
+ break;
+ case 's':
+ sc_reader_id = optarg;
+ break;
+ case 'e':
+ deleting = 1;
+ sc_reader_id = optarg;
+ break;
+ default:
+ usage();
+ exit(1);
+ break;
}
- no_files = 0;
- if (deleting)
- delete_file(ac, argv[i]);
- else
- add_file(ac, argv[i]);
}
- if (no_files) {
+ argc -= optind;
+ argv += optind;
+ if (sc_reader_id != NULL) {
+ update_card(ac, !deleting, sc_reader_id);
+ goto done;
+ }
+ if (argc == 0) {
pw = getpwuid(getuid());
if (!pw) {
fprintf(stderr, "No user found with uid %u\n",
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]);
+ }
}
+ clear_pass();
+
+done:
ssh_close_authentication_connection(ac);
exit(0);
}
andersk / openssh.git / blobdiff