summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-05 22:58:46 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-05 22:58:46 +0000
commitb837df322e4c9669a310c832b447ae12117674ff (patch)
treeb119435f3cf4c23e352093879fdc6ef734e40d53 /crypto
parent459cfad8195f8ebb868d12d319b200c89149851a (diff)
downloadchromium_src-b837df322e4c9669a310c832b447ae12117674ff.zip
chromium_src-b837df322e4c9669a310c832b447ae12117674ff.tar.gz
chromium_src-b837df322e4c9669a310c832b447ae12117674ff.tar.bz2
Disable Poly1305 NEON code again.
The Poly1305 NEON code became live again with the BoringSSL switch. This change disables it again in Chromium because of some broken phones. We should really read /proc/cpuinfo and selectively disable, but this change is simple and keeps the status-quo for now. BUG=341598 Review URL: https://codereview.chromium.org/443523002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssl_util.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc
index 94bf246..6f348ff 100644
--- a/crypto/openssl_util.cc
+++ b/crypto/openssl_util.cc
@@ -62,6 +62,10 @@ class OpenSSLInitSingleton {
(android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
if (has_neon)
CRYPTO_set_NEON_capable(1);
+ // In all cases, currently, mark the NEON unit as broken because some
+ // phones can't execute the Poly1305 code correctly. See
+ // https://code.google.com/p/chromium/issues/detail?id=341598
+ CRYPTO_set_NEON_functional(0);
#endif
}