diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-11-08 23:39:41 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-11-08 23:39:41 -0800 |
| commit | 90b5aadf56168caa6af8067860c4a01e5bdab666 (patch) | |
| tree | 035780597cc5ea46df8af11f37d6f98d4215f4a3 /src/crypter.h | |
| parent | 0fb0a38339e5cb404147c89f73ff10d962a47ca5 (diff) | |
| parent | d825e6a31bf980dde8afd94fba61614523e60f09 (diff) | |
| download | bitcoin-90b5aadf56168caa6af8067860c4a01e5bdab666.tar.xz | |
Merge pull request #611 from sipa/docs
Some extra comments
Diffstat (limited to 'src/crypter.h')
| -rw-r--r-- | src/crypter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/crypter.h b/src/crypter.h index 5b95ea415e..e8ca30a8cc 100644 --- a/src/crypter.h +++ b/src/crypter.h @@ -13,15 +13,15 @@ const unsigned int WALLET_CRYPTO_SALT_SIZE = 8; Private key encryption is done based on a CMasterKey, which holds a salt and random encryption key. -CMasterKeys is encrypted using AES-256-CBC using a key +CMasterKeys are encrypted using AES-256-CBC using a key derived using derivation method nDerivationMethod (0 == EVP_sha512()) and derivation iterations nDeriveIterations. vchOtherDerivationParameters is provided for alternative algorithms which may require more parameters (such as scrypt). Wallet Private Keys are then encrypted using AES-256-CBC -with the double-sha256 of the private key as the IV, and the -master key's key as the encryption key. +with the double-sha256 of the public key as the IV, and the +master key's key as the encryption key (see keystore.[ch]). */ class CMasterKey |