Update NSS to NSS 3.14 pre-release snapshot 2012-06-28 01:00:00 PDT.

mozilla/security/nss/lib/freebl/tlsprfalg.c

 /* tlsprfalg.c - TLS Pseudo Random Function (PRF) implementation
  *
  * 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/. */
-/* $Id: tlsprfalg.c,v 1.8 2012/04/25 14:49:43 gerv%gerv.net Exp $ */
+/* $Id: tlsprfalg.c,v 1.9 2012/06/26 22:27:29 rrelyea%redhat.com Exp $ */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
 #endif
 
-#include "sechash.h"
+#include "blapi.h"
+#include "hasht.h"
 #include "alghmac.h"
-#include "blapi.h"
 
 
 #define PHASH_STATE_MAX_LEN HASH_LENGTH_MAX
 
 /* TLS P_hash function */
 SECStatus
 TLS_P_hash(HASH_HashType hashType, const SECItem *secret, const char *label, 
         SECItem *seed, SECItem *result, PRBool isFIPS)
 {
     unsigned char state[PHASH_STATE_MAX_LEN];
@@ skipping 103 matching lines @@
         result->data[i] ^= tmp.data[i];
 
     rv = SECSuccess;
 
 loser:
     if (tmp.data != NULL)
         PORT_ZFree(tmp.data, tmp.len);
     return rv;
 }