diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-18 15:50:29 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-18 15:50:29 +0200 |
| commit | 75b26b28bf2189dd9e0d310f332a4620bd294b7f (patch) | |
| tree | cecd45a7313dac5b12e5bfd5afb465513a5fb643 /security/nss | |
| parent | b16ad4c6724aed73063852f082d8847a88358b9f (diff) | |
| parent | fe15bb43decc414a6f57301da049b34f488556ab (diff) | |
| download | UXP-75b26b28bf2189dd9e0d310f332a4620bd294b7f.tar UXP-75b26b28bf2189dd9e0d310f332a4620bd294b7f.tar.gz UXP-75b26b28bf2189dd9e0d310f332a4620bd294b7f.tar.lz UXP-75b26b28bf2189dd9e0d310f332a4620bd294b7f.tar.xz UXP-75b26b28bf2189dd9e0d310f332a4620bd294b7f.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_dom_window_requestIdleCallback_1
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/lib/softoken/sftkpwd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/nss/lib/softoken/sftkpwd.c b/security/nss/lib/softoken/sftkpwd.c index e0d2df9ab..07b6922dc 100644 --- a/security/nss/lib/softoken/sftkpwd.c +++ b/security/nss/lib/softoken/sftkpwd.c @@ -273,7 +273,7 @@ sftkdb_EncryptAttribute(PLArenaPool *arena, SECItem *passKey, RNG_GenerateGlobalRandomBytes(saltData, cipherValue.salt.len); param = nsspkcs5_NewParam(cipherValue.alg, HASH_AlgSHA1, &cipherValue.salt, - 1); + 30000); if (param == NULL) { rv = SECFailure; goto loser; @@ -444,7 +444,7 @@ sftkdb_SignAttribute(PLArenaPool *arena, SECItem *passKey, RNG_GenerateGlobalRandomBytes(saltData, prfLength); /* initialize our pkcs5 parameter */ - param = nsspkcs5_NewParam(signValue.alg, HASH_AlgSHA1, &signValue.salt, 1); + param = nsspkcs5_NewParam(signValue.alg, HASH_AlgSHA1, &signValue.salt, 30000); if (param == NULL) { rv = SECFailure; goto loser; |