diff options
| -rwxr-xr-x | Configure | 13 | ||||
| -rw-r--r-- | TABLE | 58 | ||||
| -rw-r--r-- | crypto/whrlpool/Makefile | 4 |
3 files changed, 40 insertions, 35 deletions
@@ -114,9 +114,9 @@ my $tlib="-lnsl -lsocket"; my $bits1="THIRTY_TWO_BIT "; my $bits2="SIXTY_FOUR_BIT "; -my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o mo86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o:w86mmx-elf.o"; -my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o mo86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o:w86mmx-cof.o"; -my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o mo86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o:w86mmx-out.o"; +my $x86_elf_asm="x86cpuid-elf.o:bn86-elf.o co86-elf.o mo86-elf.o:dx86-elf.o yx86-elf.o:ax86-elf.o:bx86-elf.o:mx86-elf.o:sx86-elf.o s512sse2-elf.o:cx86-elf.o:rx86-elf.o:rm86-elf.o:r586-elf.o:wp_block.o w86mmx-elf.o"; +my $x86_coff_asm="x86cpuid-cof.o:bn86-cof.o co86-cof.o mo86-cof.o:dx86-cof.o yx86-cof.o:ax86-cof.o:bx86-cof.o:mx86-cof.o:sx86-cof.o s512sse2-cof.o:cx86-cof.o:rx86-cof.o:rm86-cof.o:r586-cof.o:wp_block.o w86mmx-cof.o"; +my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o mo86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o:rm86-out.o:r586-out.o:wp_block.o w86mmx-out.o"; my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o:::wp-x86_64.o"; my $ia64_asm="ia64cpuid.o:bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o::md5-ia64.o:sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o:::"; @@ -1224,10 +1224,13 @@ if ($aes_obj =~ /\.o$/) else { $aes_obj=$aes_enc; } +$wp_obj="" if ($wp_obj =~ /mmx/ && $processor eq "386"); if ($wp_obj =~ /\.o$/) { - if ($wp_obj =~ /mmx/ && $processor eq "386") { $wp_obj=""; } - else { $cflags.=" -DWHIRLPOOL_ASM"; } + $cflags.=" -DWHIRLPOOL_ASM"; + } +else { + $wp_obj="wp_block.o"; } # "Stringify" the C flags string. This permits it to be made part of a string @@ -215,7 +215,7 @@ $cast_obj = cx86-out.o $rc4_obj = rx86-out.o $rmd160_obj = rm86-out.o $rc5_obj = r586-out.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-out.o $dso_scheme = dlfcn $shared_target= bsd-shared $shared_cflag = -fPIC @@ -243,7 +243,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= bsd-shared $shared_cflag = -fPIC @@ -271,7 +271,7 @@ $cast_obj = $rc4_obj = rc4-x86_64.o $rmd160_obj = $rc5_obj = -$wp_obj = +$wp_obj = wp-x86_64.o $dso_scheme = dlfcn $shared_target= bsd-gcc-shared $shared_cflag = -fPIC @@ -299,7 +299,7 @@ $cast_obj = cx86-cof.o $rc4_obj = rx86-cof.o $rmd160_obj = rm86-cof.o $rc5_obj = r586-cof.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-cof.o $dso_scheme = dlfcn $shared_target= cygwin-shared $shared_cflag = -D_WINDLL @@ -355,7 +355,7 @@ $cast_obj = cx86-out.o $rc4_obj = rx86-out.o $rmd160_obj = rm86-out.o $rc5_obj = r586-out.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-out.o $dso_scheme = $shared_target= $shared_cflag = @@ -887,7 +887,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= bsd-gcc-shared $shared_cflag = -fPIC @@ -1083,7 +1083,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= bsd-shared $shared_cflag = -fPIC @@ -1279,7 +1279,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = $shared_target= $shared_cflag = @@ -1363,7 +1363,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1391,7 +1391,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1475,7 +1475,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1503,7 +1503,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1531,7 +1531,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= $shared_cflag = @@ -1559,7 +1559,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= $shared_cflag = @@ -1587,7 +1587,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = $shared_target= $shared_cflag = @@ -1727,7 +1727,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = @@ -1895,7 +1895,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = $shared_target= $shared_cflag = @@ -2371,7 +2371,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -2679,7 +2679,7 @@ $cast_obj = cx86-out.o $rc4_obj = rx86-out.o $rmd160_obj = rm86-out.o $rc5_obj = r586-out.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-out.o $dso_scheme = $shared_target= $shared_cflag = @@ -2707,7 +2707,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -2791,7 +2791,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -KPIC @@ -3015,7 +3015,7 @@ $cast_obj = $rc4_obj = rc4-x86_64.o $rmd160_obj = $rc5_obj = -$wp_obj = +$wp_obj = wp-x86_64.o $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3071,7 +3071,7 @@ $cast_obj = cx86-cof.o $rc4_obj = rx86-cof.o $rmd160_obj = rm86-cof.o $rc5_obj = r586-cof.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-cof.o $dso_scheme = win32 $shared_target= cygwin-shared $shared_cflag = -D_WINDLL -DOPENSSL_USE_APPLINK @@ -3491,7 +3491,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= svr3-shared $shared_cflag = -Kpic @@ -3519,7 +3519,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= svr3-shared $shared_cflag = -fPIC @@ -3743,7 +3743,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -3855,7 +3855,7 @@ $cast_obj = $rc4_obj = rc4-x86_64.o $rmd160_obj = $rc5_obj = -$wp_obj = +$wp_obj = wp-x86_64.o $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -4079,7 +4079,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= svr5-shared $shared_cflag = -Kpic @@ -4107,7 +4107,7 @@ $cast_obj = cx86-elf.o $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o -$wp_obj = +$wp_obj = wp_block.o w86mmx-elf.o $dso_scheme = dlfcn $shared_target= gnu-shared $shared_cflag = -fPIC diff --git a/crypto/whrlpool/Makefile b/crypto/whrlpool/Makefile index a0b07df53a..c0120a845a 100644 --- a/crypto/whrlpool/Makefile +++ b/crypto/whrlpool/Makefile @@ -11,6 +11,8 @@ CFLAG=-g MAKEFILE= Makefile AR= ar r +WP_ASM_OBJ=wp_block.o + CFLAGS= $(INCLUDES) $(CFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) AFLAGS= $(ASFLAGS) @@ -21,7 +23,7 @@ APPS= LIB=$(TOP)/libcrypto.a LIBSRC=wp_dgst.c wp_block.c -LIBOBJ=wp_dgst.o wp_block.o $(WP_ASM_OBJ) +LIBOBJ=wp_dgst.o $(WP_ASM_OBJ) SRC= $(LIBSRC) |