mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 23:07:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix code style in keystore.cpp/crypter.cpp

Browse source
This commit is contained in:
Jonas Schnelli 2017-10-06 20:56:43 -07:00
parent 208fda69b3
commit dd9bb253c3
No known key found for this signature in database
GPG key ID: 1EB776BB03C7922D
2 changed files with 66 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/keystore.cpp
View file

@ -53,16 +53,13 @@ std::set<CKeyID> CBasicKeyStore::GetKeys() const
}
bool CBasicKeyStore::GetKey(const CKeyID &address, CKey &keyOut) const
{
{
LOCK(cs_KeyStore);
KeyMap::const_iterator mi = mapKeys.find(address);
if (mi != mapKeys.end())
{
if (mi != mapKeys.end()) {
keyOut = mi->second;
return true;
}
}
return false;
}

38
src/wallet/crypter.cpp
View file

@ -155,14 +155,11 @@ bool CCryptoKeyStore::SetCrypted()
bool CCryptoKeyStore::IsLocked() const
{
if (!IsCrypted())
if (!IsCrypted()) {
return false;
bool result;
{
LOCK(cs_KeyStore);
result = vMasterKey.empty();
}
return result;
LOCK(cs_KeyStore);
return vMasterKey.empty();
}
bool CCryptoKeyStore::Lock()
@ -218,21 +215,23 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
}
bool CCryptoKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)
{
{
LOCK(cs_KeyStore);
if (!IsCrypted())
if (!IsCrypted()) {
return CBasicKeyStore::AddKeyPubKey(key, pubkey);
}
if (IsLocked())
if (IsLocked()) {
return false;
}
std::vector<unsigned char> vchCryptedSecret;
CKeyingMaterial vchSecret(key.begin(), key.end());
if (!EncryptSecret(vMasterKey, vchSecret, pubkey.GetHash(), vchCryptedSecret))
if (!EncryptSecret(vMasterKey, vchSecret, pubkey.GetHash(), vchCryptedSecret)) {
return false;
}
if (!AddCryptedKey(pubkey, vchCryptedSecret))
if (!AddCryptedKey(pubkey, vchCryptedSecret)) {
return false;
}
return true;
@ -240,19 +239,17 @@ bool CCryptoKeyStore::AddKeyPubKey(const CKey& key, const CPubKey &pubkey)
bool CCryptoKeyStore::AddCryptedKey(const CPubKey &vchPubKey, const std::vector<unsigned char> &vchCryptedSecret)
{
{
LOCK(cs_KeyStore);
if (!SetCrypted())
if (!SetCrypted()) {
return false;
}
mapCryptedKeys[vchPubKey.GetID()] = make_pair(vchPubKey, vchCryptedSecret);
}
return true;
}
bool CCryptoKeyStore::HaveKey(const CKeyID &address) const
{
{
LOCK(cs_KeyStore);
if (!IsCrypted()) {
@ -260,15 +257,13 @@ bool CCryptoKeyStore::HaveKey(const CKeyID &address) const
}
return mapCryptedKeys.count(address) > 0;
}
return false;
}
bool CCryptoKeyStore::GetKey(const CKeyID &address, CKey& keyOut) const
{
{
LOCK(cs_KeyStore);
if (!IsCrypted())
if (!IsCrypted()) {
return CBasicKeyStore::GetKey(address, keyOut);
}
CryptedKeyMap::const_iterator mi = mapCryptedKeys.find(address);
if (mi != mapCryptedKeys.end())
@ -277,12 +272,10 @@ bool CCryptoKeyStore::GetKey(const CKeyID &address, CKey& keyOut) const
const std::vector<unsigned char> &vchCryptedSecret = (*mi).second.second;
return DecryptKey(vMasterKey, vchCryptedSecret, vchPubKey, keyOut);
}
}
return false;
}
bool CCryptoKeyStore::GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const
{
{
LOCK(cs_KeyStore);
if (!IsCrypted())
@ -297,7 +290,6 @@ bool CCryptoKeyStore::GetPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) co
// Check for watch-only pubkeys
return CBasicKeyStore::GetPubKey(address, vchPubKeyOut);
}
}
std::set<CKeyID> CCryptoKeyStore::GetKeys() const
{
@ -313,7 +305,6 @@ std::set<CKeyID> CCryptoKeyStore::GetKeys() const
}
bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn)
{
{
LOCK(cs_KeyStore);
if (!mapCryptedKeys.empty() || IsCrypted())
@ -332,6 +323,5 @@ bool CCryptoKeyStore::EncryptKeys(CKeyingMaterial& vMasterKeyIn)
return false;
}
mapKeys.clear();
}
return true;
}