mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-30 10:42:23 +02:00
wallet: doc: remove mentions of unavailable scrypt derivation method
These comments are there since wallet encryption was first introduced
(see commit 4e87d341f7
, PR #352), but scrypt
was actually never implemented as a derivation method.
This commit is contained in:
@ -23,7 +23,7 @@ const unsigned int WALLET_CRYPTO_IV_SIZE = 16;
|
|||||||
* derived using derivation method nDerivationMethod
|
* derived using derivation method nDerivationMethod
|
||||||
* (0 == EVP_sha512()) and derivation iterations nDeriveIterations.
|
* (0 == EVP_sha512()) and derivation iterations nDeriveIterations.
|
||||||
* vchOtherDerivationParameters is provided for alternative algorithms
|
* vchOtherDerivationParameters is provided for alternative algorithms
|
||||||
* which may require more parameters (such as scrypt).
|
* which may require more parameters.
|
||||||
*
|
*
|
||||||
* Wallet Private Keys are then encrypted using AES-256-CBC
|
* Wallet Private Keys are then encrypted using AES-256-CBC
|
||||||
* with the double-sha256 of the public key as the IV, and the
|
* with the double-sha256 of the public key as the IV, and the
|
||||||
@ -37,11 +37,9 @@ public:
|
|||||||
std::vector<unsigned char> vchCryptedKey;
|
std::vector<unsigned char> vchCryptedKey;
|
||||||
std::vector<unsigned char> vchSalt;
|
std::vector<unsigned char> vchSalt;
|
||||||
//! 0 = EVP_sha512()
|
//! 0 = EVP_sha512()
|
||||||
//! 1 = scrypt()
|
|
||||||
unsigned int nDerivationMethod;
|
unsigned int nDerivationMethod;
|
||||||
unsigned int nDeriveIterations;
|
unsigned int nDeriveIterations;
|
||||||
//! Use this for more parameters to key derivation,
|
//! Use this for more parameters to key derivation (currently unused)
|
||||||
//! such as the various parameters to scrypt
|
|
||||||
std::vector<unsigned char> vchOtherDerivationParameters;
|
std::vector<unsigned char> vchOtherDerivationParameters;
|
||||||
|
|
||||||
SERIALIZE_METHODS(CMasterKey, obj)
|
SERIALIZE_METHODS(CMasterKey, obj)
|
||||||
|
Reference in New Issue
Block a user