diff options
| author | des <des@FreeBSD.org> | 2004-01-07 11:10:17 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-01-07 11:10:17 +0000 |
| commit | b5d16e713867abc03742aca168b7a54a25c4790b (patch) | |
| tree | d7e09b6d73cb37aa875779151439b14df7273b87 /crypto/openssh/authfile.c | |
| parent | dc42ef026434942c55e8af3dd0e975d36afc6843 (diff) | |
| download | FreeBSD-src-b5d16e713867abc03742aca168b7a54a25c4790b.zip FreeBSD-src-b5d16e713867abc03742aca168b7a54a25c4790b.tar.gz | |
Vendor import of OpenSSH 3.7.1p2.
Diffstat (limited to 'crypto/openssh/authfile.c')
| -rw-r--r-- | crypto/openssh/authfile.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/crypto/openssh/authfile.c b/crypto/openssh/authfile.c index 90618ef..1f46093 100644 --- a/crypto/openssh/authfile.c +++ b/crypto/openssh/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; |
