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

2011-07-29 14:45:54 +02:00 · 2011-07-29 14:45:54 +02:00 · 53d65b5500
parent ee014e5b10 e1f13129e8
commit 53d65b5500
1 changed files with 1 additions and 1 deletions
--- 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;