[openssl] OpenSSL_1_0_2-stable update
matthias.st.pierre at ncp-e.com
matthias.st.pierre at ncp-e.com
Wed Apr 17 00:00:55 UTC 2019
The branch OpenSSL_1_0_2-stable has been updated
via f937540ec40a5e838460b8f19d2eb722529126b8 (commit)
from d3299a33e5acdf61502755d807d5885c17c46003 (commit)
- Log -----------------------------------------------------------------
commit f937540ec40a5e838460b8f19d2eb722529126b8
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date: Tue Apr 9 15:04:29 2019 +0200
Add FIPS support for Android Arm 64-bit
Fixes #2490
Fixes #8711
In commit 6db8e3bdc9e, support for Android Arm 64-bit was added to
the OpenSSL FIPS Object Module. For some reason, the corresponding
target 'android64-aarch64' was missing OpenSSL 1.0.2, whence it
could not be built with FIPS support on Android Arm 64-bit.
This commit adds the missing target.
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8713)
-----------------------------------------------------------------------
Summary of changes:
CHANGES | 8 +++++++-
Configure | 1 +
TABLE | 34 ++++++++++++++++++++++++++++++++++
config | 1 +
4 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/CHANGES b/CHANGES
index 7080ac2..78c7b59 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,13 @@
Changes between 1.0.2r and 1.0.2s [xx XXX xxxx]
- *)
+ *) Add FIPS support for Android Arm 64-bit
+
+ Support for Android Arm 64-bit was added to the OpenSSL FIPS Object Module in
+ Version 2.0.10. For some reason, the corresponding target 'android64-aarch64'
+ was missing OpenSSL 1.0.2, whence it could not be built with FIPS support on
+ Android Arm 64-bit. This omission has been fixed.
+ [Matthias St. Pierre]
Changes between 1.0.2q and 1.0.2r [26 Feb 2019]
diff --git a/Configure b/Configure
index c7066dc..3846c91 100755
--- a/Configure
+++ b/Configure
@@ -475,6 +475,7 @@ my %table=(
"android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"android64-aarch64","gcc:-mandroid -fPIC -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-pie%-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### *BSD [do see comment about ${BSDthreads} above!]
"BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/TABLE b/TABLE
index 47bdbf8..a8277f7 100644
--- a/TABLE
+++ b/TABLE
@@ -1190,6 +1190,40 @@ $ranlib =
$arflags =
$multilib =
+*** android64-aarch64
+$cc = gcc
+$cflags = -mandroid -fPIC -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -Wall
+$unistd =
+$thread_cflag = -D_REENTRANT
+$sys_id =
+$lflags = -pie%-ldl
+$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
+$cpuid_obj = armcap.o arm64cpuid.o mem_clr.o
+$bn_obj =
+$ec_obj =
+$des_obj =
+$aes_obj = aes_core.o aes_cbc.o aesv8-armx.o
+$bf_obj =
+$md5_obj =
+$sha1_obj = sha1-armv8.o sha256-armv8.o sha512-armv8.o
+$cast_obj =
+$rc4_obj =
+$rmd160_obj =
+$rc5_obj =
+$wp_obj =
+$cmll_obj =
+$modes_obj = ghashv8-armx.o
+$engines_obj =
+$perlasm_scheme = linux64
+$dso_scheme = dlfcn
+$shared_target= linux-shared
+$shared_cflag =
+$shared_ldflag =
+$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)
+$ranlib =
+$arflags =
+$multilib =
+
*** aux3-gcc
$cc = gcc
$cflags = -O2 -DTERMIO
diff --git a/config b/config
index 6214c4b..c8a3b58 100755
--- a/config
+++ b/config
@@ -871,6 +871,7 @@ case "$GUESSOS" in
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;;
armv[7-9]*-*-android) OUT="android-armv7" ;;
+ aarch64-*-android) OUT="android64-aarch64" ;;
*) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
esac
More information about the openssl-commits
mailing list