Browse Source

Merge branch 'master' of https://github.com/bitcoin/bitcoin

miguelfreitas
Wladimir J. van der Laan 14 years ago
parent
commit
53d65b5500
  1. 2
      src/keystore.cpp

2
src/keystore.cpp

@ -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;

Loading…
Cancel
Save