import_from_android.sh - Issue 153373003: Fix of crash in e_rc4_hmac_md5.c caused by rc4-md5-x86_64.S.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: import_from_android.sh

Issue 153373003: Fix of crash in e_rc4_hmac_md5.c caused by rc4-md5-x86_64.S. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master

Patch Set: Fix RC4_INT in opensslconf.h Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: import_from_android.sh

diff --git a/import_from_android.sh b/import_from_android.sh

index ea1ab195cd666c26b11eb6e324f44f3f8f1269bc..7dbdda6527d07527404dada2fdb714e8e2fb4f26 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

« no previous file with comments | « config/x64/openssl/opensslconf.h ('k') | openssl.gyp » ('j') | no next file with comments »