diff options
author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:20:58 +0000 |
---|---|---|
committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:20:58 +0000 |
commit | 1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a (patch) | |
tree | d804ca496db0952db185663f12193c7108854573 /net/third_party/nss/patches/applypatches.sh | |
parent | b518852c1a1ccf23fd3ee12d49895009cb8a5aa0 (diff) | |
download | chromium_src-1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a.zip chromium_src-1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a.tar.gz chromium_src-1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a.tar.bz2 |
Add a boolean |has_context| argument to the TLS ExportKeyingMaterial
method to support both nonexistent context and zero-length context.
R=agl@chromium.org,rsleevi@chromium.org
BUG=none
TEST=existing unit tests
Review URL: http://codereview.chromium.org/9663043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/patches/applypatches.sh')
-rwxr-xr-x | net/third_party/nss/patches/applypatches.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/third_party/nss/patches/applypatches.sh b/net/third_party/nss/patches/applypatches.sh index 48cbe52..1356eab 100755 --- a/net/third_party/nss/patches/applypatches.sh +++ b/net/third_party/nss/patches/applypatches.sh @@ -38,3 +38,5 @@ patch -p6 < $patches_dir/restartclientauth.patch patch -p6 < $patches_dir/encryptedclientcerts.patch patch -p5 < $patches_dir/nextprotocleanup.patch + +patch -p4 < $patches_dir/secret_exporter2.patch |