Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/softoken/sftkpwd.c

Index: nss/lib/softoken/sftkpwd.c
diff --git a/nss/lib/softoken/sftkpwd.c b/nss/lib/softoken/sftkpwd.c
index d8ce857757d65986c59bfa3d42257e914ca5074f..f17da7e00f5074baa475ae340cc403bda907ca3d 100644
--- a/nss/lib/softoken/sftkpwd.c
+++ b/nss/lib/softoken/sftkpwd.c
@@ -277,7 +277,8 @@ sftkdb_EncryptAttribute(PLArenaPool *arena, SECItem *passKey,
     cipherValue.salt.data = saltData;
     RNG_GenerateGlobalRandomBytes(saltData,cipherValue.salt.len);
 
-    param = nsspkcs5_NewParam(cipherValue.alg, &cipherValue.salt, 1);
+    param = nsspkcs5_NewParam(cipherValue.alg, HASH_AlgSHA1, &cipherValue.salt,
+                              1);
     if (param == NULL) {
 	rv = SECFailure;
 	goto loser;
@@ -449,7 +450,7 @@ sftkdb_SignAttribute(PLArenaPool *arena, SECItem *passKey,
     RNG_GenerateGlobalRandomBytes(saltData,prfLength);
 
     /* initialize our pkcs5 parameter */
-    param = nsspkcs5_NewParam(signValue.alg, &signValue.salt, 1);
+    param = nsspkcs5_NewParam(signValue.alg, HASH_AlgSHA1, &signValue.salt, 1);
     if (param == NULL) {
 	rv = SECFailure;
 	goto loser;