diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2011-07-27 13:10:47 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2011-07-27 13:10:47 -0700 |
| commit | e1f13129e89f46df631f9523eea4c0e0448c9b7b (patch) | |
| tree | ac5d0ee6dbc507af6958d202736bbbae1e651b98 | |
| parent | a139ed74f2a5764afbd678c0e4eb6143455a3a49 (diff) | |
| parent | 687c82558cc568f37eb1fb24bfb3c351e49d6735 (diff) | |
| download | bitcoin-e1f13129e89f46df631f9523eea4c0e0448c9b7b.tar.xz | |
Merge pull request #436 from TheBlueMatt/master
Fix EncryptKeys crash introduced by a9ba471, identified by TD.
| -rw-r--r-- | src/keystore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keystore.cpp b/src/keystore.cpp index 2125d8472a..1828d6dddc 100644 --- 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; |