1 files changed, 11 insertions, 2 deletions

diff --git a/authfile.c b/authfile.c
index 90618efde..1f46093e3 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.52 2003/03/13 11:42:18 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.54 2003/05/24 09:30:39 djm Exp $");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -514,7 +514,7 @@ key_perm_ok(int fd, const char *filename)
                 error("@         WARNING: UNPROTECTED PRIVATE KEY FILE!          @");
                 error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
                 error("Permissions 0%3.3o for '%s' are too open.",
-                    st.st_mode & 0777, filename);
+                    (u_int)st.st_mode & 0777, filename);
                 error("It is recommended that your private key files are NOT accessible by others.");
                 error("This private key will be ignored.");
                 return 0;
@@ -629,9 +629,18 @@ key_load_public(const char *filename, char **commentp)
         Key *pub;
         char file[MAXPATHLEN];
 
+        /* try rsa1 private key */
         pub = key_load_public_type(KEY_RSA1, filename, commentp);
         if (pub != NULL)
                 return pub;
+
+        /* try rsa1 public key */
+        pub = key_new(KEY_RSA1);
+        if (key_try_load_public(pub, filename, commentp) == 1)
+                return pub;
+        key_free(pub);
+
+        /* try ssh2 public key */
         pub = key_new(KEY_UNSPEC);
         if (key_try_load_public(pub, filename, commentp) == 1)
                 return pub;