Skip to content
Permalink
Browse files

RT4116: Change cleanse to just memset

See also the discussion in #455

Reviewed-by: Andy Polyakov <appro@openssl.org>
  • Loading branch information...
richsalz committed Feb 25, 2016
1 parent 380f18e commit 104ce8a9f02d250dd43c255eb7b8747e81b29422
Showing with 9 additions and 16 deletions.
  1. +9 −16 crypto/mem_clr.c
@@ -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);
}

2 comments on commit 104ce8a

@ghedo

This comment has been minimized.

Copy link
Contributor

ghedo replied Feb 25, 2016

No attribution, not even a based on patch from..." :(

@richsalz

This comment has been minimized.

Copy link
Contributor Author

richsalz replied Feb 25, 2016

sorry. i rushed.

Please sign in to comment.
You can’t perform that action at this time.