diff options
| -rw-r--r-- | config/x64/openssl/opensslconf.h | 4 | ||||
| -rwxr-xr-x | import_from_android.sh | 2 | ||||
| -rw-r--r-- | openssl.gyp | 13 |
3 files changed, 4 insertions, 15 deletions
diff --git a/config/x64/openssl/opensslconf.h b/config/x64/openssl/opensslconf.h index c54db68..6dfeadd 100644 --- a/config/x64/openssl/opensslconf.h +++ b/config/x64/openssl/opensslconf.h @@ -199,7 +199,7 @@ * - Intel P6 because partial register stalls are very expensive; * - elder Alpha because it lacks byte load/store instructions; */ -#define RC4_INT unsigned char +#define RC4_INT unsigned int #endif #if !defined(RC4_CHUNK) /* @@ -239,7 +239,7 @@ #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) #define CONFIG_HEADER_BF_LOCL_H -#define BF_PTR +#undef BF_PTR #endif /* HEADER_BF_LOCL_H */ #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) diff --git a/import_from_android.sh b/import_from_android.sh index ea1ab19..7dbdda6 100755 --- a/import_from_android.sh +++ b/import_from_android.sh @@ -456,9 +456,11 @@ generate_gyp_file () { dump "Generating 64-bit configuration header file." mkdir -p $PROGDIR/config/x64/openssl/ sed \ + -e 's|^#define RC4_INT unsigned char|#define RC4_INT unsigned int|g' \ -e 's|^#define BN_LLONG|#undef BN_LLONG|g' \ -e 's|^#define THIRTY_TWO_BIT|#undef THIRTY_TWO_BIT|g' \ -e 's|^#undef SIXTY_FOUR_BIT_LONG|#define SIXTY_FOUR_BIT_LONG|g' \ + -e 's|^#define BF_PTR|#undef BF_PTR|g' \ $PROGDIR/openssl/include/openssl/opensslconf.h \ > $PROGDIR/config/x64/openssl/opensslconf.h diff --git a/openssl.gyp b/openssl.gyp index a804480..30a1b27 100644 --- a/openssl.gyp +++ b/openssl.gyp @@ -68,19 +68,6 @@ ['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': { |