From 68edd00d9258df93b1366c71ac124e0cadf7bc08 Mon Sep 17 00:00:00 2001
From: djm <>
Date: Fri, 29 Apr 2005 05:39:33 +0000
Subject: resolve conflicts

---
 src/lib/libcrypto/rand/randfile.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/lib/libcrypto/rand/randfile.c')

diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index d88ee0d780..9bd89ba495 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -166,6 +166,7 @@ int RAND_write_file(const char *file)
 	}
 
 #if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)
+	{
 	/* For some reason Win32 can't write to files created this way */
 	
 	/* chmod(..., 0600) is too late to protect the file,
@@ -173,6 +174,7 @@ int RAND_write_file(const char *file)
 	int fd = open(file, O_CREAT, 0600);
 	if (fd != -1)
 		out = fdopen(fd, "wb");
+	}
 #endif
 	if (out == NULL)
 		out = fopen(file,"wb");
-- 
cgit v1.2.3-55-g6feb