Update NSS to NSS_3_16_RC0.

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/. */
 
 #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
+#ifndef NSS_DISABLE_ECC
 #include "ec.h"         /* Required for ECDSA */
 #endif
 
 
 /* FIPS preprocessor directives for RC2-ECB and RC2-CBC.        */
 #define FIPS_RC2_KEY_LENGTH                      5  /*  40-bits */
 #define FIPS_RC2_ENCRYPT_LENGTH                  8  /*  64-bits */
 #define FIPS_RC2_DECRYPT_LENGTH                  8  /*  64-bits */
 
 
@@ skipping 1578 matching lines @@
     return( CKR_OK );
 
 rsa_loser:
 
     nsslowkey_DestroyPublicKey( rsa_public_key );
     nsslowkey_DestroyPrivateKey( rsa_private_key );
 
     return( CKR_DEVICE_ERROR );
 }
 
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
 
 static CK_RV
 sftk_fips_ECDSA_Test(const PRUint8 *encodedParams, 
                      unsigned int encodedParamsLen,
                      const PRUint8 *knownSignature, 
                      unsigned int knownSignatureLen) {
 
     /* ECDSA Known Seed info for curves nistp256 and nistk283  */
     static const PRUint8 ecdsa_Known_Seed[] = {
                             0x6a, 0x9b, 0xf6, 0xf7, 0xce, 0xed, 0x79, 0x11,
@@ skipping 162 matching lines @@
                                ecdsa_known_K283_signature,
                                sizeof ecdsa_known_K283_signature );
     if (crv != CKR_OK) {
         return( CKR_DEVICE_ERROR );
     }
 #endif
 
     return( CKR_OK );
 }
 
-#endif    /* NSS_ENABLE_ECC */
+#endif /* NSS_DISABLE_ECC */
 
 static CK_RV
 sftk_fips_DSA_PowerUpSelfTest( void )
 {
     /* DSA Known P (1024-bits), Q (160-bits), and G (1024-bits) Values. */
     static const PRUint8 dsa_P[] = {
          0x80,0xb0,0xd1,0x9d,0x6e,0xa4,0xf3,0x28, 
          0x9f,0x24,0xa9,0x8a,0x49,0xd0,0x0c,0x63, 
          0xe8,0x59,0x04,0xf9,0x89,0x4a,0x5e,0xc0, 
          0x6d,0xd2,0x67,0x6b,0x37,0x81,0x83,0x0c,
@@ skipping 264 matching lines @@
 
     if( rv != CKR_OK )
         return rv;
 
     /* RNG Power-Up SelfTest(s). */
     rv = sftk_fips_RNG_PowerUpSelfTest();
 
     if( rv != CKR_OK )
         return rv;
     
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
     /* ECDSA Power-Up SelfTest(s). */
     rv = sftk_fips_ECDSA_PowerUpSelfTest();
 
     if( rv != CKR_OK )
         return rv;
 #endif
 
     /* Software/Firmware Integrity Test. */
     rv = sftk_fipsSoftwareIntegrityTest();
 
     if( rv != CKR_OK )
         return rv;
 
     /* Passed Power-Up SelfTest(s). */
     return( CKR_OK );
 }