aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2012-02-11 15:02:05 -0800
committerPieter Wuille <pieter.wuille@gmail.com>2012-02-11 15:02:05 -0800
commit7c39b56c3b00820256a735e4faa37e16b586fc94 (patch)
tree2310da64b51ae15341d9e016fe102c995791a752 /src
parentb25474d1bea42ab6e20fb2b86714db0ece8f1c74 (diff)
parentcd5ee3bbb4767dda47a4e8d2e929ae38c5397595 (diff)
downloadbitcoin-7c39b56c3b00820256a735e4faa37e16b586fc94.tar.xz
Merge pull request #827 from sipa/fixencrypt
Fix wallet encryption with compressed pubkeys
Diffstat (limited to 'src')
-rw-r--r--src/keystore.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keystore.cpp b/src/keystore.cpp
index 4a59010fdb..18e5c377dc 100644
--- a/src/keystore.cpp
+++ b/src/keystore.cpp
@@ -192,7 +192,7 @@ bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn)
BOOST_FOREACH(KeyMap::value_type& mKey, mapKeys)
{
CKey key;
- if (!key.SetSecret(mKey.second.first, false))
+ if (!key.SetSecret(mKey.second.first, mKey.second.second))
return false;
const std::vector<unsigned char> vchPubKey = key.GetPubKey();
std::vector<unsigned char> vchCryptedSecret;