Update NSS to NSS_3_15_BETA2.

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 815 matching lines @@
         return NULL;
 #endif
     switch (type) {
     case CKM_SEED_CBC:
     case CKM_SEED_ECB:
         return &pk11_seedSlotList;
     case CKM_CAMELLIA_CBC:
     case CKM_CAMELLIA_ECB:
         return &pk11_camelliaSlotList;
     case CKM_AES_CBC:
+    case CKM_AES_CCM:
+    case CKM_AES_CTR:
+    case CKM_AES_CTS:
+    case CKM_AES_GCM:
     case CKM_AES_ECB:
         return &pk11_aesSlotList;
     case CKM_DES_CBC:
     case CKM_DES_ECB:
     case CKM_DES3_ECB:
     case CKM_DES3_CBC:
         return &pk11_desSlotList;
     case CKM_RC4:
         return &pk11_rc4SlotList;
     case CKM_RC5_CBC:
@@ skipping 27 matching lines @@
     case CKM_EC_KEY_PAIR_GEN: /* aka CKM_ECDSA_KEY_PAIR_GEN */
     case CKM_ECDH1_DERIVE:
         return &pk11_ecSlotList;
     case CKM_SSL3_PRE_MASTER_KEY_GEN:
     case CKM_SSL3_MASTER_KEY_DERIVE:
     case CKM_SSL3_SHA1_MAC:
     case CKM_SSL3_MD5_MAC:
         return &pk11_sslSlotList;
     case CKM_TLS_MASTER_KEY_DERIVE:
     case CKM_TLS_KEY_AND_MAC_DERIVE:
+    case CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256:
         return &pk11_tlsSlotList;
     case CKM_IDEA_CBC:
     case CKM_IDEA_ECB:
         return &pk11_ideaSlotList;
     case CKM_FAKE_RANDOM:
         return &pk11_randomSlotList;
     }
     return NULL;
 }
 
@@ skipping 1491 matching lines @@
                 first_time_set = PR_TRUE;
             }
             if ((interval-first_time) > timeout) {
                 return waitForRemoval ? PK11TokenPresent : PK11TokenRemoved;
             }
         }
         PR_Sleep(latency);
    }
    return waitForRemoval ? PK11TokenRemoved : PK11TokenPresent;
 }