summaryrefslogtreecommitdiffstats
path: root/crypto/rand
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-01-26 18:07:41 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-01-26 18:07:41 +0000
commit1cdb7854a513b29545135496a51dc02d00088f69 (patch)
treef09e383742c2e65fecaaf8327d51200fc5578ef9 /crypto/rand
parent704d33b347684aa15bcedc043116718b1386d5f4 (diff)
PR: 2138
Submitted by: Kevin Regan <k.regan@f5.com> Clear stat structure if -DPURIFY is set to avoid problems on some platforms which include unitialised fields.
Diffstat (limited to 'crypto/rand')
-rw-r--r--crypto/rand/randfile.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 7dc4ceae8e..4ed40b7b70 100644
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -118,6 +118,14 @@ int RAND_load_file(const char *file, long bytes)
if (file == NULL) return(0);
#ifndef OPENSSL_NO_POSIX_IO
+#ifdef PURIFY
+ /* struct stat can have padding and unused fields that may not be
+ * initialized in the call to stat(). We need to clear the entire
+ * structure before calling RAND_add() to avoid complaints from
+ * applications such as Valgrind.
+ */
+ memset(&sb, 0, sizeof(sb));
+#endif
if (stat(file,&sb) < 0) return(0);
RAND_add(&sb,sizeof(sb),0.0);
#endif