commit 3b8fc78015d550f737c3da2ee6cc7f32913dfdf8
author yhirano@chromium.org <yhirano@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Tue Oct 22 01:10:35 2013 +0000
committer yhirano@chromium.org <yhirano@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Tue Oct 22 01:10:35 2013 +0000
tree e9bb4b7430ae7f0966f58c25f3ab88dcd3efe3e0
parent 8f54aac19a36d72ea630c813cae51c81a3cc0d78

Use C source for openssl RC4 calculation instead of ASM

Due to a problem with rc4-x86_64.S,
We use the C rc4 source instead of the ASM source.
This hurts performance, but it's not a problem because
no production code uses openssl on x86-64.

BUG=240674
R=agl@chromium.org, digit@chromium.org, rsleevi@chromium.org, wtc@chromium.org
TBR=darin

Review URL: https://codereview.chromium.org/26651005

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@229995 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

openssl.gyp

diff --git a/openssl.gyp b/openssl.gyp
index 8073326..1bee4e3 100644
--- a/openssl.gyp
+++ b/openssl.gyp
@@ -65,6 +65,19 @@
         ['target_arch == "x64"', {
           'sources': [ '<@(openssl_x86_64_sources)' ],
           'sources!': [ '<@(openssl_x86_64_source_excludes)' ],
+          'conditions': [
+            ['OS != "android"', {
+              # Because rc4-x86_64.S has a problem,
+              # We use the C rc4 source instead of the ASM source.
+              # This hurts performance, but it's not a problem
+              # because no production code uses openssl on x86-64.
+              'sources/': [
+                ['exclude', 'openssl/crypto/rc4/asm/rc4-x86_64\\.S' ],
+                ['include', 'openssl/crypto/rc4/rc4_enc\\.c' ],
+                ['include', 'openssl/crypto/rc4/rc4_skey\\.c' ],
+              ],
+            }]
+          ],
           'defines': [ '<@(openssl_x86_64_defines)' ],
           'defines!': [ 'OPENSSL_NO_ASM' ],
           'variables': {