From: Rich Salz <rsalz@akamai.com>
Date: Thu, 25 Feb 2016 15:16:42 +0000 (-0500)
Subject: Build fix: remove cleanse_ctr
X-Git-Tag: OpenSSL_1_1_0-pre4~519
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6a99fde46b520637865a116e75f52514b39af16a;p=oweals%2Fopenssl.git

Build fix: remove cleanse_ctr

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/crypto/mem.c b/crypto/mem.c
index f4da4fad67..16ef64c6fe 100644
--- a/crypto/mem.c
+++ b/crypto/mem.c
@@ -140,18 +140,6 @@ void *CRYPTO_malloc(size_t num, const char *file, int line)
     ret = malloc(num);
 #endif
 
-#ifndef OPENSSL_CPUID_OBJ
-    /*
-     * Create a dependency on the value of 'cleanse_ctr' so our memory
-     * sanitisation function can't be optimised out. NB: We only do this for
-     * >2Kb so the overhead doesn't bother us.
-     */
-    if (ret && (num > 2048)) {
-        extern unsigned char cleanse_ctr;
-        ((unsigned char *)ret)[0] = cleanse_ctr;
-    }
-#endif
-
     return ret;
 }