Merge pull request #5319

35f7227 Clean up wallet encryption code. (Daniel Kraft)
This commit is contained in:
Wladimir J. van der Laan
2015-02-04 13:51:40 +01:00
2 changed files with 17 additions and 25 deletions

View File

@@ -107,9 +107,6 @@ public:
}
};
bool EncryptSecret(const CKeyingMaterial& vMasterKey, const CKeyingMaterial &vchPlaintext, const uint256& nIV, std::vector<unsigned char> &vchCiphertext);
bool DecryptSecret(const CKeyingMaterial& vMasterKey, const std::vector<unsigned char>& vchCiphertext, const uint256& nIV, CKeyingMaterial& vchPlaintext);
/** Keystore which keeps the private keys encrypted.
* It derives from the basic key store, which is used if no encryption is active.
*/