- deraadt@cvs.openbsd.org 2006/03/19 18:53:12

[openssh.git] / ssh-add.c

diff --git a/ssh-add.c b/ssh-add.c
index 749a76829b7dc1e868af7540e06738441aabf8b2..4c5cc57277769b6914790d49b7e9ff112622137c 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.73 2005/09/13 23:40:07 djm Exp $");
+
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <openssl/evp.h>
 
@@ -124,16 +126,25 @@ delete_all(AuthenticationConnection *ac)
 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)
@@ -324,7 +335,8 @@ main(int argc, char **argv)
        /* 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) {