Commit 6db8e3bd authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Add support for Android 5, both 32- and 64-bit cases. 

Special note about additional -pie flag in android-armv7. The initial
reason for adding it is that Android 5 refuses to execute non-PIE
binaries. But what about older systems and previously validated
platforms? It should be noted that flag is not used when compiling
object code, fipscanister.o in this context, only when linking
applications, *supplementary* fips_algvs used during validation
procedure.

Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
parent 50e2a0ea

Configure

+2 −1
Changes for Configure: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ my %table=( 
# Android: linux-* but without -DTERMIO and pointers to headers and libs.

"android","gcc:-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:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"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-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-pie%-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}: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:-DTERMIOS -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)",

config

+1 −0
Changes for config: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -872,6 +872,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

fips/fips_canister.c

+1 −0
Changes for fips/fips_canister.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ const void *FIPS_text_end(void); 


#if !defined(FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE)

# if	(defined(__ANDROID__) && (defined(__arm__) || defined(__arm)	|| \

				  defined(__aarch64__)			|| \

				  defined(__i386__)|| defined(__i386)))	|| \

	(defined(__vxworks)   && (defined(__ppc__) || defined(__ppc)	|| \

				  defined(__mips__)|| defined(__mips)))	|| \

fips/fips_test_suite.c

+1 −1
Changes for fips/fips_test_suite.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ int main(int argc, char **argv) 


    FIPS_post_set_callback(post_cb);



#if defined(__APPLE__) && (defined(__arm__) || defined(__aarch64__))

#if (defined(__arm__) || defined(__aarch64__))

    extern unsigned int OPENSSL_armcap_P;

    if (0 == OPENSSL_armcap_P)

	fprintf(stderr, "Optimizations disabled\n");

test/fips_algvs.c

+1 −1
Changes for test/fips_algvs.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ int main(int argc, char **argv) 
	SysInit();

#endif



#if defined(__APPLE__) && (defined(__arm__) || defined(__aarch64__))

#if (defined(__arm__) || defined(__aarch64__))

	if (*args && !strcmp(*args, "-noaccel"))

		{

		extern unsigned int OPENSSL_armcap_P;