diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-26 19:23:01 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-26 19:23:01 -0400 |
| commit | 69ac2db1298d263300b6f1b9e88d01215d7ecc77 (patch) | |
| tree | bf4e06efae141a3ffe00f618ba6a1481625f8859 /security/nss | |
| parent | 9a97c58feb8f14bb8be720e2cac5db017b4523d3 (diff) | |
| download | UXP-69ac2db1298d263300b6f1b9e88d01215d7ecc77.tar UXP-69ac2db1298d263300b6f1b9e88d01215d7ecc77.tar.gz UXP-69ac2db1298d263300b6f1b9e88d01215d7ecc77.tar.lz UXP-69ac2db1298d263300b6f1b9e88d01215d7ecc77.tar.xz UXP-69ac2db1298d263300b6f1b9e88d01215d7ecc77.zip | |
Partially revert 1ef526f0f - sftkpwd.c
#82 #265
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 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; |