summaryrefslogtreecommitdiffstats
path: root/net/third_party/nss/patches/peercertchain.patch
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 16:50:48 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 16:50:48 +0000
commitebd6e59c205e1df76d95968f4f78601f24280c5b (patch)
treedaea563c2baecdbd8e3c10db5b6c39be2bf08ffa /net/third_party/nss/patches/peercertchain.patch
parent1cf25d9e567a65d65ce8253057cc51183c1fff62 (diff)
downloadchromium_src-ebd6e59c205e1df76d95968f4f78601f24280c5b.zip
chromium_src-ebd6e59c205e1df76d95968f4f78601f24280c5b.tar.gz
chromium_src-ebd6e59c205e1df76d95968f4f78601f24280c5b.tar.bz2
net: update NSS patches.
This change doesn't alter anything about the patches, it just makes them apply cleanly on top of one another in preparation for altering the NPN patch. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/patches/peercertchain.patch')
-rw-r--r--net/third_party/nss/patches/peercertchain.patch13
1 files changed, 9 insertions, 4 deletions
diff --git a/net/third_party/nss/patches/peercertchain.patch b/net/third_party/nss/patches/peercertchain.patch
index e923901..4615ba7 100644
--- a/net/third_party/nss/patches/peercertchain.patch
+++ b/net/third_party/nss/patches/peercertchain.patch
@@ -1,8 +1,13 @@
-commit 3833600af1d2e49f0d3b9381de10d120ddf0a03c
-Author: Adam Langley <agl@chromium.org>
-Date: Mon Jun 20 15:54:45 2011 -0400
+From 40714671513378227413d1542c2911c2f62e3840 Mon Sep 17 00:00:00 2001
+From: Adam Langley <agl@chromium.org>
+Date: Mon, 3 Oct 2011 12:20:43 -0400
+Subject: [PATCH] peercertchain.patch
- peercertchain.patch
+---
+ mozilla/security/nss/lib/ssl/ssl.def | 1 +
+ mozilla/security/nss/lib/ssl/ssl.h | 11 +++++++++
+ mozilla/security/nss/lib/ssl/sslauth.c | 36 ++++++++++++++++++++++++++++++++
+ 3 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/mozilla/security/nss/lib/ssl/ssl.def b/mozilla/security/nss/lib/ssl/ssl.def
index a1f4b51..0fa8777 100644