summaryrefslogtreecommitdiff
path: root/patches.chromium
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-04-01 22:50:02 +0000
committerdavidben@chromium.org <davidben@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>2014-04-01 22:50:02 +0000
commitdf8aef444aa7f41262447e904cc80ac5b2f440f3 (patch)
treeddc104810b33fa110ee50d99ef289e5fa464c835 /patches.chromium
parentd5c4246dbe3ec9f8c11c6ca1f5a355367d6cb060 (diff)
downloadopenssl-df8aef444aa7f41262447e904cc80ac5b2f440f3.tar.gz
Remove junk that got added to the last openssl diff.
Accidentally did 'git svn dcommit' instead of 'git cl dcommit' for https://src.chromium.org/viewvc/chrome?revision=260940&view=revision and that didn't squash things correctly. BUG=none R=wtc@chromium.org Review URL: https://codereview.chromium.org//218403013 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@260965 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'patches.chromium')
-rw-r--r--patches.chromium/0009-stricter_cutthrough.patch3
1 files changed, 0 insertions, 3 deletions
diff --git a/patches.chromium/0009-stricter_cutthrough.patch b/patches.chromium/0009-stricter_cutthrough.patch
index 7cafd04..a880d64 100644
--- a/patches.chromium/0009-stricter_cutthrough.patch
+++ b/patches.chromium/0009-stricter_cutthrough.patch
@@ -70,6 +70,3 @@ index 2f8cda8..3732825 100644
EVP_MD_CTX* ssl_replace_hash(EVP_MD_CTX **hash,const EVP_MD *md) ;
void ssl_clear_hash_ctx(EVP_MD_CTX **hash);
int ssl_add_serverhello_renegotiate_ext(SSL *s, unsigned char *p, int *len,
-diff --git a/patches.chromium/0009-stricter_cutthrough.patch b/patches.chromium/0009-stricter_cutthrough.patch
-new file mode 100644
-index 0000000..e69de29