summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 19:23:07 +0000
committerdewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 19:23:07 +0000
commitc4d731ce428680574a3a277946008d2a530c533c (patch)
treee6691e33f9a420287675fd79a97d1fd4917a5468
parent0c5d1b034c26bf78f5a2bef73a4e3bd8b9123039 (diff)
downloadchromium_src-c4d731ce428680574a3a277946008d2a530c533c.zip
chromium_src-c4d731ce428680574a3a277946008d2a530c533c.tar.gz
chromium_src-c4d731ce428680574a3a277946008d2a530c533c.tar.bz2
Revert 235783 "DEPS roll for OpenSSL to r235188"
> DEPS roll for OpenSSL to r235188 > > Brings in the following changes: > > ------------------------------------------------------------------------ > r233370 | agl@chromium.org | 2013-11-06 16:17:55 -0500 (Wed, 06 Nov 2013) | 17 lines > > third_party/openssl: add ChaCha20+Poly1305 support. > > This change is not as scary as it appears. Most of the code has already been > reviewed and is running in production without issues. The only new code is the > ARM support. > > ARM now builds both the NEON and generic versions of the code and can enable > the NEON code at runtime by calling CRYPTO_set_NEON_capable(1). This patch does > not contain the code to call that, however. > > The addition openssl/patches/channelidchromium.patch and > fix_lhash_iteration.patch is noise from the import script. > > BUG=310768 > > https://codereview.chromium.org/59083010/ > > ------------------------------------------------------------------------ > r233061 | agl@chromium.org | 2013-11-05 14:42:31 -0500 (Tue, 05 Nov 2013) | 6 lines > > Fix the patch file from r233053. > > The patch file should be a patch that adds a patch, and that patch should do > the actual patching, except for openssl.config, which should be patched > directly. > > ------------------------------------------------------------------------ > r233053 | agl@chromium.org | 2013-11-05 14:28:17 -0500 (Tue, 05 Nov 2013) | 4 lines > > Add patch file missing from r233017. > > This addition allows import_from_android.sh to be idempotent again. > > BUG=310768 > > Review URL: https://codereview.chromium.org/69953024 TBR=agl@chromium.org Review URL: https://codereview.chromium.org/75033006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235789 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index c927945..2320fde 100644
--- a/DEPS
+++ b/DEPS
@@ -63,7 +63,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling openssl
# and whatever else without interference from each other.
- "openssl_revision": "235201",
+ "openssl_revision": "233017",
}
deps = {