chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58 from fmarier/cachedpbkdf2_docs 

jsdoc: fix param names in misc.cachedPbkdf2
This commit is contained in:
bitwiseshiftleft 2012-06-18 23:10:16 -07:00
parent 181e2c73d1 a7f830229d
commit ec303b26ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/convenience.js
View File

@ -255,8 +255,8 @@ sjcl.decrypt = sjcl.json.decrypt;
sjcl.misc._pbkdf2Cache = {}; sjcl.misc._pbkdf2Cache = {};
/** Cached PBKDF2 key derivation. /** Cached PBKDF2 key derivation.
* @param {String} The password. * @param {String} password The password.
* @param {Object} The derivation params (iteration count and optional salt). * @param {Object} [params] The derivation params (iteration count and optional salt).
* @return {Object} The derived data in key, the salt in salt. * @return {Object} The derived data in key, the salt in salt.
*/ */
sjcl.misc.cachedPbkdf2 = function (password, obj) { sjcl.misc.cachedPbkdf2 = function (password, obj) {