Update NSS to NSS_3_16_RC0.

nss/lib/softoken/pkcs11u.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/. */
 /*
  * Internal PKCS #11 functions. Should only be called by pkcs11.c
  */
 #include "pkcs11.h"
 #include "pkcs11i.h"
 #include "lowkeyi.h"
 #include "secasn1.h"
@@ skipping 1228 matching lines @@
     CKA_SUBPRIME, CKA_PRIME, CKA_BASE, CKA_VALUE
 };
 static const CK_ULONG dsaPubKeyAttrsCount = 
                         sizeof(dsaPubKeyAttrs)/sizeof(dsaPubKeyAttrs[0]);
 
 static const CK_ATTRIBUTE_TYPE dhPubKeyAttrs[] = {
     CKA_PRIME, CKA_BASE, CKA_VALUE
 };
 static const CK_ULONG dhPubKeyAttrsCount = 
                         sizeof(dhPubKeyAttrs)/sizeof(dhPubKeyAttrs[0]);
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
 static const CK_ATTRIBUTE_TYPE ecPubKeyAttrs[] = {
     CKA_EC_PARAMS, CKA_EC_POINT
 };
 static const CK_ULONG ecPubKeyAttrsCount = 
                         sizeof(ecPubKeyAttrs)/sizeof(ecPubKeyAttrs[0]);
 #endif
 
 static const CK_ATTRIBUTE_TYPE commonPrivKeyAttrs[] = {
     CKA_DECRYPT, CKA_SIGN, CKA_SIGN_RECOVER, CKA_UNWRAP, CKA_SUBJECT,
     CKA_SENSITIVE, CKA_EXTRACTABLE, CKA_NETSCAPE_DB
@@ skipping 12 matching lines @@
     CKA_SUBPRIME, CKA_PRIME, CKA_BASE, CKA_VALUE
 };
 static const CK_ULONG dsaPrivKeyAttrsCount = 
                         sizeof(dsaPrivKeyAttrs)/sizeof(dsaPrivKeyAttrs[0]);
 
 static const CK_ATTRIBUTE_TYPE dhPrivKeyAttrs[] = {
     CKA_PRIME, CKA_BASE, CKA_VALUE
 };
 static const CK_ULONG dhPrivKeyAttrsCount = 
                         sizeof(dhPrivKeyAttrs)/sizeof(dhPrivKeyAttrs[0]);
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
 static const CK_ATTRIBUTE_TYPE ecPrivKeyAttrs[] = {
     CKA_EC_PARAMS, CKA_VALUE
 };
 static const CK_ULONG ecPrivKeyAttrsCount = 
                         sizeof(ecPrivKeyAttrs)/sizeof(ecPrivKeyAttrs[0]);
 #endif
 
 static const CK_ATTRIBUTE_TYPE certAttrs[] = {
     CKA_CERTIFICATE_TYPE, CKA_VALUE, CKA_SUBJECT, CKA_ISSUER, CKA_SERIAL_NUMBER
 };
@@ skipping 90 matching lines @@
                                                         rsaPrivKeyAttrsCount);
         break;
     case CKK_DSA:
         crv = stfk_CopyTokenAttributes(destObject, src_to, dsaPrivKeyAttrs,
                                                         dsaPrivKeyAttrsCount);
         break;
     case CKK_DH:
         crv = stfk_CopyTokenAttributes(destObject, src_to, dhPrivKeyAttrs,
                                                         dhPrivKeyAttrsCount);
         break;
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
     case CKK_EC:
         crv = stfk_CopyTokenAttributes(destObject, src_to, ecPrivKeyAttrs,
                                                         ecPrivKeyAttrsCount);
         break;
 #endif
      default:
         crv = CKR_DEVICE_ERROR; /* shouldn't happen unless we store more types
                                 * of token keys into our database. */
     }
 fail:
@@ skipping 41 matching lines @@
                                                         rsaPubKeyAttrsCount);
         break;
     case CKK_DSA:
         crv = stfk_CopyTokenAttributes(destObject, src_to, dsaPubKeyAttrs,
                                                         dsaPubKeyAttrsCount);
         break;
     case CKK_DH:
         crv = stfk_CopyTokenAttributes(destObject, src_to, dhPubKeyAttrs,
                                                         dhPubKeyAttrsCount);
         break;
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
     case CKK_EC:
         crv = stfk_CopyTokenAttributes(destObject, src_to, ecPubKeyAttrs,
                                                         ecPubKeyAttrsCount);
         break;
 #endif
      default:
         crv = CKR_DEVICE_ERROR; /* shouldn't happen unless we store more types
                                 * of token keys into our database. */
     }
 fail:
@@ skipping 504 matching lines @@
 {
     return !sftk_isToken(obj->handle) ? (SFTKSessionObject *)obj : NULL;
 }
 
 SFTKTokenObject *
 sftk_narrowToTokenObject(SFTKObject *obj)
 {
     return sftk_isToken(obj->handle) ? (SFTKTokenObject *)obj : NULL;
 }