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

Unified Diff: net/third_party/nss/patches/tls12chromium.patch

Issue 142283002: Update net/third_party/nss to NSS_3_15_5_BETA2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix applypatches.sh mistakes Created 6 years, 11 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
Index: net/third_party/nss/patches/tls12chromium.patch
===================================================================
--- net/third_party/nss/patches/tls12chromium.patch (revision 245705)
+++ net/third_party/nss/patches/tls12chromium.patch (working copy)
@@ -1,6 +1,6 @@
diff -pu a/nss/lib/ssl/ssl3con.c b/nss/lib/ssl/ssl3con.c
---- a/nss/lib/ssl/ssl3con.c 2014-01-03 18:55:44.659133336 -0800
-+++ b/nss/lib/ssl/ssl3con.c 2014-01-03 18:57:20.390695317 -0800
+--- a/nss/lib/ssl/ssl3con.c 2014-01-17 18:00:11.213237373 -0800
++++ b/nss/lib/ssl/ssl3con.c 2014-01-17 18:04:22.497405273 -0800
@@ -31,6 +31,15 @@
#include "blapi.h"
#endif
@@ -18,8 +18,8 @@
#ifdef NSS_ENABLE_ZLIB
#include "zlib.h"
diff -pu a/nss/lib/ssl/ssl3ecc.c b/nss/lib/ssl/ssl3ecc.c
---- a/nss/lib/ssl/ssl3ecc.c 2014-01-03 18:56:43.300090124 -0800
-+++ b/nss/lib/ssl/ssl3ecc.c 2014-01-03 18:57:20.390695317 -0800
+--- a/nss/lib/ssl/ssl3ecc.c 2014-01-17 18:01:31.474568608 -0800
++++ b/nss/lib/ssl/ssl3ecc.c 2014-01-17 18:04:22.497405273 -0800
@@ -30,6 +30,12 @@
#include <stdio.h>
@@ -34,8 +34,8 @@
#ifndef PK11_SETATTRS
diff -pu a/nss/lib/ssl/sslsock.c b/nss/lib/ssl/sslsock.c
---- a/nss/lib/ssl/sslsock.c 2014-01-03 18:55:44.669133500 -0800
-+++ b/nss/lib/ssl/sslsock.c 2014-01-03 18:57:20.400695477 -0800
+--- a/nss/lib/ssl/sslsock.c 2014-01-17 18:00:11.213237373 -0800
++++ b/nss/lib/ssl/sslsock.c 2014-01-17 18:04:22.497405273 -0800
@@ -17,8 +17,15 @@
#ifndef NO_PKCS11_BYPASS
#include "blapi.h"
@@ -52,7 +52,7 @@
#define SET_ERROR_CODE /* reminder */
static const sslSocketOps ssl_default_ops = { /* No SSL. */
-@@ -1814,6 +1821,24 @@ SSL_VersionRangeGet(PRFileDesc *fd, SSLV
+@@ -1836,6 +1843,24 @@ SSL_VersionRangeGet(PRFileDesc *fd, SSLV
return SECSuccess;
}
@@ -77,7 +77,7 @@
SECStatus
SSL_VersionRangeSet(PRFileDesc *fd, const SSLVersionRange *vrange)
{
-@@ -1834,6 +1859,20 @@ SSL_VersionRangeSet(PRFileDesc *fd, cons
+@@ -1856,6 +1881,20 @@ SSL_VersionRangeSet(PRFileDesc *fd, cons
ssl_GetSSL3HandshakeLock(ss);
ss->vrange = *vrange;

Powered by Google App Engine
This is Rietveld 408576698