From 649ab2dcfa7e93110858ef6d0c172acfddc7f6b5 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 20 Jun 2007 17:37:09 +0000 Subject: [PATCH] Optimize OPENSSL_cleanse [from HEAD]. --- crypto/mem_clr.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/crypto/mem_clr.c b/crypto/mem_clr.c index 75cbfb374e..00dfcff0cf 100644 --- a/crypto/mem_clr.c +++ b/crypto/mem_clr.c @@ -64,12 +64,13 @@ unsigned char cleanse_ctr = 0; void OPENSSL_cleanse(void *ptr, size_t len) { unsigned char *p = ptr; - size_t loop = len; + size_t loop = len, ctr = cleanse_ctr; while(loop--) { - *(p++) = cleanse_ctr; - cleanse_ctr += (17 + (unsigned char)((unsigned long)p & 0xF)); + *(p++) = (unsigned char)ctr; + ctr += (17 + ((size_t)p & 0xF)); } - if(memchr(ptr, cleanse_ctr, len)) - cleanse_ctr += 63; + if(p=memchr(ptr, (unsigned char)ctr, len)) + ctr += (63 + (size_t)p); + cleanse_ctr = (unsigned char)ctr; } -- 2.25.1