Skip to content

Commit

Permalink
RT4116: Change cleanse to just memset
Browse files Browse the repository at this point in the history
See also the discussion in #455

Reviewed-by: Andy Polyakov <appro@openssl.org>
  • Loading branch information
richsalz authored and Rich Salz committed Feb 25, 2016
1 parent 380f18e commit 104ce8a
Showing 1 changed file with 9 additions and 16 deletions.
25 changes: 9 additions & 16 deletions crypto/mem_clr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@ghedo ghedo commented on 104ce8a Feb 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@richsalz
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry. i rushed.

Please sign in to comment.