diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-29 14:45:54 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-07-29 14:45:54 +0200 |
| commit | 53d65b5500bf56f600b98bb7435d24c8ab76d12e (patch) | |
| tree | 1f82f0eec0c61e594a3aaa1648b037df2e4adc86 /src | |
| parent | ee014e5b10f5f65820ff056311051ff49813b294 (diff) | |
| parent | e1f13129e89f46df631f9523eea4c0e0448c9b7b (diff) | |
| download | bitcoin-53d65b5500bf56f600b98bb7435d24c8ab76d12e.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src')
| -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; |