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

mozilla/security/nss/lib/softoken/fipstest.c

 /*
  * PKCS #11 FIPS Power-Up Self Test.
  *
  * 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: fipstest.c,v 1.31 2012/06/28 17:55:06 rrelyea%redhat.com Exp $ */
+/* $Id: fipstest.c,v 1.30 2012/04/25 14:50:10 gerv%gerv.net Exp $ */
 
 #include "softoken.h"   /* Required for RC2-ECB, RC2-CBC, RC4, DES-ECB,  */
                         /*              DES-CBC, DES3-ECB, DES3-CBC, RSA */
                         /*              and DSA.                         */
 #include "seccomon.h"   /* Required for RSA and DSA. */
 #include "lowkeyi.h"    /* Required for RSA and DSA. */
 #include "pkcs11.h"     /* Required for PKCS #11. */
 #include "secerr.h"
 
 #ifdef NSS_ENABLE_ECC
@@ skipping 2138 matching lines @@
     /* Software/Firmware Integrity Test. */
     rv = sftk_fipsSoftwareIntegrityTest();
 
     if( rv != CKR_OK )
         return rv;
 
     /* Passed Power-Up SelfTest(s). */
     return( CKR_OK );
 }