git://git.novaco.in
/
novacoin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a139ed7
)
Merge pull request #436 from TheBlueMatt/master
author
Pieter Wuille
<pieter.wuille@gmail.com>
Wed, 27 Jul 2011 20:10:47 +0000 (13:10 -0700)
committer
Pieter Wuille
<pieter.wuille@gmail.com>
Wed, 27 Jul 2011 20:10:47 +0000 (13:10 -0700)
Fix EncryptKeys crash introduced by a9ba471, identified by TD.
src/keystore.cpp
patch
|
blob
|
history
diff --git
a/src/keystore.cpp
b/src/keystore.cpp
index
2125d84
..
1828d6d
100644
(file)
--- a/
src/keystore.cpp
+++ b/
src/keystore.cpp
@@
-154,7
+154,7
@@
bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn)
CKey key;
BOOST_FOREACH(KeyMap::value_type& mKey, mapKeys)
{
- if (!key.SetPrivKey(mKey.second))
+ if (!key.SetSecret(mKey.second))
return false;
const std::vector<unsigned char> vchPubKey = key.GetPubKey();
std::vector<unsigned char> vchCryptedSecret;