aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/pubkey
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-03-31 10:35:55 -0400
committerJack Lloyd <[email protected]>2017-03-31 10:35:55 -0400
commit6ca6c87b31d8ac8cd6511adaf2061250857d799c (patch)
treecb867fd1eb7edba684f9320c1ed0314cdf779ae5 /src/lib/pubkey
parent741940091b802aed24be7a578ce853b4a00cd907 (diff)
Fix Doxygen comment errors
[ci skip]
Diffstat (limited to 'src/lib/pubkey')
-rw-r--r--src/lib/pubkey/pkcs8.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/pubkey/pkcs8.h b/src/lib/pubkey/pkcs8.h
index 014ce8714..71f10dd2f 100644
--- a/src/lib/pubkey/pkcs8.h
+++ b/src/lib/pubkey/pkcs8.h
@@ -151,7 +151,9 @@ BER_encode_encrypted_pbkdf_msec(const Private_Key& key,
* @param key the key to encode
* @param rng the rng to use
* @param pass the password to use for encryption
-* @param pbkdf_iter number of iterations to run PBKDF
+* @param pbkdf_msec how long in milliseconds to run PBKDF2
+* @param pbkdf_iterations (output argument) number of iterations of PBKDF
+* that ended up being used
* @param cipher if non-empty specifies the cipher to use. CBC and GCM modes
* are supported, for example "AES-128/CBC", "AES-256/GCM", "Serpent/CBC".
* If empty a suitable default is chosen.