Update to NSS 3.16.2 Beta 3.

nss/lib/pk11wrap/pk11slot.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/. */
 /*
  * Deal with PKCS #11 Slots.
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "nssilock.h"
 #include "secmodi.h"
@@ skipping 11 matching lines @@
 
 /*************************************************************
  * local static and global data
  *************************************************************/
 
 /*
  * This array helps parsing between names, mechanisms, and flags.
  * to make the config files understand more entries, add them
  * to this table.
  */
-PK11DefaultArrayEntry PK11_DefaultArray[] = {
+const PK11DefaultArrayEntry PK11_DefaultArray[] = {
         { "RSA", SECMOD_RSA_FLAG, CKM_RSA_PKCS },
         { "DSA", SECMOD_DSA_FLAG, CKM_DSA },
+        { "ECC", SECMOD_ECC_FLAG, CKM_ECDSA },
         { "DH", SECMOD_DH_FLAG, CKM_DH_PKCS_DERIVE },
         { "RC2", SECMOD_RC2_FLAG, CKM_RC2_CBC },
         { "RC4", SECMOD_RC4_FLAG, CKM_RC4 },
         { "DES", SECMOD_DES_FLAG, CKM_DES_CBC },
         { "AES", SECMOD_AES_FLAG, CKM_AES_CBC },
         { "Camellia", SECMOD_CAMELLIA_FLAG, CKM_CAMELLIA_CBC },
         { "SEED", SECMOD_SEED_FLAG, CKM_SEED_CBC },
         { "RC5", SECMOD_RC5_FLAG, CKM_RC5_CBC },
         { "SHA-1", SECMOD_SHA1_FLAG, CKM_SHA_1 },
 /*      { "SHA224", SECMOD_SHA256_FLAG, CKM_SHA224 }, */
         { "SHA256", SECMOD_SHA256_FLAG, CKM_SHA256 },
 /*      { "SHA384", SECMOD_SHA512_FLAG, CKM_SHA384 }, */
         { "SHA512", SECMOD_SHA512_FLAG, CKM_SHA512 },
         { "MD5", SECMOD_MD5_FLAG, CKM_MD5 },
         { "MD2", SECMOD_MD2_FLAG, CKM_MD2 },
         { "SSL", SECMOD_SSL_FLAG, CKM_SSL3_PRE_MASTER_KEY_GEN },
         { "TLS", SECMOD_TLS_FLAG, CKM_TLS_MASTER_KEY_DERIVE },
         { "SKIPJACK", SECMOD_FORTEZZA_FLAG, CKM_SKIPJACK_CBC64 },
         { "Publicly-readable certs", SECMOD_FRIENDLY_FLAG, CKM_INVALID_MECHANISM },
         { "Random Num Generator", SECMOD_RANDOM_FLAG, CKM_FAKE_RANDOM },
 };
 const int num_pk11_default_mechanisms = 
                 sizeof(PK11_DefaultArray) / sizeof(PK11_DefaultArray[0]);
 
-PK11DefaultArrayEntry *
+const PK11DefaultArrayEntry *
 PK11_GetDefaultArray(int *size)
 {
     if (size) {
         *size = num_pk11_default_mechanisms;
     }
     return PK11_DefaultArray;
 }
 
 /*
  * These  slotlists are lists of modules which provide default support for
@@ skipping 1425 matching lines @@
 PK11DisableReasons
 PK11_GetDisabledReason(PK11SlotInfo *slot)
 {
     return slot->reason;
 }
 
 /* returns PR_TRUE if successfully disable the slot */
 /* returns PR_FALSE otherwise */
 PRBool PK11_UserDisableSlot(PK11SlotInfo *slot) {
 
+    /* Prevent users from disabling the internal module. */
+    if (slot->isInternal) {
+        PORT_SetError(SEC_ERROR_INVALID_ARGS);
+        return PR_FALSE;
+    }
+
     slot->defaultFlags |= PK11_DISABLE_FLAG;
     slot->disabled = PR_TRUE;
     slot->reason = PK11_DIS_USER_SELECTED;
     
     return PR_TRUE;
 }
 
 PRBool PK11_UserEnableSlot(PK11SlotInfo *slot) {
 
     slot->defaultFlags &= ~PK11_DISABLE_FLAG;
@@ skipping 875 matching lines @@
                 first_time_set = PR_TRUE;
             }
             if ((interval-first_time) > timeout) {
                 return waitForRemoval ? PK11TokenPresent : PK11TokenRemoved;
             }
         }
         PR_Sleep(latency);
    }
    return waitForRemoval ? PK11TokenRemoved : PK11TokenPresent;
 }