* 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.34 2001/04/14 04:31:01 deraadt Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.43 2001/06/27 06:26:36 markus Exp $");
#include <openssl/evp.h>
/* we keep a cache of one passphrases */
static char *pass = NULL;
-void
+static void
clear_pass(void)
{
if (pass) {
}
}
-void
+static void
delete_file(AuthenticationConnection *ac, const char *filename)
{
Key *public;
}
/* 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 *private;
- char *comment = NULL, *askpass = NULL;
- char buf[1024], msg[1024];
- int interactive = isatty(STDIN_FILENO);
+ char *comment = NULL;
+ char msg[1024];
if (stat(filename, &st) < 0) {
perror(filename);
exit(1);
}
- 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_load_private(filename, "", &comment);
if (comment == NULL)
if (private == NULL) {
/* clear passphrase since it did not work */
clear_pass();
- printf("Need passphrase for %.200s\n", filename);
- if (!interactive && askpass == NULL) {
- xfree(comment);
- return;
- }
- snprintf(msg, sizeof msg, "Enter passphrase for %.200s", comment);
+ snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
+ comment);
for (;;) {
- 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);
- pass = NULL;
+ clear_pass();
xfree(comment);
return;
}
if (private != NULL)
break;
clear_pass();
- strlcpy(msg, "Bad passphrase, try again", sizeof msg);
+ strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
}
}
if (ssh_add_identity(ac, private, comment))
key_free(private);
}
-void
+static void
+update_card(AuthenticationConnection *ac, int add, int id)
+{
+ 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);
+}
+
+static void
list_identities(AuthenticationConnection *ac, int do_fp)
{
Key *key;
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;
+ int i, ch, deleting = 0, sc_reader_num = -1;
__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_num = atoi(optarg);
+ break;
+ case 'e':
+ deleting = 1;
+ sc_reader_num = atoi(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_num != -1) {
+ update_card(ac, !deleting, sc_reader_num);
+ 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