From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 15 Jun 2009 11:23:33 +0000 (+0000)
Subject: Update from HEAD.
X-Git-Tag: OpenSSL_1_0_0-beta3~53
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5bb9e1b4d4d9fbeed57fb336769255c7217e3665;p=oweals%2Fopenssl.git

Update from HEAD.
---

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 4723feecaf..7dc4ceae8e 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -177,8 +177,8 @@ int RAND_write_file(const char *file)
 	
 	i=stat(file,&sb);
 	if (i != -1) { 
-#if defined(S_IFBLK) && defined(S_IFCHR)
-	  if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
+#if defined(S_ISBLK) && defined(S_ISCHR)
+	  if (S_ISBLK(sb.st_mode) || S_ISCHR(sb.st_mode)) {
 	    /* this file is a device. we don't write back to it. 
 	     * we "succeed" on the assumption this is some sort 
 	     * of random device. Otherwise attempting to write to