DEFINE_STACK_OF(ASN1_UTF8STRING) moved from ts_lcl.h to asn1.h

[openssl.git] / crypto / mem.c

diff --git a/crypto/mem.c b/crypto/mem.c
index f4da4fad677eb14ae09014c8658abc6512d2c188..9bdd5043a977a4ff6dbc9f9708653c83095e02e8 100644 (file)
--- 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;
 }
 
@@ -213,9 +201,10 @@ void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num,
     }
 
     ret = CRYPTO_malloc(num, file, line);
-    if (ret)
+    if (ret != NULL) {
         memcpy(ret, str, old_len);
-    CRYPTO_clear_free(str, old_len, file, line);
+        CRYPTO_clear_free(str, old_len, file, line);
+    }
     return ret;
 }