Update NSS to NSS_3_16_RC0.

nss/lib/softoken/pkcs11.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/. */
 /*
  * This file implements PKCS 11 on top of our existing security modules
  *
  * For more information about PKCS 11 See PKCS 11 Token Inteface Standard.
  *   This implementation has two slots:
  *      slot 1 is our generic crypto support. It does not require login.
  *   It supports Public Key ops, and all they bulk ciphers and hashes. 
@@ skipping 284 matching lines @@
      {CKM_DSA_PARAMETER_GEN,    {DSA_MIN_P_BITS, DSA_MAX_P_BITS, 
                                  CKF_GENERATE},           PR_TRUE},
      {CKM_DSA_SHA1,             {DSA_MIN_P_BITS, DSA_MAX_P_BITS,
                                  CKF_SN_VR},              PR_TRUE},
      /* -------------------- Diffie Hellman Operations --------------------- */
      /* no diffie hellman yet */
      {CKM_DH_PKCS_KEY_PAIR_GEN, {DH_MIN_P_BITS, DH_MAX_P_BITS, 
                                  CKF_GENERATE_KEY_PAIR}, PR_TRUE}, 
      {CKM_DH_PKCS_DERIVE,       {DH_MIN_P_BITS, DH_MAX_P_BITS,
                                  CKF_DERIVE},   PR_TRUE}, 
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
      /* -------------------- Elliptic Curve Operations --------------------- */
      {CKM_EC_KEY_PAIR_GEN,      {EC_MIN_KEY_BITS, EC_MAX_KEY_BITS,
                                  CKF_GENERATE_KEY_PAIR|CKF_EC_BPNU}, PR_TRUE}, 
      {CKM_ECDH1_DERIVE,         {EC_MIN_KEY_BITS, EC_MAX_KEY_BITS,
                                  CKF_DERIVE|CKF_EC_BPNU}, PR_TRUE}, 
      {CKM_ECDSA,                {EC_MIN_KEY_BITS, EC_MAX_KEY_BITS,
                                  CKF_SN_VR|CKF_EC_BPNU}, PR_TRUE}, 
      {CKM_ECDSA_SHA1,           {EC_MIN_KEY_BITS, EC_MAX_KEY_BITS,
                                  CKF_SN_VR|CKF_EC_BPNU}, PR_TRUE}, 
-#endif /* NSS_ENABLE_ECC */
+#endif /* NSS_DISABLE_ECC */
      /* ------------------------- RC2 Operations --------------------------- */
      {CKM_RC2_KEY_GEN,          {1, 128, CKF_GENERATE},         PR_TRUE},
      {CKM_RC2_ECB,              {1, 128, CKF_EN_DE_WR_UN},      PR_TRUE},
      {CKM_RC2_CBC,              {1, 128, CKF_EN_DE_WR_UN},      PR_TRUE},
      {CKM_RC2_MAC,              {1, 128, CKF_SN_VR},            PR_TRUE},
      {CKM_RC2_MAC_GENERAL,      {1, 128, CKF_SN_VR},            PR_TRUE},
      {CKM_RC2_CBC_PAD,          {1, 128, CKF_EN_DE_WR_UN},      PR_TRUE},
      /* ------------------------- RC4 Operations --------------------------- */
      {CKM_RC4_KEY_GEN,          {1, 256, CKF_GENERATE},         PR_FALSE},
      {CKM_RC4,                  {1, 256, CKF_EN_DE_WR_UN},      PR_FALSE},
@@ skipping 597 matching lines @@
         crv = sftk_ConstrainAttribute(object, CKA_VALUE, 2, DH_MAX_P_BITS, 0);
         if (crv != CKR_OK) {
             return crv;
         }
         verify = CK_FALSE;
         derive = CK_TRUE;
         encrypt = CK_FALSE;
         recover = CK_FALSE;
         wrap = CK_FALSE;
         break;
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
     case CKK_EC:
         if ( !sftk_hasAttribute(object, CKA_EC_PARAMS)) {
             return CKR_TEMPLATE_INCOMPLETE;
         }
         if ( !sftk_hasAttribute(object, CKA_EC_POINT)) {
             return CKR_TEMPLATE_INCOMPLETE;
         }
         derive = CK_TRUE;    /* for ECDH */
         verify = CK_TRUE;    /* for ECDSA */
         encrypt = CK_FALSE;
         recover = CK_FALSE;
         wrap = CK_FALSE;
         break;
-#endif /* NSS_ENABLE_ECC */
+#endif /* NSS_DISABLE_ECC */
     default:
         return CKR_ATTRIBUTE_VALUE_INVALID;
     }
 
     /* make sure the required fields exist */
     crv = sftk_defaultAttribute(object,CKA_SUBJECT,NULL,0);
     if (crv != CKR_OK)  return crv; 
     crv = sftk_defaultAttribute(object,CKA_ENCRYPT,&encrypt,sizeof(CK_BBOOL));
     if (crv != CKR_OK)  return crv; 
     crv = sftk_defaultAttribute(object,CKA_VERIFY,&verify,sizeof(CK_BBOOL));
@@ skipping 126 matching lines @@
         if ( !sftk_hasAttribute(object, CKA_BASE)) {
             return CKR_TEMPLATE_INCOMPLETE;
         }
         if ( !sftk_hasAttribute(object, CKA_VALUE)) {
             return CKR_TEMPLATE_INCOMPLETE;
         }
         encrypt = CK_FALSE;
         recover = CK_FALSE;
         wrap = CK_FALSE;
         break;
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
     case CKK_EC:
         if ( !sftk_hasAttribute(object, CKA_EC_PARAMS)) {
             return CKR_TEMPLATE_INCOMPLETE;
         }
         if ( !sftk_hasAttribute(object, CKA_VALUE)) {
             return CKR_TEMPLATE_INCOMPLETE;
         }
         encrypt = CK_FALSE;
         sign = CK_TRUE;
         recover = CK_FALSE;
         wrap = CK_FALSE;
         break;
-#endif /* NSS_ENABLE_ECC */
+#endif /* NSS_DISABLE_ECC */
     case CKK_NSS_JPAKE_ROUND1:
         if (!sftk_hasAttribute(object, CKA_PRIME) ||
             !sftk_hasAttribute(object, CKA_SUBPRIME) ||
             !sftk_hasAttribute(object, CKA_BASE)) {
             return CKR_TEMPLATE_INCOMPLETE;
         }
         /* fall through */
     case CKK_NSS_JPAKE_ROUND2:
         /* CKA_NSS_JPAKE_SIGNERID and CKA_NSS_JPAKE_PEERID are checked in
            the J-PAKE code. */
@@ skipping 586 matching lines @@
         pubKey->keyType = NSSLOWKEYDHKey;
         crv = sftk_Attribute2SSecItem(arena,&pubKey->u.dh.prime,
                                                         object,CKA_PRIME);
         if (crv != CKR_OK) break;
         crv = sftk_Attribute2SSecItem(arena,&pubKey->u.dh.base,
                                                         object,CKA_BASE);
         if (crv != CKR_OK) break;
         crv = sftk_Attribute2SSecItem(arena,&pubKey->u.dh.publicValue,
                                                         object,CKA_VALUE);
         break;
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
     case CKK_EC:
         pubKey->keyType = NSSLOWKEYECKey;
         crv = sftk_Attribute2SSecItem(arena,
                                       &pubKey->u.ec.ecParams.DEREncoding,
                                       object,CKA_EC_PARAMS);
         if (crv != CKR_OK) break;
 
         /* Fill out the rest of the ecParams structure 
          * based on the encoded params
          */
@@ skipping 39 matching lines @@
                     crv = CKR_ATTRIBUTE_VALUE_INVALID;
                     break;
                 }
                 /* replace our previous with the decoded key */
                 pubKey->u.ec.publicValue = publicValue;
                 break;
             }
            crv = CKR_ATTRIBUTE_VALUE_INVALID;
         }
         break;
-#endif /* NSS_ENABLE_ECC */
+#endif /* NSS_DISABLE_ECC */
     default:
         crv = CKR_KEY_TYPE_INCONSISTENT;
         break;
     }
     *crvp = crv;
     if (crv != CKR_OK) {
         PORT_FreeArena(arena,PR_FALSE);
         return NULL;
     }
 
@@ skipping 88 matching lines @@
         SFTK_SET_ITEM_TEMPLATE(itemTemplate, itemTemplateCount,
                 &privKey->u.dh.base, CKA_BASE);
         itemTemplateCount++;
         SFTK_SET_ITEM_TEMPLATE(itemTemplate, itemTemplateCount,
                 &privKey->u.dh.privateValue, CKA_VALUE);
         itemTemplateCount++;
         /* privKey was zero'd so public value is already set to NULL, 0
          * if we don't set it explicitly */
         break;
 
-#ifdef NSS_ENABLE_ECC
+#ifndef NSS_DISABLE_ECC
     case CKK_EC:
         privKey->keyType = NSSLOWKEYECKey;
         crv = sftk_Attribute2SSecItem(arena, 
                                       &privKey->u.ec.ecParams.DEREncoding,
                                       object,CKA_EC_PARAMS);
         if (crv != CKR_OK) break;
 
         /* Fill out the rest of the ecParams structure
          * based on the encoded params
          */
@@ skipping 21 matching lines @@
              * Android as gcc 4.6 has a bug when targeting arm (but not
              * thumb). The bug has been fixed in gcc 4.7.
              * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56561
              */
 #if defined (__arm__) && !defined(__thumb__) && defined (__GNUC__)
             *crvp = CKR_HOST_MEMORY;
             break;
 #endif
         }
         break;
-#endif /* NSS_ENABLE_ECC */
+#endif /* NSS_DISABLE_ECC */
 
     default:
         crv = CKR_KEY_TYPE_INCONSISTENT;
         break;
     }
     if (crv == CKR_OK && itemTemplateCount != 0) {
         PORT_Assert(itemTemplateCount > 0);
         PORT_Assert(itemTemplateCount <= SFTK_MAX_ITEM_TEMPLATE);
         crv = sftk_MultipleAttribute2SecItem(arena, object, itemTemplate, 
                                                 itemTemplateCount);
@@ skipping 2789 matching lines @@
 
 
 CK_RV NSC_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot,
                                                          CK_VOID_PTR pReserved)
 {
     CHECK_FORK();
 
     return CKR_FUNCTION_NOT_SUPPORTED;
 }