nss/lib/softoken/pkcs11.c - Issue 23510003: Implement the TLS 1.2 mechanisms for PKCS #11.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: nss/lib/softoken/pkcs11.c

Issue 23510003: Implement the TLS 1.2 mechanisms for PKCS #11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/

Patch Set: Allow CKM_TLS12_MAC to use the TLS 1.0 and 1.1 PRF Created 7 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: nss/lib/softoken/pkcs11.c

===================================================================

--- nss/lib/softoken/pkcs11.c (revision 209026)

+++ nss/lib/softoken/pkcs11.c (working copy)

@@ -391,6 +391,7 @@

{CKM_SHA512_HMAC, {1, 128, CKF_SN_VR}, PR_TRUE},

{CKM_SHA512_HMAC_GENERAL, {1, 128, CKF_SN_VR}, PR_TRUE},

{CKM_TLS_PRF_GENERAL, {0, 512, CKF_SN_VR}, PR_FALSE},

+ {CKM_TLS12_MAC, {0, 512, CKF_SN_VR}, PR_FALSE},

{CKM_NSS_TLS_PRF_GENERAL_SHA256,

{0, 512, CKF_SN_VR}, PR_FALSE},

/* ------------------------- HKDF Operations -------------------------- */

@@ -460,12 +461,15 @@

{CKM_SHA384_KEY_DERIVATION, { 0, 48, CKF_DERIVE}, PR_FALSE},

{CKM_SHA512_KEY_DERIVATION, { 0, 64, CKF_DERIVE}, PR_FALSE},

{CKM_TLS_MASTER_KEY_DERIVE, {48, 48, CKF_DERIVE}, PR_FALSE},

+ {CKM_TLS12_MASTER_KEY_DERIVE, {48, 48, CKF_DERIVE}, PR_FALSE},

{CKM_NSS_TLS_MASTER_KEY_DERIVE_SHA256,

{48, 48, CKF_DERIVE}, PR_FALSE},

{CKM_TLS_MASTER_KEY_DERIVE_DH, {8, 128, CKF_DERIVE}, PR_FALSE},

+ {CKM_TLS12_MASTER_KEY_DERIVE_DH, {8, 128, CKF_DERIVE}, PR_FALSE},

{CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256,

{8, 128, CKF_DERIVE}, PR_FALSE},

{CKM_TLS_KEY_AND_MAC_DERIVE, {48, 48, CKF_DERIVE}, PR_FALSE},

+ {CKM_TLS12_KEY_AND_MAC_DERIVE, {48, 48, CKF_DERIVE}, PR_FALSE},

{CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256,

{48, 48, CKF_DERIVE}, PR_FALSE},

/* ---------------------- PBE Key Derivations ------------------------ */

« no previous file with comments | « no previous file | nss/lib/softoken/pkcs11c.c » ('j') | no next file with comments »