Commit 7a4ec19a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make no-asm work in fips mode. Add android platform.

parent a5b196a2

Configure

+3 −0
Original line number Diff line number Diff line
@@ -398,6 +398,9 @@ my %table=( 
"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",

"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",



# 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)",



#### *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)",

"BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

Makefile.org

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ 
	../crypto/evp/e_des3.o \

	../crypto/evp/m_sha1.o \

	../crypto/hmac/hmac.o \

	../crypto/modes/cbc128.o \

	../crypto/modes/cfb128.o \

	../crypto/modes/ctr128.o \

	../crypto/modes/ofb128.o \

crypto/dso/dso_dlfcn.c

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ DSO_METHOD *DSO_METHOD_dlfcn(void) 
# define HAVE_DLINFO 1

# if defined(_AIX) || defined(__CYGWIN__) || \

     defined(__SCO_VERSION__) || defined(_SCO_ELF) || \

     (defined(__OpenBSD__) && !defined(RTLD_SELF))

     (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \

	defined(__ANDROID__)

#  undef HAVE_DLINFO

# endif

#endif