===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/authfile.c,v
retrieving revision 1.48.2.2
retrieving revision 1.49
diff -u -r1.48.2.2 -r1.49
--- src/usr.bin/ssh/authfile.c	2003/04/03 22:35:16	1.48.2.2
+++ src/usr.bin/ssh/authfile.c	2002/05/23 19:24:30	1.49
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.48.2.2 2003/04/03 22:35:16 miod Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.49 2002/05/23 19:24:30 markus Exp $");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -232,17 +232,12 @@
 {
 	Buffer buffer;
 	Key *pub;
-	struct stat st;
 	char *cp;
 	int i;
 	off_t len;
 
-	if (fstat(fd, &st) < 0) {
-		error("fstat for key file %.200s failed: %.100s",
-		    filename, strerror(errno));
-		return NULL;
-	}
-	len = st.st_size;
+	len = lseek(fd, (off_t) 0, SEEK_END);
+	lseek(fd, (off_t) 0, SEEK_SET);
 
 	buffer_init(&buffer);
 	cp = buffer_append_space(&buffer, len);
@@ -275,7 +270,7 @@
 	(void) buffer_get_int(&buffer);		/* reserved */
 
 	/* Read the public key from the buffer. */
-	(void) buffer_get_int(&buffer);
+	buffer_get_int(&buffer);
 	pub = key_new(KEY_RSA1);
 	buffer_get_bignum(&buffer, pub->rsa->n);
 	buffer_get_bignum(&buffer, pub->rsa->e);
@@ -323,15 +318,9 @@
 	CipherContext ciphercontext;
 	Cipher *cipher;
 	Key *prv = NULL;
-	struct stat st;
 
-	if (fstat(fd, &st) < 0) {
-		error("fstat for key file %.200s failed: %.100s",
-		    filename, strerror(errno));
-		close(fd);
-		return NULL;
-	}
-	len = st.st_size;
+	len = lseek(fd, (off_t) 0, SEEK_END);
+	lseek(fd, (off_t) 0, SEEK_SET);
 
 	buffer_init(&buffer);
 	cp = buffer_append_space(&buffer, len);
@@ -368,7 +357,7 @@
 	(void) buffer_get_int(&buffer);	/* Reserved data. */
 
 	/* Read the public key from the buffer. */
-	(void) buffer_get_int(&buffer);
+	buffer_get_int(&buffer);
 	prv = key_new_private(KEY_RSA1);
 
 	buffer_get_bignum(&buffer, prv->rsa->n);
@@ -421,12 +410,6 @@
 	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;
 
@@ -466,11 +449,6 @@
 #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);