- (tim) [configure.ac] updwtmpx() on OpenServer seems to add duplicate entry.

[openssh.git] / authfile.c

diff --git a/authfile.c b/authfile.c
index e35714e93be7cf9ced5242081e43cb127bb7f8ae..76a60d020f7a7ec0d19e4d636b65d5ab460220be 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.46 2002/02/14 23:41:01 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.57 2004/06/21 17:36:31 avsm Exp $");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -72,7 +72,7 @@ key_save_private_rsa1(Key *key, const char *filename, const char *passphrase,
        int fd, i, cipher_num;
        CipherContext ciphercontext;
        Cipher *cipher;
-       u_int32_t rand;
+       u_int32_t rnd;
 
        /*
         * If the passphrase is empty, use SSH_CIPHER_NONE to ease converting
@@ -87,9 +87,9 @@ key_save_private_rsa1(Key *key, const char *filename, const char *passphrase,
        buffer_init(&buffer);
 
        /* Put checkbytes for checking passphrase validity. */
-       rand = arc4random();
-       buf[0] = rand & 0xff;
-       buf[1] = (rand >> 8) & 0xff;
+       rnd = arc4random();
+       buf[0] = rnd & 0xff;
+       buf[1] = (rnd >> 8) & 0xff;
        buf[2] = buf[0];
        buf[3] = buf[1];
        buffer_append(&buffer, buf, 4);
@@ -143,6 +143,7 @@ key_save_private_rsa1(Key *key, const char *filename, const char *passphrase,
        fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0600);
        if (fd < 0) {
                error("open %s failed: %s.", filename, strerror(errno));
+               buffer_free(&encrypted);
                return 0;
        }
        if (write(fd, buffer_ptr(&encrypted), buffer_len(&encrypted)) !=
@@ -168,8 +169,8 @@ key_save_private_pem(Key *key, const char *filename, const char *_passphrase,
        int fd;
        int success = 0;
        int len = strlen(_passphrase);
-       char *passphrase = (len > 0) ? (char *)_passphrase : NULL;
-       EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL;
+       u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL;
+       const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL;
 
        if (len > 0 && len <= 4) {
                error("passphrase too short: have %d bytes, need > 4", len);
@@ -232,12 +233,19 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp)
 {
        Buffer buffer;
        Key *pub;
+       struct stat st;
        char *cp;
        int i;
-       off_t len;
+       size_t len;
 
-       len = lseek(fd, (off_t) 0, SEEK_END);
-       lseek(fd, (off_t) 0, SEEK_SET);
+       if (fstat(fd, &st) < 0) {
+               error("fstat for key file %.200s failed: %.100s",
+                   filename, strerror(errno));
+               return NULL;
+       }
+       if (st.st_size > 1*1024*1024)
+               close(fd);
+       len = (size_t)st.st_size;               /* truncated */
 
        buffer_init(&buffer);
        cp = buffer_append_space(&buffer, len);
@@ -270,7 +278,7 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp)
        (void) buffer_get_int(&buffer);         /* reserved */
 
        /* Read the public key from the buffer. */
-       buffer_get_int(&buffer);
+       (void) buffer_get_int(&buffer);
        pub = key_new(KEY_RSA1);
        buffer_get_bignum(&buffer, pub->rsa->n);
        buffer_get_bignum(&buffer, pub->rsa->e);
@@ -312,15 +320,25 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
     char **commentp)
 {
        int i, check1, check2, cipher_type;
-       off_t len;
+       size_t len;
        Buffer buffer, decrypted;
        u_char *cp;
        CipherContext ciphercontext;
        Cipher *cipher;
        Key *prv = NULL;
+       struct stat st;
 
-       len = lseek(fd, (off_t) 0, SEEK_END);
-       lseek(fd, (off_t) 0, SEEK_SET);
+       if (fstat(fd, &st) < 0) {
+               error("fstat for key file %.200s failed: %.100s",
+                   filename, strerror(errno));
+               close(fd);
+               return NULL;
+       }
+       if (st.st_size > 1*1024*1024) {
+               close(fd);
+               return (NULL);
+       }
+       len = (size_t)st.st_size;               /* truncated */
 
        buffer_init(&buffer);
        cp = buffer_append_space(&buffer, len);
@@ -357,7 +375,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
        (void) buffer_get_int(&buffer); /* Reserved data. */
 
        /* Read the public key from the buffer. */
-       buffer_get_int(&buffer);
+       (void) buffer_get_int(&buffer);
        prv = key_new_private(KEY_RSA1);
 
        buffer_get_bignum(&buffer, prv->rsa->n);
@@ -410,6 +428,12 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
        rsa_generate_additional_parameters(prv->rsa);
 
        buffer_free(&decrypted);
+
+       /* enable blinding */
+       if (RSA_blinding_on(prv->rsa, NULL) != 1) {
+               error("key_load_private_rsa1: RSA_blinding_on failed");
+               goto fail;
+       }
        close(fd);
        return prv;
 
@@ -421,7 +445,7 @@ fail:
        return NULL;
 }
 
-static Key *
+Key *
 key_load_private_pem(int fd, int type, const char *passphrase,
     char **commentp)
 {
@@ -449,6 +473,11 @@ key_load_private_pem(int fd, int type, const char *passphrase,
 #ifdef DEBUG_PK
                RSA_print_fp(stderr, prv->rsa, 8);
 #endif
+               if (RSA_blinding_on(prv->rsa, NULL) != 1) {
+                       error("key_load_private_pem: RSA_blinding_on failed");
+                       key_free(prv);
+                       prv = NULL;
+               }
        } else if (pk->type == EVP_PKEY_DSA &&
            (type == KEY_UNSPEC||type==KEY_DSA)) {
                prv = key_new(KEY_UNSPEC);
@@ -492,7 +521,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;
@@ -607,9 +636,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;