diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-02-25 16:16:42 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-25 16:19:50 +0100 |
| commit | 6a99fde46b520637865a116e75f52514b39af16a (patch) | |
| tree | 16078650ae428765a982c5f7adf9ba40a3fbbf75 /crypto/mem.c | |
| parent | RT4116: Change cleanse to just memset (diff) | |
| download | openssl-6a99fde46b520637865a116e75f52514b39af16a.tar.xz openssl-6a99fde46b520637865a116e75f52514b39af16a.zip | |
Build fix: remove cleanse_ctr
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'crypto/mem.c')
| -rw-r--r-- | crypto/mem.c | 12 |
1 files changed, 0 insertions, 12 deletions
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; } |