+/* $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.72 2005/07/17 07:17:55 djm 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"
static int
add_file(AuthenticationConnection *ac, const char *filename)
{
- struct stat st;
Key *private;
char *comment = NULL;
char msg[1024];
- int ret = -1;
+ int fd, perms_ok, ret = -1;
- if (stat(filename, &st) < 0) {
+ if ((fd = open(filename, O_RDONLY)) < 0) {
perror(filename);
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)
if (confirm != 0)
fprintf(stderr,
"The user has to confirm each use of the key\n");
- } else if (ssh_add_identity(ac, private, comment)) {
- fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
- ret = 0;
} else {
fprintf(stderr, "Could not add identity: %s\n", filename);
}
static void
usage(void)
{
- fprintf(stderr, "Usage: %s [options]\n", __progname);
+ 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");
char *sc_reader_id = NULL;
int i, ch, deleting = 0, ret = 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");
+ fprintf(stderr,
+ "Could not open a connection to your authentication agent.\n");
exit(2);
}
while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
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;
goto done;
- break;
case 'c':
confirm = 1;
break;
if (delete_all(ac) == -1)
ret = 1;
goto done;
- break;
case 's':
sc_reader_id = optarg;
break;