diff options
author | Andy Polyakov <appro@openssl.org> | 2016-06-12 20:04:50 +0200 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2016-06-12 23:59:24 +0200 |
commit | 6397ac585d6d4101be0fb742ac0db5074bd4e8a6 (patch) | |
tree | 6388d8d87f3ea9ecd06883022c2a78b3bbce3c17 /crypto/mem.c | |
parent | 80e07cc7f0ce97b8898780082d70e0cb0adb3f61 (diff) |
crypto/mem.c: drop reference to cleanse_ctr and fix no-asm builds.
crypto/mem_clr.c was harmonized with master branch and doesn't use
cleanse_ctr kludge anymore.
RT#4563
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/mem.c')
-rw-r--r-- | crypto/mem.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/crypto/mem.c b/crypto/mem.c index fdad49b76e..1e873e3428 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -298,18 +298,6 @@ void *CRYPTO_malloc_locked(int num, const char *file, int line) if (malloc_debug_func != NULL) malloc_debug_func(ret, num, file, line, 1); -#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; } @@ -346,18 +334,6 @@ void *CRYPTO_malloc(int num, const char *file, int line) if (malloc_debug_func != NULL) malloc_debug_func(ret, num, file, line, 1); -#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; } |