The branch master has been updated
via 6a99fde46b520637865a116e75f52514b39af16a (commit)
from 104ce8a9f02d250dd43c255eb7b8747e81b29422 (commit)
- Log -----------------------------------------------------------------
commit 6a99fde46b520637865a116e75f52514b39af16a
Author: Rich Salz <rs...@akamai.com>
Date: Thu Feb 25 10:16:42 2016 -0500
Build fix: remove cleanse_ctr
Reviewed-by: Andy Polyakov <ap...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/mem.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/crypto/mem.c b/crypto/mem.c
index f4da4fa..16ef64c 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;
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
