From bb1499d2aac1d25a95b8573ff425751f06f159e1 Mon Sep 17 00:00:00 2001 From: "Simon L. B. Nielsen" Date: Sun, 21 Sep 2008 14:56:30 +0000 Subject: Vendor import of OpenSSL 0.9.8i. --- crypto/mem_clr.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'crypto/mem_clr.c') diff --git a/crypto/mem_clr.c b/crypto/mem_clr.c index 75cbfb374e3bd..add1f780207b7 100644 --- 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; } -- cgit v1.2.3