diff options
| author | Andy Polyakov <appro@openssl.org> | 2007-05-14 21:35:25 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2007-05-14 21:35:25 +0000 |
| commit | b2dba9bf1f8f73376b9c1f0904a86996c728b236 (patch) | |
| tree | 8848a4f5efdf02d841b1ebea4969d879d6e61eb5 /crypto/mem.c | |
| parent | 932cc129ee61f5b72636eee6a7c3268e23967f7b (diff) | |
Profiling revealed that OPENSSL_cleanse consumes *more* CPU time than
sha1_block_data_order when hashing short messages. Move OPENSSL_cleanse
to "cpuid" assembler module and gain 2x.
Diffstat (limited to 'crypto/mem.c')
| -rw-r--r-- | crypto/mem.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/crypto/mem.c b/crypto/mem.c index 6635167228..43d48ab425 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -250,7 +250,6 @@ void CRYPTO_get_mem_debug_functions(void (**m)(void *,int,const char *,int,int), void *CRYPTO_malloc_locked(int num, const char *file, int line) { void *ret = NULL; - extern unsigned char cleanse_ctr; if (num <= 0) return NULL; @@ -267,11 +266,15 @@ 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; } @@ -291,7 +294,6 @@ void CRYPTO_free_locked(void *str) void *CRYPTO_malloc(int num, const char *file, int line) { void *ret = NULL; - extern unsigned char cleanse_ctr; if (num <= 0) return NULL; @@ -308,11 +310,15 @@ 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; } |