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

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

Issue 166273026: Implement the encrypt-then-MAC TLS extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Remove nss_ssl_util.cc from the CL Created 6 years, 10 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/sslimpl.h ('k') | net/third_party/nss/ssl/sslt.h » ('j') | 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 252347)
+++ net/third_party/nss/ssl/sslsock.c (working copy)
@@ -89,7 +89,8 @@
PR_TRUE, /* enableNPN */
PR_FALSE, /* enableALPN */
PR_FALSE, /* enableSignedCertTimestamps */
- PR_FALSE /* enableFallbackSCSV */
+ PR_FALSE, /* enableFallbackSCSV */
+ PR_FALSE /* enableEncryptThenMAC */
};
/*
@@ -797,6 +798,10 @@
ss->opt.enableFallbackSCSV = on;
break;
+ case SSL_ENABLE_ENCRYPT_THEN_MAC:
+ ss->opt.enableEncryptThenMAC = on;
+ break;
+
default:
PORT_SetError(SEC_ERROR_INVALID_ARGS);
rv = SECFailure;
@@ -873,6 +878,7 @@
on = ss->opt.enableSignedCertTimestamps;
break;
case SSL_ENABLE_FALLBACK_SCSV: on = ss->opt.enableFallbackSCSV; break;
+ case SSL_ENABLE_ENCRYPT_THEN_MAC: on = ss->opt.enableEncryptThenMAC; break;
default:
PORT_SetError(SEC_ERROR_INVALID_ARGS);
@@ -942,6 +948,9 @@
case SSL_ENABLE_FALLBACK_SCSV:
on = ssl_defaults.enableFallbackSCSV;
break;
+ case SSL_ENABLE_ENCRYPT_THEN_MAC:
+ on = ssl_defaults.enableEncryptThenMAC;
+ break;
default:
PORT_SetError(SEC_ERROR_INVALID_ARGS);
@@ -1125,6 +1134,10 @@
ssl_defaults.enableFallbackSCSV = on;
break;
+ case SSL_ENABLE_ENCRYPT_THEN_MAC:
+ ssl_defaults.enableEncryptThenMAC = on;
+ break;
+
default:
PORT_SetError(SEC_ERROR_INVALID_ARGS);
return SECFailure;
« no previous file with comments | « net/third_party/nss/ssl/sslimpl.h ('k') | net/third_party/nss/ssl/sslt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698