diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:26:56 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:26:56 +0000 |
| commit | f1a9aad7893173b0351ad32e684dad6f31598210 (patch) | |
| tree | 21373860cc7f22da72e28d97263813f53e450920 /src/crypter.h | |
| parent | 8b11b682f14f20cf2935c4a5abb4dbd3d508e46e (diff) | |
| parent | 8045273a015cc72857ca168b0ad224b3acbbaf8a (diff) | |
| download | bitcoin-f1a9aad7893173b0351ad32e684dad6f31598210.tar.xz | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/init.cpp
src/main.cpp
src/serialize.h
Diffstat (limited to 'src/crypter.h')
| -rw-r--r-- | src/crypter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/crypter.h b/src/crypter.h index d1bdb92c91..f46c32a227 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -76,8 +76,8 @@ public: void CleanKey() { - memset(&chKey, 0, sizeof chKey); - memset(&chIV, 0, sizeof chIV); + OPENSSL_cleanse(chKey, sizeof(chKey)); + OPENSSL_cleanse(chIV, sizeof(chIV)); munlock(&chKey, sizeof chKey); munlock(&chIV, sizeof chIV); fKeySet = false; |