4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 11:56:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6133

Browse Source 
b2ad757f Replace memset with memwipe. (Bert Peters)
This commit is contained in:
Alexander Blair 2020-01-16 17:41:35 -08:00
commit f1ca98a7ef
No known key found for this signature in database
GPG Key ID: C64552D877C32479
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/epee/include/md5_l.h
View File

@ -85,7 +85,7 @@ namespace md5
MD5Update( &ctx, input, ilen ); MD5Update( &ctx, input, ilen );
MD5Final( output, &ctx); MD5Final( output, &ctx);
memset( &ctx, 0, sizeof( MD5_CTX) ); memwipe( &ctx, sizeof( MD5_CTX ));
return true; return true;
} }

9
src/crypto/blake256.c
View File

@ -40,6 +40,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <memwipe.h>
#include "blake256.h" #include "blake256.h"
#define U8TO32(p) \ #define U8TO32(p) \
@ -277,7 +278,7 @@ void hmac_blake256_init(hmac_state *S, const uint8_t *_key, uint64_t keylen) {
} }
blake256_update(&S->outer, pad, 512); blake256_update(&S->outer, pad, 512);
memset(keyhash, 0, 32); memwipe(keyhash, sizeof(keyhash));
} }
// keylen = number of bytes // keylen = number of bytes
@ -307,7 +308,7 @@ void hmac_blake224_init(hmac_state *S, const uint8_t *_key, uint64_t keylen) {
} }
blake224_update(&S->outer, pad, 512); blake224_update(&S->outer, pad, 512);
memset(keyhash, 0, 32); memwipe(keyhash, sizeof(keyhash));
} }
// datalen = number of bits // datalen = number of bits
@ -327,7 +328,7 @@ void hmac_blake256_final(hmac_state *S, uint8_t *digest) {
blake256_final(&S->inner, ihash); blake256_final(&S->inner, ihash);
blake256_update(&S->outer, ihash, 256); blake256_update(&S->outer, ihash, 256);
blake256_final(&S->outer, digest); blake256_final(&S->outer, digest);
memset(ihash, 0, 32); memwipe(ihash, sizeof(ihash));
} }
void hmac_blake224_final(hmac_state *S, uint8_t *digest) { void hmac_blake224_final(hmac_state *S, uint8_t *digest) {
@ -335,7 +336,7 @@ void hmac_blake224_final(hmac_state *S, uint8_t *digest) {
blake224_final(&S->inner, ihash); blake224_final(&S->inner, ihash);
blake224_update(&S->outer, ihash, 224); blake224_update(&S->outer, ihash, 224);
blake224_final(&S->outer, digest); blake224_final(&S->outer, digest);
memset(ihash, 0, 32); memwipe(ihash, sizeof(ihash));
} }
// keylen = number of bytes; inlen = number of bytes // keylen = number of bytes; inlen = number of bytes