Update NSS to NSS_3_15_BETA2.

nss/lib/pk11wrap/pk11mech.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 maps various PKCS #11 Mechanisms to related mechanisms, key
  * types, and ASN.1 encodings.
  */
 #include "seccomon.h"
 #include "secmod.h"
 #include "secmodi.h"
@@ skipping 124 matching lines @@
     newt[entry].iv = ivLen;
     newt[entry].blockSize = blockSize;
 
     pk11_MechanismTable = newt;
     pk11_MechTableSize = tableSize;
     pk11_MechEntrySize = size;
     if (old) PORT_Free(old);
 }
 
 /*
- * Get the key type needed for the given mechanism
+ * Get the mechanism needed for the given key type
  */
 CK_MECHANISM_TYPE
 PK11_GetKeyMechanism(CK_KEY_TYPE type)
 {
     switch (type) {
     case CKK_SEED:
         return CKM_SEED_CBC;
     case CKK_CAMELLIA:
         return CKM_CAMELLIA_CBC;
     case CKK_AES:
@@ skipping 38 matching lines @@
         return CKM_ECDSA;
     case CKK_GENERIC_SECRET:
     default:
         return CKM_SHA_1_HMAC;
     }
 }
 
 /*
  * Get the key type needed for the given mechanism
  */
-CK_MECHANISM_TYPE
+CK_KEY_TYPE
 PK11_GetKeyType(CK_MECHANISM_TYPE type,unsigned long len)
 {
     switch (type) {
     case CKM_SEED_ECB:
     case CKM_SEED_CBC:
     case CKM_SEED_MAC:
     case CKM_SEED_MAC_GENERAL:
     case CKM_SEED_CBC_PAD:
     case CKM_SEED_KEY_GEN:
         return CKK_SEED;
@@ skipping 152 matching lines @@
     case CKM_ECDH1_DERIVE:
         return CKK_EC;  /* CKK_ECDSA is deprecated */
     case CKM_SSL3_PRE_MASTER_KEY_GEN:
     case CKM_GENERIC_SECRET_KEY_GEN:
     case CKM_SSL3_MASTER_KEY_DERIVE:
     case CKM_SSL3_MASTER_KEY_DERIVE_DH:
     case CKM_SSL3_KEY_AND_MAC_DERIVE:
     case CKM_SSL3_SHA1_MAC:
     case CKM_SSL3_MD5_MAC:
     case CKM_TLS_MASTER_KEY_DERIVE:
+    case CKM_NSS_TLS_MASTER_KEY_DERIVE_SHA256:
     case CKM_TLS_MASTER_KEY_DERIVE_DH:
+    case CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256:
     case CKM_TLS_KEY_AND_MAC_DERIVE:
+    case CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256:
     case CKM_SHA_1_HMAC:
     case CKM_SHA_1_HMAC_GENERAL:
     case CKM_SHA224_HMAC:
     case CKM_SHA224_HMAC_GENERAL:
     case CKM_SHA256_HMAC:
     case CKM_SHA256_HMAC_GENERAL:
     case CKM_SHA384_HMAC:
     case CKM_SHA384_HMAC_GENERAL:
     case CKM_SHA512_HMAC:
     case CKM_SHA512_HMAC_GENERAL:
     case CKM_MD2_HMAC:
     case CKM_MD2_HMAC_GENERAL:
     case CKM_MD5_HMAC:
     case CKM_MD5_HMAC_GENERAL:
     case CKM_TLS_PRF_GENERAL:
+    case CKM_NSS_TLS_PRF_GENERAL_SHA256:
         return CKK_GENERIC_SECRET;
     default:
         return pk11_lookup(type)->keyType;
     }
 }
 
 /*
  * Get the Key Gen Mechanism needed for the given 
  * crypto mechanism
  */
@@ skipping 16 matching lines @@
         return CKM_SEED_KEY_GEN;
     case CKM_CAMELLIA_ECB:
     case CKM_CAMELLIA_CBC:
     case CKM_CAMELLIA_MAC:
     case CKM_CAMELLIA_MAC_GENERAL:
     case CKM_CAMELLIA_CBC_PAD:
     case CKM_CAMELLIA_KEY_GEN:
         return CKM_CAMELLIA_KEY_GEN;
     case CKM_AES_ECB:
     case CKM_AES_CBC:
+    case CKM_AES_CCM:
+    case CKM_AES_CTR:
+    case CKM_AES_CTS:
+    case CKM_AES_GCM:
     case CKM_AES_MAC:
     case CKM_AES_MAC_GENERAL:
     case CKM_AES_CBC_PAD:
     case CKM_AES_KEY_GEN:
         return CKM_AES_KEY_GEN;
     case CKM_DES_ECB:
     case CKM_DES_CBC:
     case CKM_DES_MAC:
     case CKM_DES_MAC_GENERAL:
     case CKM_KEY_WRAP_LYNKS:
@@ skipping 117 matching lines @@
     case CKM_EC_KEY_PAIR_GEN: /* aka CKM_ECDSA_KEY_PAIR_GEN */
     case CKM_ECDH1_DERIVE:
         return CKM_EC_KEY_PAIR_GEN; 
     case CKM_SSL3_PRE_MASTER_KEY_GEN:
     case CKM_SSL3_MASTER_KEY_DERIVE:
     case CKM_SSL3_KEY_AND_MAC_DERIVE:
     case CKM_SSL3_SHA1_MAC:
     case CKM_SSL3_MD5_MAC:
     case CKM_TLS_MASTER_KEY_DERIVE:
     case CKM_TLS_KEY_AND_MAC_DERIVE:
+    case CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256:
         return CKM_SSL3_PRE_MASTER_KEY_GEN;
     case CKM_SHA_1_HMAC:
     case CKM_SHA_1_HMAC_GENERAL:
     case CKM_SHA224_HMAC:
     case CKM_SHA224_HMAC_GENERAL:
     case CKM_SHA256_HMAC:
     case CKM_SHA256_HMAC_GENERAL:
     case CKM_SHA384_HMAC:
     case CKM_SHA384_HMAC_GENERAL:
     case CKM_SHA512_HMAC:
     case CKM_SHA512_HMAC_GENERAL:
     case CKM_MD2_HMAC:
     case CKM_MD2_HMAC_GENERAL:
     case CKM_MD5_HMAC:
     case CKM_MD5_HMAC_GENERAL:
     case CKM_TLS_PRF_GENERAL:
+    case CKM_NSS_TLS_PRF_GENERAL_SHA256:
     case CKM_GENERIC_SECRET_KEY_GEN:
         return CKM_GENERIC_SECRET_KEY_GEN;
     case CKM_PBE_MD2_DES_CBC:
     case CKM_PBE_MD5_DES_CBC:
     case CKM_PBA_SHA1_WITH_SHA1_HMAC:
     case CKM_NETSCAPE_PBE_SHA1_HMAC_KEY_GEN:
     case CKM_NETSCAPE_PBE_MD5_HMAC_KEY_GEN:
     case CKM_NETSCAPE_PBE_MD2_HMAC_KEY_GEN:
     case CKM_NETSCAPE_PBE_SHA1_DES_CBC:
     case CKM_NETSCAPE_PBE_SHA1_40_BIT_RC2_CBC:
@@ skipping 1274 matching lines @@
     case SEC_OID_MISSI_DSS:
     case SEC_OID_MISSI_DSS_OLD:
     case SEC_OID_MISSI_KEA_DSS_OLD:
     case SEC_OID_BOGUS_DSA_SIGNATURE_WITH_SHA1_DIGEST:
         return SEC_OID_ANSIX9_DSA_SIGNATURE;
     default:
         break;
     }
     return algTag;
 }