Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side 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 unified diff | Download patch
« no previous file with comments | « config/x64/openssl/opensslconf.h ('k') | openssl.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 # 2 #
3 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Sanitize environment. 7 # Sanitize environment.
8 set -e 8 set -e
9 export LANG=C 9 export LANG=C
10 export LC_ALL=C 10 export LC_ALL=C
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 decr_gyp_margin 449 decr_gyp_margin
450 print_gyp "}" # variables 450 print_gyp "}" # variables
451 451
452 decr_gyp_margin 452 decr_gyp_margin
453 print_gyp "}" # top-level dict. 453 print_gyp "}" # top-level dict.
454 } 454 }
455 455
456 dump "Generating 64-bit configuration header file." 456 dump "Generating 64-bit configuration header file."
457 mkdir -p $PROGDIR/config/x64/openssl/ 457 mkdir -p $PROGDIR/config/x64/openssl/
458 sed \ 458 sed \
459 -e 's|^#define RC4_INT unsigned char|#define RC4_INT unsigned int|g' \
459 -e 's|^#define BN_LLONG|#undef BN_LLONG|g' \ 460 -e 's|^#define BN_LLONG|#undef BN_LLONG|g' \
460 -e 's|^#define THIRTY_TWO_BIT|#undef THIRTY_TWO_BIT|g' \ 461 -e 's|^#define THIRTY_TWO_BIT|#undef THIRTY_TWO_BIT|g' \
461 -e 's|^#undef SIXTY_FOUR_BIT_LONG|#define SIXTY_FOUR_BIT_LONG|g' \ 462 -e 's|^#undef SIXTY_FOUR_BIT_LONG|#define SIXTY_FOUR_BIT_LONG|g' \
463 -e 's|^#define BF_PTR|#undef BF_PTR|g' \
462 $PROGDIR/openssl/include/openssl/opensslconf.h \ 464 $PROGDIR/openssl/include/openssl/opensslconf.h \
463 > $PROGDIR/config/x64/openssl/opensslconf.h 465 > $PROGDIR/config/x64/openssl/opensslconf.h
464 466
465 dump "Generating .gypi file." 467 dump "Generating .gypi file."
466 . $ANDROID_SRC_DIR/openssl.config 468 . $ANDROID_SRC_DIR/openssl.config
467 generate_gyp_file > $PROGDIR/openssl.gypi.new 469 generate_gyp_file > $PROGDIR/openssl.gypi.new
468 run mv $PROGDIR/openssl.gypi $PROGDIR/openssl.gypi.old 470 run mv $PROGDIR/openssl.gypi $PROGDIR/openssl.gypi.old
469 run mv $PROGDIR/openssl.gypi.new $PROGDIR/openssl.gypi 471 run mv $PROGDIR/openssl.gypi.new $PROGDIR/openssl.gypi
470 run rm $PROGDIR/openssl.gypi.old 472 run rm $PROGDIR/openssl.gypi.old
471 473
472 dump "Done." 474 dump "Done."
OLDNEW
« no previous file with comments | « config/x64/openssl/opensslconf.h ('k') | openssl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698