Use the TLS 1.2 mechanisms for PKCS #11.

net/third_party/nss/ssl/ssl3ecc.c

Index: net/third_party/nss/ssl/ssl3ecc.c
===================================================================
--- net/third_party/nss/ssl/ssl3ecc.c	(revision 219583)
+++ net/third_party/nss/ssl/ssl3ecc.c	(working copy)
@@ -32,8 +32,8 @@
 
 /* This is a bodge to allow this code to be compiled against older NSS headers
  * that don't contain the TLS 1.2 changes. */
-#ifndef CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256
-#define CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256 (CKM_NSS + 24)
+#ifndef CKM_TLS12_MASTER_KEY_DERIVE_DH
+#define CKM_TLS12_MASTER_KEY_DERIVE_DH      0x000003E2
 #endif
 
 #ifdef NSS_ENABLE_ECC
@@ -311,7 +311,7 @@
 					pubKey->u.ec.publicValue.len));
 
     if (isTLS12) {
-	target = CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256;
+	target = CKM_TLS12_MASTER_KEY_DERIVE_DH;
     } else if (isTLS) {
 	target = CKM_TLS_MASTER_KEY_DERIVE_DH;
     } else {
@@ -402,7 +402,7 @@
     isTLS12 = (PRBool)(ss->ssl3.prSpec->version >= SSL_LIBRARY_VERSION_TLS_1_2);
 
     if (isTLS12) {
-	target = CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256;
+	target = CKM_TLS12_MASTER_KEY_DERIVE_DH;
     } else if (isTLS) {
 	target = CKM_TLS_MASTER_KEY_DERIVE_DH;
     } else {