Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Unified Diff: net/third_party/nss/ssl/sslsock.c

Issue 23713003: Use the TLS 1.2 mechanisms for PKCS #11. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Re-implement ssl3_ComputeTLSFinished using CKM_TLS12_MAC, for all versions of TLS 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/third_party/nss/ssl/ssl3ecc.c ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl/sslsock.c
===================================================================
--- net/third_party/nss/ssl/sslsock.c (revision 219583)
+++ net/third_party/nss/ssl/sslsock.c (working copy)
@@ -22,8 +22,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
#define SET_ERROR_CODE /* reminder */
@@ -1918,7 +1918,7 @@
ssl_CheckTLS12Token(void)
{
tls12TokenExists =
- PK11_TokenExists(CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256);
+ PK11_TokenExists(CKM_TLS12_MASTER_KEY_DERIVE_DH);
return PR_SUCCESS;
}
« no previous file with comments | « net/third_party/nss/ssl/ssl3ecc.c ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698