aboutsummaryrefslogtreecommitdiffstats
path: root/src/pbkdf
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-07-09 19:45:46 +0000
committerlloyd <[email protected]>2012-07-09 19:45:46 +0000
commit0dffe4ce78737a8d2d2861621705728c2b08c279 (patch)
tree679ab6d0df25a5ea329a4c98eadc51851d34d167 /src/pbkdf
parente20279e07b37f9cff036b6e4bd6e11532de0f363 (diff)
More Doxygen warning fixes
Diffstat (limited to 'src/pbkdf')
-rw-r--r--src/pbkdf/pbkdf.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pbkdf/pbkdf.h b/src/pbkdf/pbkdf.h
index 176ed0302..2508dc6a3 100644
--- a/src/pbkdf/pbkdf.h
+++ b/src/pbkdf/pbkdf.h
@@ -68,6 +68,9 @@ class BOTAN_DLL PBKDF : public Algorithm
* @param salt a randomly chosen salt
* @param salt_len length of salt in bytes
* @param iterations the number of iterations to use (use 10K or more)
+ * @param msec if iterations is zero, then instead the PBKDF is
+ * run until msec milliseconds has passed.
+ * @return the number of iterations performed and the derived key
*/
virtual std::pair<size_t, OctetString>
key_derivation(size_t output_len,