|
 |
dbb9a2 |
diff -up ./nss/lib/softoken/pkcs11c.c.tls_abi_fix ./nss/lib/softoken/pkcs11c.c
|
|
|
dbb9a2 |
--- ./nss/lib/softoken/pkcs11c.c.tls_abi_fix 2017-03-23 14:44:59.059880273 -0700
|
|
|
dbb9a2 |
+++ ./nss/lib/softoken/pkcs11c.c 2017-03-23 14:45:24.738316707 -0700
|
|
|
dbb9a2 |
@@ -2672,6 +2672,7 @@ NSC_SignInit(CK_SESSION_HANDLE hSession,
|
|
|
dbb9a2 |
case CKM_TLS_PRF_GENERAL:
|
|
|
dbb9a2 |
crv = sftk_TLSPRFInit(context, key, key_type, HASH_AlgNULL, 0);
|
|
|
dbb9a2 |
break;
|
|
|
dbb9a2 |
+ case CKM_TLS_KDF:
|
|
|
dbb9a2 |
case CKM_TLS_MAC: {
|
|
|
dbb9a2 |
CK_TLS_MAC_PARAMS *tls12_mac_params;
|
|
|
dbb9a2 |
HASH_HashType tlsPrfHash;
|
|
|
dbb9a2 |
diff -up ./nss/lib/softoken/pkcs11.c.tls_abi_fix ./nss/lib/softoken/pkcs11.c
|
|
|
dbb9a2 |
--- ./nss/lib/softoken/pkcs11.c.tls_abi_fix 2017-03-23 14:42:21.055194120 -0700
|
|
|
dbb9a2 |
+++ ./nss/lib/softoken/pkcs11.c 2017-03-23 14:44:44.321629780 -0700
|
|
|
dbb9a2 |
@@ -373,6 +373,11 @@ static const struct mechanismList mechan
|
|
|
dbb9a2 |
{ CKM_SHA512_HMAC_GENERAL, { 1, 128, CKF_SN_VR }, PR_TRUE },
|
|
|
dbb9a2 |
{ CKM_TLS_PRF_GENERAL, { 0, 512, CKF_SN_VR }, PR_FALSE },
|
|
|
dbb9a2 |
{ CKM_TLS_MAC, { 0, 512, CKF_SN_VR }, PR_FALSE },
|
|
|
dbb9a2 |
+ { CKM_TLS_KDF, { 0, 512, CKF_SN_VR }, PR_FALSE }, /* in RHEL 7.3 we had the wrong
|
|
|
dbb9a2 |
+ * number for TLS_MAC. keep the old
|
|
|
dbb9a2 |
+ * number to allow old versions of
|
|
|
dbb9a2 |
+ * nss on * RHEL 7 to work with
|
|
|
dbb9a2 |
+ * this softoken */
|
|
|
dbb9a2 |
{ CKM_NSS_TLS_PRF_GENERAL_SHA256,
|
|
|
dbb9a2 |
{ 0, 512, CKF_SN_VR },
|
|
|
dbb9a2 |
PR_FALSE },
|