From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 19 Sep 2007 13:29:05 +0000 (+0000)
Subject: Wrap "keep valgrind happy" change in #ifdef PEDANTIC so any entropy in the
X-Git-Tag: OpenSSL_0_9_8f~25
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=625782f7eeb0e7c9fef676feb70a369978a93018;p=oweals%2Fopenssl.git

Wrap "keep valgrind happy" change in #ifdef PEDANTIC so any entropy in the
buffer can be normally used.
---

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index adfec83b7b..b615696e97 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -154,7 +154,9 @@ void RAND_add(const void *buf, int num, double entropy)
 int RAND_bytes(unsigned char *buf, int num)
 	{
 	const RAND_METHOD *meth = RAND_get_rand_method();
+#ifdef PEDANTIC
 	memset(buf, 0, num);
+#endif
 	if (meth && meth->bytes)
 		return meth->bytes(buf,num);
 	return(-1);
@@ -163,7 +165,9 @@ int RAND_bytes(unsigned char *buf, int num)
 int RAND_pseudo_bytes(unsigned char *buf, int num)
 	{
 	const RAND_METHOD *meth = RAND_get_rand_method();
+#ifdef PEDANTIC
 	memset(buf, 0, num);
+#endif
 	if (meth && meth->pseudorand)
 		return meth->pseudorand(buf,num);
 	return(-1);