*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.68 2003/06/16 10:22:45 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.76 2006/03/13 10:26:52 dtucker Exp $");
+
+#include <sys/types.h>
+#include <sys/stat.h>
#include <openssl/evp.h>
#include "authfd.h"
#include "authfile.h"
#include "pathnames.h"
-#include "readpass.h"
#include "misc.h"
-#ifdef HAVE___PROGNAME
-extern char *__progname;
-#else
-char *__progname;
-#endif
-
/* argv0 */
extern char *__progname;
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, 0)) < 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)
/* 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) {
}
}
- if (ssh_add_identity_constrained(ac, private, comment, lifetime,
- confirm)) {
+ 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)
+ if (confirm != 0)
fprintf(stderr,
"The user has to confirm each use of the key\n");
} else if (ssh_add_identity(ac, private, comment)) {
char *sc_reader_id = NULL;
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");
+ fprintf(stderr,
+ "Could not open a connection to your authentication agent.\n");
exit(2);
}
while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
goto done;
}
- for(i = 0; default_files[i]; i++) {
+ for (i = 0; default_files[i]; i++) {
snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
default_files[i]);
if (stat(buf, &st) < 0)
if (count == 0)
ret = 1;
} else {
- for(i = 0; i < argc; i++) {
+ for (i = 0; i < argc; i++) {
if (do_file(ac, deleting, argv[i]) == -1)
ret = 1;
}