+/* $OpenBSD: ssh-add.c,v 1.91 2009/08/27 17:44:52 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.44 2001/08/01 22:03:33 markus Exp $");
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/param.h>
#include <openssl/evp.h>
+#include "openbsd-compat/openssl-compat.h"
+
+#include <fcntl.h>
+#include <pwd.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "xmalloc.h"
#include "ssh.h"
#include "rsa.h"
#include "log.h"
-#include "xmalloc.h"
#include "key.h"
+#include "buffer.h"
#include "authfd.h"
#include "authfile.h"
#include "pathnames.h"
-#include "readpass.h"
+#include "misc.h"
-#ifdef HAVE___PROGNAME
+/* argv0 */
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;
/* we keep a cache of one passphrases */
static char *pass = NULL;
}
}
-static void
+static int
delete_file(AuthenticationConnection *ac, const char *filename)
{
Key *public;
char *comment = NULL;
+ int ret = -1;
public = key_load_public(filename, &comment);
if (public == NULL) {
printf("Bad key file %s\n", filename);
- return;
+ return -1;
}
- if (ssh_remove_identity(ac, public))
+ if (ssh_remove_identity(ac, public)) {
fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
- else
+ ret = 0;
+ } else
fprintf(stderr, "Could not remove identity: %s\n", filename);
+
key_free(public);
xfree(comment);
+
+ return ret;
}
/* Send a request to remove all identities. */
-static void
+static int
delete_all(AuthenticationConnection *ac)
{
- int success = 1;
+ int ret = -1;
- if (!ssh_remove_all_identities(ac, 1))
- success = 0;
+ if (ssh_remove_all_identities(ac, 1))
+ ret = 0;
/* ignore error-code for ssh2 */
ssh_remove_all_identities(ac, 2);
- if (success)
+ if (ret == 0)
fprintf(stderr, "All identities removed.\n");
else
fprintf(stderr, "Failed to remove all identities.\n");
+
+ return ret;
}
-static void
+static int
add_file(AuthenticationConnection *ac, const char *filename)
{
- struct stat st;
Key *private;
char *comment = NULL;
char msg[1024];
+ int fd, perms_ok, ret = -1;
- if (stat(filename, &st) < 0) {
+ if ((fd = open(filename, O_RDONLY)) < 0) {
perror(filename);
- exit(1);
+ return -1;
}
+
+ /*
+ * Since we'll try to load a keyfile multiple times, permission errors
+ * will occur multiple times, so check perms first and bail if wrong.
+ */
+ perms_ok = key_perm_ok(fd, filename);
+ close(fd);
+ if (!perms_ok)
+ return -1;
+
/* At first, try empty passphrase */
private = key_load_private(filename, "", &comment);
if (comment == NULL)
/* clear passphrase since it did not work */
clear_pass();
snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
- comment);
+ comment);
for (;;) {
pass = read_passphrase(msg, RP_ALLOW_STDIN);
if (strcmp(pass, "") == 0) {
clear_pass();
xfree(comment);
- return;
+ return -1;
}
private = key_load_private(filename, pass, &comment);
if (private != NULL)
break;
clear_pass();
- strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
+ snprintf(msg, sizeof msg,
+ "Bad passphrase, try again for %.200s: ", comment);
}
}
- if (ssh_add_identity(ac, private, comment))
+
+ if (ssh_add_identity_constrained(ac, private, comment, lifetime,
+ confirm)) {
fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
- else
+ 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 {
fprintf(stderr, "Could not add identity: %s\n", filename);
+ }
+
xfree(comment);
key_free(private);
+
+ return ret;
}
-static void
+static int
update_card(AuthenticationConnection *ac, int add, const char *id)
{
- if (ssh_update_card(ac, add, 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)) {
fprintf(stderr, "Card %s: %s\n",
- add ? "added" : "removed", id);
- else
+ add ? "added" : "removed", id);
+ ret = 0;
+ } else {
fprintf(stderr, "Could not %s card: %s\n",
- add ? "add" : "remove", id);
+ add ? "add" : "remove", id);
+ ret = -1;
+ }
+ xfree(pin);
+ return ret;
}
-static void
+static int
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
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");
+ fprintf(stderr, "usage: %s [options] [file ...]\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");
+ 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");
+#endif
}
int
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;
+ int i, ch, deleting = 0, ret = 0;
- __progname = get_progname(argv[0]);
+ /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
+ sanitise_stdfd();
+
+ __progname = ssh_get_progname(argv[0]);
init_rng();
seed_rng();
/* 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);
+ fprintf(stderr,
+ "Could not open a connection to your authentication agent.\n");
+ exit(2);
}
- while ((ch = getopt(argc, argv, "lLdDe:s:")) != -1) {
+ while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
switch (ch) {
case 'l':
case 'L':
- list_identities(ac, ch == 'l' ? 1 : 0);
+ if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
+ ret = 1;
+ goto done;
+ case 'x':
+ case 'X':
+ if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
+ ret = 1;
goto done;
+ case 'c':
+ confirm = 1;
break;
case 'd':
deleting = 1;
break;
case 'D':
- delete_all(ac);
+ if (delete_all(ac) == -1)
+ ret = 1;
goto done;
- break;
case 's':
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();
- exit(1);
- break;
+ ret = 1;
+ goto done;
}
}
argc -= optind;
argv += optind;
if (sc_reader_id != NULL) {
- update_card(ac, !deleting, sc_reader_id);
+ if (update_card(ac, !deleting, sc_reader_id) == -1)
+ ret = 1;
goto done;
}
if (argc == 0) {
- pw = getpwuid(getuid());
- if (!pw) {
+ char buf[MAXPATHLEN];
+ struct passwd *pw;
+ struct stat st;
+ int count = 0;
+
+ if ((pw = getpwuid(getuid())) == NULL) {
fprintf(stderr, "No user found with uid %u\n",
(u_int)getuid());
- ssh_close_authentication_connection(ac);
- exit(1);
+ ret = 1;
+ goto done;
}
- snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, _PATH_SSH_CLIENT_IDENTITY);
- if (deleting)
- delete_file(ac, buf);
- else
- add_file(ac, buf);
+
+ 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)
+ ret = 1;
+ else
+ count++;
+ }
+ if (count == 0)
+ ret = 1;
} else {
for (i = 0; i < argc; i++) {
- if (deleting)
- delete_file(ac, argv[i]);
- else
- add_file(ac, argv[i]);
+ if (do_file(ac, deleting, argv[i]) == -1)
+ ret = 1;
}
}
clear_pass();
done:
ssh_close_authentication_connection(ac);
- exit(0);
+ return ret;
}
andersk / openssh.git / blobdiff