diff options
| author | lloyd <[email protected]> | 2010-10-13 03:25:16 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-10-13 03:25:16 +0000 |
| commit | ba142ed2eaa21445d49cbbc8ae3b3d4dc625b9d7 (patch) | |
| tree | be1a9fa07d0ea26fd7713bb52205f7a3bcc3e907 /src/pbkdf/pbkdf2 | |
| parent | 406d4f8556d41083bfa551e7a777b0cb02925b6c (diff) | |
| parent | 5913bf42b4c32e43d0db11bf9299130f3b0b62a4 (diff) | |
propagate from branch 'net.randombit.botan' (head 2898d79f992f27a328a3e41d34b46eb1052da0de)
to branch 'net.randombit.botan.c++0x' (head 6cba76268fd69a73195760c021b7f881b8a6552c)
Diffstat (limited to 'src/pbkdf/pbkdf2')
| -rw-r--r-- | src/pbkdf/pbkdf2/pbkdf2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pbkdf/pbkdf2/pbkdf2.cpp b/src/pbkdf/pbkdf2/pbkdf2.cpp index 7e4d1cd8a..39d53d417 100644 --- a/src/pbkdf/pbkdf2/pbkdf2.cpp +++ b/src/pbkdf/pbkdf2/pbkdf2.cpp @@ -30,7 +30,7 @@ OctetString PKCS5_PBKDF2::derive_key(size_t key_len, catch(Invalid_Key_Length) { throw Exception(name() + " cannot accept passphrases of length " + - to_string(passphrase.length())); + std::to_string(passphrase.length())); } SecureVector<byte> key(key_len); |