From: Matt Caswell <matt@openssl.org>
Date: Thu, 30 Apr 2015 13:04:30 +0000 (+0100)
Subject: Replace memset with OPENSSL_cleanse()
X-Git-Tag: OpenSSL_1_0_2b~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=23cd01ef61ff9110850ee75c42ccb365ddc8a6ab;p=oweals%2Fopenssl.git

Replace memset with OPENSSL_cleanse()

BUF_MEM_free() attempts to cleanse memory using memset immediately prior
to a free. This is at risk of being optimised away by the compiler, so
replace with a call to OPENSSL_cleanse() instead.

With thanks to the Open Crypto Audit Project for reporting this issue.

Reviewed-by: Stephen Henson <steve@openssl.org>
---

diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
index d287e340a2..eff3e08157 100644
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -88,7 +88,7 @@ void BUF_MEM_free(BUF_MEM *a)
         return;
 
     if (a->data != NULL) {
-        memset(a->data, 0, (unsigned int)a->max);
+        OPENSSL_cleanse(a->data, a->max);
         OPENSSL_free(a->data);
     }
     OPENSSL_free(a);