aboutsummaryrefslogtreecommitdiffstats
path: root/src/pubkey
diff options
context:
space:
mode:
authorlloyd <[email protected]>2013-04-04 14:33:28 +0000
committerlloyd <[email protected]>2013-04-04 14:33:28 +0000
commit1a9d22bd22653c2eeaed0d8098facacb39c80dc1 (patch)
treee8b3af5c4c05cc2fdc58f11d6abd1f6875a08a48 /src/pubkey
parent1f1b5ac0d8bf3646c72bd2cb0616fd1c06e21320 (diff)
Change the default PKCS #8 PBKDF runtime from 200 to 300 milliseconds.
Round PBKDF1 and PBKDF2 time-based iterations to multiples of 10000 instead of 8192. Update the password hashing docs a bit.
Diffstat (limited to 'src/pubkey')
-rw-r--r--src/pubkey/pkcs8.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pubkey/pkcs8.h b/src/pubkey/pkcs8.h
index 04de723a6..302003ad4 100644
--- a/src/pubkey/pkcs8.h
+++ b/src/pubkey/pkcs8.h
@@ -57,7 +57,7 @@ BOTAN_DLL std::vector<byte>
BER_encode(const Private_Key& key,
RandomNumberGenerator& rng,
const std::string& pass,
- std::chrono::milliseconds msec = std::chrono::milliseconds(200),
+ std::chrono::milliseconds msec = std::chrono::milliseconds(300),
const std::string& pbe_algo = "");
/**
@@ -76,7 +76,7 @@ BOTAN_DLL std::string
PEM_encode(const Private_Key& key,
RandomNumberGenerator& rng,
const std::string& pass,
- std::chrono::milliseconds msec = std::chrono::milliseconds(200),
+ std::chrono::milliseconds msec = std::chrono::milliseconds(300),
const std::string& pbe_algo = "");
/**