*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.70 2004/05/08 00:21:31 djm Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.46 2001/10/02 08:38:50 djm Exp $");
#include <openssl/evp.h>
#include "authfd.h"
#include "authfile.h"
#include "pathnames.h"
-#include "misc.h"
+#include "readpass.h"
-/* argv0 */
+#ifdef HAVE___PROGNAME
extern char *__progname;
+#else
+char *__progname;
+#endif
-/* Default files to add */
-static char *default_files[] = {
- _PATH_SSH_CLIENT_ID_RSA,
- _PATH_SSH_CLIENT_ID_DSA,
- _PATH_SSH_CLIENT_IDENTITY,
- NULL
-};
-
-/* Default lifetime (0 == forever) */
-static int lifetime = 0;
-
-/* User has to confirm key use */
-static int confirm = 0;
+/* argv0 */
+extern char *__progname;
/* we keep a cache of one passphrases */
static char *pass = NULL;
key_free(public);
xfree(comment);
-
+
return ret;
}
if (private != NULL)
break;
clear_pass();
- snprintf(msg, sizeof msg,
- "Bad passphrase, try again for %.200s: ", comment);
+ strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
}
}
-
- if (ssh_add_identity_constrained(ac, private, comment, lifetime,
- confirm)) {
- fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
- ret = 0;
- if (lifetime != 0)
- fprintf(stderr,
- "Lifetime set to %d seconds\n", lifetime);
- if (confirm != 0)
- fprintf(stderr,
- "The user has to confirm each use of the key\n");
- } else if (ssh_add_identity(ac, private, comment)) {
+ if (ssh_add_identity(ac, private, comment)) {
fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
ret = 0;
- } else {
+ } else
fprintf(stderr, "Could not add identity: %s\n", filename);
- }
xfree(comment);
key_free(private);
-
+
return ret;
}
static int
update_card(AuthenticationConnection *ac, int add, const char *id)
{
- char *pin;
- int ret = -1;
-
- pin = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN);
- if (pin == NULL)
- return -1;
-
- if (ssh_update_card(ac, add, id, pin, lifetime, confirm)) {
+ if (ssh_update_card(ac, add, id)) {
fprintf(stderr, "Card %s: %s\n",
- add ? "added" : "removed", id);
- ret = 0;
+ add ? "added" : "removed", id);
+ return 0;
} else {
fprintf(stderr, "Could not %s card: %s\n",
- add ? "add" : "remove", id);
- ret = -1;
+ add ? "add" : "remove", id);
+ return -1;
}
- xfree(pin);
- return ret;
}
-static int
+static void
list_identities(AuthenticationConnection *ac, int do_fp)
{
Key *key;
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)) {
+ key != NULL;
+ key = ssh_get_next_identity(ac, &comment, version)) {
had_identities = 1;
if (do_fp) {
fp = key_fingerprint(key, SSH_FP_MD5,
xfree(comment);
}
}
- if (!had_identities) {
+ if (!had_identities)
printf("The agent has no identities.\n");
- return -1;
- }
- return 0;
-}
-
-static int
-lock_agent(AuthenticationConnection *ac, int lock)
-{
- char prompt[100], *p1, *p2;
- int passok = 1, ret = -1;
-
- strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
- p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
- if (lock) {
- strlcpy(prompt, "Again: ", sizeof prompt);
- p2 = read_passphrase(prompt, RP_ALLOW_STDIN);
- if (strcmp(p1, p2) != 0) {
- fprintf(stderr, "Passwords do not match.\n");
- passok = 0;
- }
- memset(p2, 0, strlen(p2));
- xfree(p2);
- }
- if (passok && ssh_lock_agent(ac, lock, p1)) {
- fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
- ret = 0;
- } else
- fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
- memset(p1, 0, strlen(p1));
- xfree(p1);
- return (ret);
-}
-
-static int
-do_file(AuthenticationConnection *ac, int deleting, char *file)
-{
- if (deleting) {
- if (delete_file(ac, file) == -1)
- return -1;
- } else {
- if (add_file(ac, file) == -1)
- return -1;
- }
- return 0;
}
static void
fprintf(stderr, " -L List public key parameters of all identities.\n");
fprintf(stderr, " -d Delete identity.\n");
fprintf(stderr, " -D Delete all identities.\n");
- fprintf(stderr, " -x Lock agent.\n");
- fprintf(stderr, " -X Unlock agent.\n");
- fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n");
- fprintf(stderr, " -c Require confirmation to sign using identities\n");
#ifdef SMARTCARD
fprintf(stderr, " -s reader Add key in smartcard reader.\n");
fprintf(stderr, " -e reader Remove key in smartcard reader.\n");
extern char *optarg;
extern int optind;
AuthenticationConnection *ac = NULL;
+ struct passwd *pw;
+ char buf[1024];
char *sc_reader_id = NULL;
int i, ch, deleting = 0, ret = 0;
- __progname = ssh_get_progname(argv[0]);
+ __progname = get_progname(argv[0]);
init_rng();
seed_rng();
ac = ssh_get_authentication_connection();
if (ac == NULL) {
fprintf(stderr, "Could not open a connection to your authentication agent.\n");
- exit(2);
+ exit(1);
}
- while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
+ while ((ch = getopt(argc, argv, "lLdDe:s:")) != -1) {
switch (ch) {
case 'l':
case 'L':
- if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
- ret = 1;
- goto done;
- break;
- case 'x':
- case 'X':
- if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
- ret = 1;
+ list_identities(ac, ch == 'l' ? 1 : 0);
goto done;
break;
- case 'c':
- confirm = 1;
- break;
case 'd':
deleting = 1;
break;
sc_reader_id = optarg;
break;
case 'e':
- deleting = 1;
+ deleting = 1;
sc_reader_id = optarg;
break;
- case 't':
- if ((lifetime = convtime(optarg)) == -1) {
- fprintf(stderr, "Invalid lifetime\n");
- ret = 1;
- goto done;
- }
- break;
default:
usage();
ret = 1;
goto done;
}
if (argc == 0) {
- char buf[MAXPATHLEN];
- struct passwd *pw;
- struct stat st;
- int count = 0;
-
- if ((pw = getpwuid(getuid())) == NULL) {
+ pw = getpwuid(getuid());
+ if (!pw) {
fprintf(stderr, "No user found with uid %u\n",
(u_int)getuid());
ret = 1;
goto done;
}
-
- for(i = 0; default_files[i]; i++) {
- snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
- default_files[i]);
- if (stat(buf, &st) < 0)
- continue;
- if (do_file(ac, deleting, buf) == -1)
+ snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, _PATH_SSH_CLIENT_IDENTITY);
+ if (deleting) {
+ if (delete_file(ac, buf) == -1)
+ ret = 1;
+ } else {
+ if (add_file(ac, buf) == -1)
ret = 1;
- else
- count++;
}
- if (count == 0)
- ret = 1;
} else {
- for(i = 0; i < argc; i++) {
- if (do_file(ac, deleting, argv[i]) == -1)
- ret = 1;
+ for (i = 0; i < argc; i++) {
+ if (deleting) {
+ if (delete_file(ac, argv[i]) == -1)
+ ret = 1;
+ } else {
+ if (add_file(ac, argv[i]) == -1)
+ ret = 1;
+ }
}
}
clear_pass();
andersk / gssapi-openssh.git / blobdiff