提交 104ce8a9 编写于 作者: R Rich Salz 提交者: Rich Salz

RT4116: Change cleanse to just memset

See also the discussion in https://github.com/openssl/openssl/pull/455Reviewed-by: NAndy Polyakov <appro@openssl.org>
上级 380f18ed
......@@ -59,23 +59,16 @@
#include <string.h>
#include <openssl/crypto.h>
extern unsigned char cleanse_ctr;
unsigned char cleanse_ctr = 0;
/*
* Pointer to memset is volatile so that compiler must de-reference
* the pointer and can't assume that it points to any function in
* particular (such as memset, which it then might further "optimize")
*/
typedef void *(*memset_t)(void *,int,size_t);
static volatile memset_t memset_func = memset;
void OPENSSL_cleanse(void *ptr, size_t len)
{
unsigned char *p = ptr;
size_t loop = len, ctr = cleanse_ctr;
if (ptr == NULL)
return;
while (loop--) {
*(p++) = (unsigned char)ctr;
ctr += (17 + ((size_t)p & 0xF));
}
p = memchr(ptr, (unsigned char)ctr, len);
if (p)
ctr += (63 + (size_t)p);
cleanse_ctr = (unsigned char)ctr;
memset_func(ptr, 0, len);
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册