DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Rename DecryptSpendingKey -> DecryptSproutSpendingKey

Browse Source
This commit is contained in:
Jack Grigg
2018-08-01 15:47:33 +01:00
parent 85beb9c9ca
commit adf2eadba2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/crypter.cpp
View File

@@ -134,7 +134,7 @@ static bool DecryptKey(const CKeyingMaterial& vMasterKey, const std::vector<unsi
return key.VerifyPubKey(vchPubKey); return key.VerifyPubKey(vchPubKey);
} }
static bool DecryptSpendingKey(const CKeyingMaterial& vMasterKey, static bool DecryptSproutSpendingKey(const CKeyingMaterial& vMasterKey,
const std::vector<unsigned char>& vchCryptedSecret, const std::vector<unsigned char>& vchCryptedSecret,
const libzcash::SproutPaymentAddress& address, const libzcash::SproutPaymentAddress& address,
libzcash::SproutSpendingKey& sk) libzcash::SproutSpendingKey& sk)
@@ -223,7 +223,7 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
const libzcash::SproutPaymentAddress &address = (*skmi).first; const libzcash::SproutPaymentAddress &address = (*skmi).first;
const std::vector<unsigned char> &vchCryptedSecret = (*skmi).second; const std::vector<unsigned char> &vchCryptedSecret = (*skmi).second;
libzcash::SproutSpendingKey sk; libzcash::SproutSpendingKey sk;
if (!DecryptSpendingKey(vMasterKeyIn, vchCryptedSecret, address, sk)) if (!DecryptSproutSpendingKey(vMasterKeyIn, vchCryptedSecret, address, sk))
{ {
keyFail = true; keyFail = true;
break; break;
@@ -408,7 +408,7 @@ bool CCryptoKeyStore::GetSpendingKey(const libzcash::SproutPaymentAddress &addre
if (mi != mapCryptedSpendingKeys.end()) if (mi != mapCryptedSpendingKeys.end())
{ {
const std::vector<unsigned char> &vchCryptedSecret = (*mi).second; const std::vector<unsigned char> &vchCryptedSecret = (*mi).second;
return DecryptSpendingKey(vMasterKey, vchCryptedSecret, address, skOut); return DecryptSproutSpendingKey(vMasterKey, vchCryptedSecret, address, skOut);
} }
} }
return false; return false;