Uprev NSS to 3.18 RTM

nss/lib/softoken/lowpbe.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "plarena.h"
 
 #include "seccomon.h"
 #include "secitem.h"
 #include "secport.h"
 #include "hasht.h"
@@ skipping 301 matching lines @@
    /* use byt xor, not all platforms are happy about inaligned 
     * integer fetches */
     while (len--) {
         *dest = *dest ^ *src;
         dest++;
         src++;
     }
 }
 
 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;
     unsigned int hLen = hashobj->length;
     SECStatus rv = SECFailure;
     unsigned char *last = NULL;
     unsigned int lastLength = salt->len + 4;
     unsigned int lastBufLength;
 
     cx=HMAC_Create(hashobj,pwitem->data,pwitem->len,PR_FALSE);
@@ skipping 52 matching lines @@
     if (result == NULL) {
         return NULL;
     }
 
     T = PORT_Alloc(hLen);
     if (T == NULL) {
         goto loser;
     }
 
     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;
         }
         PORT_Memcpy(rp,T,hLen);
     }
 
 loser:
     if (T) {
         PORT_ZFree(T,hLen);
     }
     if (rv != SECSuccess) {
         SECITEM_FreeItem(result,PR_TRUE);
         result = NULL;
     } else {
         result->len = dkLen;
     }
-        
+
     return result;
 }
 #endif
 
 #define HMAC_BUFFER 64
 #define NSSPBE_ROUNDUP(x,y) ((((x)+((y)-1))/(y))*(y))
 #define NSSPBE_MIN(x,y) ((x) < (y) ? (x) : (y))
 /*
  * This is the extended PBE function defined by the final PKCS #12 spec.
  */
@@ skipping 945 matching lines @@
     rv = SECOID_CopyAlgorithmID(NULL, ret_algid, algid);
     if (rv != SECSuccess) {
         SECOID_DestroyAlgorithmID(ret_algid, PR_TRUE);
         ret_algid = NULL;
     }
 
 loser:  
 
     return ret_algid;
 }