Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use memwipe in a few relevant places

This commit is contained in:
moneromooo-monero 2017-10-26 10:21:06 +01:00
parent 000666ff78
commit 549508296d
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/password.cpp
View File

@ -46,6 +46,8 @@
#include "readline_buffer.h" #include "readline_buffer.h"
#endif #endif
#include "common/memwipe.h"
namespace namespace
{ {
#if defined(_WIN32) #if defined(_WIN32)
@ -163,8 +165,9 @@ namespace
void clear(std::string& pass) noexcept void clear(std::string& pass) noexcept
{ {
//! TODO Call a memory wipe function that hopefully is not optimized out // technically, the std::string documentation says the data should not be modified,
pass.replace(0, pass.capacity(), pass.capacity(), '\0'); // but there seems to be no way to get a non const raw pointer to the data
memwipe((void*)pass.data(), pass.size());
pass.clear(); pass.clear();
} }

5
src/crypto/chacha8.h
View File

@ -39,6 +39,7 @@
#if defined(__cplusplus) #if defined(__cplusplus)
#include <memory.h> #include <memory.h>
#include "common/memwipe.h"
#include "hash.h" #include "hash.h"
namespace crypto { namespace crypto {
@ -54,7 +55,7 @@ namespace crypto {
~chacha8_key() ~chacha8_key()
{ {
memset(data, 0, sizeof(data)); memwipe(data, sizeof(data));
} }
}; };
@ -75,7 +76,7 @@ namespace crypto {
char pwd_hash[HASH_SIZE]; char pwd_hash[HASH_SIZE];
crypto::cn_slow_hash(data, size, pwd_hash); crypto::cn_slow_hash(data, size, pwd_hash);
memcpy(&key, pwd_hash, sizeof(key)); memcpy(&key, pwd_hash, sizeof(key));
memset(pwd_hash, 0, sizeof(pwd_hash)); memwipe(pwd_hash, sizeof(pwd_hash));
} }
inline void generate_chacha8_key(std::string password, chacha8_key& key) { inline void generate_chacha8_key(std::string password, chacha8_key& key) {