diff options
| author | lloyd <[email protected]> | 2010-06-15 22:30:24 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-06-15 22:30:24 +0000 |
| commit | bbe5daf0647a2f0953f1d99272b4e8fbf8d3b6b5 (patch) | |
| tree | b6082b659624e0fd7c7f7938553f22c8d75b6670 | |
| parent | 7dbef9e3e2efd2354bb4ca97fca0d720a8957db4 (diff) | |
| parent | 72f7d1292bf9a38013e9f69a7db4fa262064795c (diff) | |
merge of 'beaa845172bcf34c757ab1428e921d996a275c6c'
and 'cf2b4d27dda134f49f065face1da51645bfbde57'
| -rw-r--r-- | doc/log.txt | 1 | ||||
| -rw-r--r-- | src/pbe/pbes1/pbes1.cpp | 2 | ||||
| -rw-r--r-- | src/pbe/pbes2/pbes2.cpp | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/log.txt b/doc/log.txt index 87d40ab7c..76ee9dae8 100644 --- a/doc/log.txt +++ b/doc/log.txt @@ -1,5 +1,6 @@ * 1.9.9-dev, ????-??-?? + - Increase default iteration counts for private key encryption * 1.9.8, 2010-06-14 - Add support for wide multiplications on 64-bit Windows diff --git a/src/pbe/pbes1/pbes1.cpp b/src/pbe/pbes1/pbes1.cpp index 36cfaa6b4..a3e08d679 100644 --- a/src/pbe/pbes1/pbes1.cpp +++ b/src/pbe/pbes1/pbes1.cpp @@ -93,7 +93,7 @@ void PBE_PKCS5v15::set_key(const std::string& passphrase) */ void PBE_PKCS5v15::new_params(RandomNumberGenerator& rng) { - iterations = 2048; + iterations = 10000; salt.resize(8); rng.randomize(salt, salt.size()); } diff --git a/src/pbe/pbes2/pbes2.cpp b/src/pbe/pbes2/pbes2.cpp index 79d4dfadf..4a28193e1 100644 --- a/src/pbe/pbes2/pbes2.cpp +++ b/src/pbe/pbes2/pbes2.cpp @@ -97,10 +97,10 @@ void PBE_PKCS5v20::set_key(const std::string& passphrase) */ void PBE_PKCS5v20::new_params(RandomNumberGenerator& rng) { - iterations = 2048; + iterations = 10000; key_length = block_cipher->MAXIMUM_KEYLENGTH; - salt.resize(8); + salt.resize(12); rng.randomize(salt, salt.size()); iv.resize(block_cipher->BLOCK_SIZE); |