import openssh-4.2p1-gsskex-20050926-2.patch

1 files changed, 9 insertions, 7 deletions

diff --git a/authfile.c b/authfile.c
index 6a04cd7a9..420813f37 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.60 2004/12/11 01:48:56 dtucker Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.61 2005/06/17 02:44:32 djm Exp $");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
@@ -52,6 +52,7 @@ RCSID("$OpenBSD: authfile.c,v 1.60 2004/12/11 01:48:56 dtucker Exp $");
 #include "authfile.h"
 #include "rsa.h"
 #include "misc.h"
+#include "atomicio.h"
 
 /* Version identification string for SSH v1 identity files. */
 static const char authfile_id_string[] =
@@ -147,8 +148,8 @@ key_save_private_rsa1(Key *key, const char *filename, const char *passphrase,
                 buffer_free(&encrypted);
                 return 0;
         }
-        if (write(fd, buffer_ptr(&encrypted), buffer_len(&encrypted)) !=
-            buffer_len(&encrypted)) {
+        if (atomicio(vwrite, fd, buffer_ptr(&encrypted),
+            buffer_len(&encrypted)) != buffer_len(&encrypted)) {
                 error("write to key file %s failed: %s", filename,
                     strerror(errno));
                 buffer_free(&encrypted);
@@ -236,7 +237,7 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp)
         Key *pub;
         struct stat st;
         char *cp;
-        int i;
+        u_int i;
         size_t len;
 
         if (fstat(fd, &st) < 0) {
@@ -253,7 +254,7 @@ key_load_public_rsa1(int fd, const char *filename, char **commentp)
         buffer_init(&buffer);
         cp = buffer_append_space(&buffer, len);
 
-        if (read(fd, cp, (size_t) len) != (size_t) len) {
+        if (atomicio(read, fd, cp, len) != len) {
                 debug("Read from key file %.200s failed: %.100s", filename,
                     strerror(errno));
                 buffer_free(&buffer);
@@ -322,7 +323,8 @@ static Key *
 key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
     char **commentp)
 {
-        int i, check1, check2, cipher_type;
+        u_int i;
+        int check1, check2, cipher_type;
         size_t len;
         Buffer buffer, decrypted;
         u_char *cp;
@@ -347,7 +349,7 @@ key_load_private_rsa1(int fd, const char *filename, const char *passphrase,
         buffer_init(&buffer);
         cp = buffer_append_space(&buffer, len);
 
-        if (read(fd, cp, (size_t) len) != (size_t) len) {
+        if (atomicio(read, fd, cp, len) != len) {
                 debug("Read from key file %.200s failed: %.100s", filename,
                     strerror(errno));
                 buffer_free(&buffer);