Uprev NSS to 3.18 RTM

nss/lib/softoken/lowpbe.c

Index: nss/lib/softoken/lowpbe.c
diff --git a/nss/lib/softoken/lowpbe.c b/nss/lib/softoken/lowpbe.c
index d976d5762157185aa7c1442697ef6beac8900cbb..c0949fec0add45d9243a47ef2b057b955a712bf8 100644
--- a/nss/lib/softoken/lowpbe.c
+++ b/nss/lib/softoken/lowpbe.c
@@ -319,8 +319,8 @@ do_xor(unsigned char *dest, unsigned char *src, int len)
 }
 
 static SECStatus
-nsspkcs5_PBKFD2_F(const SECHashObject *hashobj, SECItem *pwitem, SECItem *salt,
-			int iterations, unsigned int i, unsigned char *T)
+nsspkcs5_PBKDF2_F(const SECHashObject *hashobj, SECItem *pwitem, SECItem *salt,
+                  int iterations, unsigned int i, unsigned char *T)
 {
     int j;
     HMACContext *cx = NULL;
@@ -393,7 +393,7 @@ nsspkcs5_PBKDF2(const SECHashObject *hashobj, NSSPKCS5PBEParameter *pbe_param,
     }
 
     for (i=1,rp=result->data; i <= nblocks ; i++, rp +=hLen) {
-	rv = nsspkcs5_PBKFD2_F(hashobj,pwitem,salt,iterations,i,T);
+        rv = nsspkcs5_PBKDF2_F(hashobj, pwitem, salt, iterations, i, T);
 	if (rv != SECSuccess) {
 	    break;
 	}
@@ -410,7 +410,7 @@ loser:
     } else {
 	result->len = dkLen;
     }
-	
+
     return result;
 }
 #endif