diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-27 01:28:11 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-27 01:28:11 +0200 |
| commit | 9d6a7ae25d7f5da855a8f8df884de483b4e2a538 (patch) | |
| tree | e7688d4faf1bdaeabb554a9335870384a20c0418 /security/nss/lib | |
| parent | 42f8488a5f66d7c1e5324bd1755d7f693b16ee97 (diff) | |
| parent | 69ac2db1298d263300b6f1b9e88d01215d7ecc77 (diff) | |
| download | UXP-2018.04.27.tar UXP-2018.04.27.tar.gz UXP-2018.04.27.tar.lz UXP-2018.04.27.tar.xz UXP-2018.04.27.zip | |
Merge branch 'master' into Basilisk-releasev2018.04.27
Diffstat (limited to 'security/nss/lib')
| -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; |