diff options
| author | agl@chromium.org <agl@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-02-07 16:09:07 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2014-02-07 16:09:07 +0000 |
| commit | b812b0a19c352ac9638308aac72fd8020575c511 (patch) | |
| tree | b8533b00b5154bce365098697fe3cf580f1efb25 /import_from_android.sh | |
| parent | a6d40fa7573baf76010a38264707a5b5c5834097 (diff) | |
| download | openssl-b812b0a19c352ac9638308aac72fd8020575c511.tar.gz | |
Set correct value for RC4_INT on x86_64
This caused caused crashes in the assembly versions of the rc4 algorithms,
especially in rc4-md5-x86_64.S.
Also take back in rc4-x86_64.S since it will now work.
BUG=none
https://codereview.chromium.org/153373003/
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@249698 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Diffstat (limited to 'import_from_android.sh')
| -rwxr-xr-x | import_from_android.sh | 2 |
1 files changed, 2 insertions, 0 deletions
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 |