Optimized OPENSSL_cleanse [from HEAD].

diff --git a/crypto/mem_clr.c b/crypto/mem_clr.c
index 75cbfb374e3bd4e09af7e9dd0999a7e39a8b0c32..add1f780207b7a75f56264c8851bc1ac1af788e2 100644 (file)
--- a/crypto/mem_clr.c
+++ b/crypto/mem_clr.c
@@ -64,12 +64,14 @@ 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;
+       p=memchr(ptr, (unsigned char)ctr, len);
+       if(p)
+               ctr += (63 + (size_t)p);
+       cleanse_ctr = (unsigned char)ctr;
        }