diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-27 10:11:35 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-27 10:11:35 +0200 |
| commit | 3280ec817ed45e0015bb7207714ea5042301fe64 (patch) | |
| tree | bc62a408d1d08804175f87c0b949b73b26c04d7b /security | |
| parent | fc60f65ed16aa02e21387639973d88f717ca98bb (diff) | |
| parent | 8acbae697958b7abfbb9ea5806646ebb2cea5f87 (diff) | |
| download | UXP-3280ec817ed45e0015bb7207714ea5042301fe64.tar UXP-3280ec817ed45e0015bb7207714ea5042301fe64.tar.gz UXP-3280ec817ed45e0015bb7207714ea5042301fe64.tar.lz UXP-3280ec817ed45e0015bb7207714ea5042301fe64.tar.xz UXP-3280ec817ed45e0015bb7207714ea5042301fe64.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into pm_permissions_1
Diffstat (limited to 'security')
| -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 68f6e4152..0b8c91bfd 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, - 30000); + 1); 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, 30000); + param = nsspkcs5_NewParam(signValue.alg, HASH_AlgSHA1, &signValue.salt, 1); if (param == NULL) { rv = SECFailure; goto loser; |