Commit 988037fe authored by Andy Polyakov's avatar Andy Polyakov
Browse files

MIPS assembly pack: jumbo update from HEAD.

parent 9a7f80c8

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 1.0.1 and 1.0.2 [xx XXX xxxx]



  *) MIPS assembly pack updates: support for MIPS32r2 and SmartMIPS ASE,

     platform support for Linux and Android.

     [Andy Polyakov]



  *) Call OCSP Stapling callback after ciphersuite has been chosen, so

     the right response is stapled. Also change current certificate to

     the certificate actually sent.

Configure

+14 −0
Original line number Diff line number Diff line
@@ -348,6 +348,13 @@ my %table=( 
# It's believed that majority of ARM toolchains predefine appropriate -march.

# If you compiler does not, do complement config command line with one!

"linux-armv4",	"gcc:-DTERMIO -O3 -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)",

# Configure script adds minimally required -march for assembly support,

# if no -march was specified at command line. mips32 and mips64 below

# refer to contemporary MIPS Architecture specifications, MIPS32 and

# MIPS64, rather than to kernel bitness.

"linux-mips32",	"gcc:-mabi=32 -DTERMIO -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)",

"linux-mips64",   "gcc:-mabi=n32 -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:n32:dlfcn:linux-shared:-fPIC:-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32",

"linux64-mips64",   "gcc:-mabi=64 -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips64_asm}:64:dlfcn:linux-shared:-fPIC:-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",

#### IA-32 targets...

"linux-ia32-icc",	"icc:-DL_ENDIAN -DTERMIO -O2 -no_cpprt::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"linux-elf",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -406,6 +413,7 @@ my %table=( 
"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-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)",



#### *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)",
@@ -1202,6 +1210,12 @@ if ($target =~ /^mingw/ && `$cc --target-help 2>&1` !~ m/\-mno\-cygwin/m) 
	$shared_ldflag =~ s/\-mno\-cygwin\s*//;

	}



if ($target =~ /linux.*\-mips/ && !$no_asm && $flags !~ /\-m(ips|arch=)/) {

	# minimally required architecture flags for assembly modules

	$cflags="-mips2 $cflags" if ($target =~ /mips32/);

	$cflags="-mips3 $cflags" if ($target =~ /mips64/);

}



my $no_shared_warn=0;

my $no_user_cflags=0;

TABLE

+132 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,39 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** android-mips

$cc           = gcc

$cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR

$cpuid_obj    = 

$bn_obj       = bn-mips.o mips-mont.o

$des_obj      = 

$aes_obj      = aes_cbc.o aes-mips.o

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = sha1-mips.o sha256-mips.o

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$modes_obj    = 

$engines_obj  = 

$perlasm_scheme = o32

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 

$multilib     = 



*** android-x86

$cc           = gcc

$cflags       = -mandroid -I$(ANDROID_DEV)/include -B$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall
@@ -4191,6 +4224,72 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** linux-mips32

$cc           = gcc

$cflags       = -mabi=32 -DTERMIO -O3 -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR

$cpuid_obj    = 

$bn_obj       = bn-mips.o mips-mont.o

$des_obj      = 

$aes_obj      = aes_cbc.o aes-mips.o

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = sha1-mips.o sha256-mips.o

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$modes_obj    = 

$engines_obj  = 

$perlasm_scheme = o32

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = 

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 

$multilib     = 



*** linux-mips64

$cc           = gcc

$cflags       = -mabi=n32 -DTERMIO -O3 -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR

$cpuid_obj    = 

$bn_obj       = bn-mips.o mips-mont.o

$des_obj      = 

$aes_obj      = aes_cbc.o aes-mips.o

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = sha1-mips.o sha256-mips.o sha512-mips.o

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$modes_obj    = 

$engines_obj  = 

$perlasm_scheme = n32

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = -mabi=n32

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 

$multilib     = 32



*** linux-ppc

$cc           = gcc

$cflags       = -DB_ENDIAN -DTERMIO -O3 -Wall
@@ -4422,6 +4521,39 @@ $ranlib = 
$arflags      = 

$multilib     = /highgprs



*** linux64-mips64

$cc           = gcc

$cflags       = -mabi=64 -DTERMIO -O3 -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = 

$lflags       = -ldl

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR

$cpuid_obj    = 

$bn_obj       = bn-mips.o mips-mont.o

$des_obj      = 

$aes_obj      = aes_cbc.o aes-mips.o

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = sha1-mips.o sha256-mips.o sha512-mips.o

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$modes_obj    = 

$engines_obj  = 

$perlasm_scheme = 64

$dso_scheme   = dlfcn

$shared_target= linux-shared

$shared_cflag = -fPIC

$shared_ldflag = -mabi=64

$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR)

$ranlib       = 

$arflags      = 

$multilib     = 64



*** linux64-s390x

$cc           = gcc

$cflags       = -m64 -DB_ENDIAN -DTERMIO -O3 -Wall

config

+10 −0
Original line number Diff line number Diff line
@@ -596,6 +596,16 @@ case "$GUESSOS" in 
	OUT="linux-ppc"

	;;

  ppc-*-linux2) OUT="linux-ppc" ;;

  mips64*-*-linux2)

	echo "WARNING! If you wish to build 64-bit library, then you have to"

	echo "         invoke './Configure linux64-mips64' *manually*."

	if [ "$TEST" = "false" -a -t 1 ]; then

	    echo "         You have about 5 seconds to press Ctrl-C to abort."

	    (trap "stty `stty -g`" 2 0; stty -icanon min 0 time 50; read waste) <&1

	fi

	OUT="linux-mips64"

	;;

  mips*-*-linux2) OUT="linux-mips32" ;;

  ppc60x-*-vxworks*) OUT="vxworks-ppc60x" ;;

  ppcgen-*-vxworks*) OUT="vxworks-ppcgen" ;;

  pentium-*-vxworks*) OUT="vxworks-pentium" ;;

crypto/aes/asm/aes-mips.pl

+661 −150

File changed.

Preview size limit exceeded, changes collapsed.