1 files changed, 7 insertions, 5 deletions

diff --git a/src/lib/libcrypto/mem_clr.c b/src/lib/libcrypto/mem_clr.c
index e4b7f540b0..add1f78020 100644
--- a/src/lib/libcrypto/mem_clr.c
+++ b/src/lib/libcrypto/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)((int)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;
         }