Merge pull request #436 from TheBlueMatt/master

Fix EncryptKeys crash introduced by a9ba471, identified by TD.
This commit is contained in:
Pieter Wuille 2011-07-27 13:10:47 -07:00
commit e1f13129e8

View File

@ -154,7 +154,7 @@ bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn)
CKey key; CKey key;
BOOST_FOREACH(KeyMap::value_type& mKey, mapKeys) BOOST_FOREACH(KeyMap::value_type& mKey, mapKeys)
{ {
if (!key.SetPrivKey(mKey.second)) if (!key.SetSecret(mKey.second))
return false; return false;
const std::vector<unsigned char> vchPubKey = key.GetPubKey(); const std::vector<unsigned char> vchPubKey = key.GetPubKey();
std::vector<unsigned char> vchCryptedSecret; std::vector<unsigned char> vchCryptedSecret;