[Sapling] Add Sapling decryption check to CCryptoKeyStore::Unlock().

furszy · furszy · commit ada3bb724b5e · 2020-08-02T23:03:38.000-03:00
Coming from 0adba6789b1b36387ee06248273540fc30dd9d40 .
diff --git a/src/crypter.h b/src/crypter.h
@@ -154,6 +154,9 @@ class CCryptoKeyStore : public CBasicKeyStore
 
     CryptedKeyMap mapCryptedKeys;
 
+    // Unlock Sapling keys
+    bool UnlockSaplingKeys(const CKeyingMaterial& vMasterKeyIn, bool fDecryptionThoroughlyChecked);
+
 public:
     CCryptoKeyStore() : fUseCrypto(false) { }
 
diff --git a/src/sapling/crypter_sapling.cpp b/src/sapling/crypter_sapling.cpp
@@ -119,4 +119,33 @@ bool CCryptoKeyStore::EncryptSaplingKeys(CKeyingMaterial& vMasterKeyIn)
     }
     mapSaplingSpendingKeys.clear();
     return true;
+}
+
+bool CCryptoKeyStore::UnlockSaplingKeys(const CKeyingMaterial& vMasterKeyIn, bool fDecryptionThoroughlyChecked)
+{
+    bool keyFail = false;
+    bool keyPass = false;
+    CryptedSaplingSpendingKeyMap::const_iterator miSapling = mapCryptedSaplingSpendingKeys.begin();
+    for (; miSapling != mapCryptedSaplingSpendingKeys.end(); ++miSapling) {
+        const libzcash::SaplingFullViewingKey &fvk = (*miSapling).first;
+        const std::vector<unsigned char> &vchCryptedSecret = (*miSapling).second;
+        libzcash::SaplingSpendingKey sk;
+        if (!DecryptSaplingSpendingKey(vMasterKeyIn, vchCryptedSecret, fvk, sk))
+        {
+            keyFail = true;
+            break;
+        }
+        keyPass = true;
+        if (fDecryptionThoroughlyChecked)
+            break;
+    }
+
+    if (keyPass && keyFail) {
+        LogPrintf("Sapling wallet is probably corrupted: Some keys decrypt but not all.");
+        throw std::runtime_error("Error unlocking sapling wallet: some keys decrypt but not all. Your wallet file may be corrupt.");
+    }
+    if (keyFail || !keyPass)
+        return false;
+
+    return true;
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -338,6 +338,12 @@ bool CWallet::Unlock(const CKeyingMaterial& vMasterKeyIn)
             if (fDecryptionThoroughlyChecked)
                 break;
         }
+
+        // Sapling
+        if (!UnlockSaplingKeys(vMasterKeyIn, fDecryptionThoroughlyChecked)) {
+            return false; // only could get here if (keyFail || !keyPass).
+        }
+
         if (keyPass && keyFail) {
             LogPrintf("The wallet is probably corrupted: Some keys decrypt but not all.");
             throw std::runtime_error("Error unlocking wallet: some keys decrypt but not all. Your wallet file may be corrupt.");
