From 6a8517f2746a5f58cf1c1173fbb771dbe92d2c64 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Tue, 28 Aug 2007 20:45:25 +0000 Subject: [PATCH] Make room for Camellia assembler. --- Configure | 81 ++++++++++--------- Makefile.org | 1 + TABLE | 163 ++++++++++++++++++++++++++++++++++++++- crypto/camellia/Makefile | 5 +- 4 files changed, 209 insertions(+), 41 deletions(-) diff --git a/Configure b/Configure index 23c1595e97..6825350e2e 100755 --- a/Configure +++ b/Configure @@ -116,16 +116,18 @@ 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: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:sha1-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 rc4_skey.o:::"; -my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::"; -my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o::::::::::"; -my $s390x_asm=":bn_asm.o s390x-mont.o::aes_cbc.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o:::::"; -my $no_asm=":::::::::::"; +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:sha1-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 rc4_skey.o::::"; +my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o::::::"; +my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::"; +my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::::::::"; +my $mips3_asm=":bn-mips3.o:::::::::::"; +my $s390x_asm=":bn_asm.o s390x-mont.o::aes_cbc.o aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::::::"; +my $no_asm="::::::::::::"; # As for $BSDthreads. Idea is to maintain "collective" set of flags, # which would cover all BSD flavors. -pthread applies to them all, @@ -136,7 +138,7 @@ my $no_asm=":::::::::::"; # seems to be sufficient? my $BSDthreads="-pthread -D_THREAD_SAFE -D_REENTRANT"; -#config-string $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags +#config-string $cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $cpuid_obj : $bn_obj : $des_obj : $aes_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $wp_obj : $cmll_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags my %table=( # File 'TABLE' (created by 'make TABLE') contains the data from this list, @@ -171,7 +173,7 @@ my %table=( "debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", "debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-linux-ia32-aes", "gcc:-DAES_EXPERIMENTAL -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:x86cpuid-elf.o:bn86-elf.o co86-elf.o mo86-elf.o:dx86-elf.o yx86-elf.o:aes_x86core.o aes_cbc.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:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-linux-ia32-aes", "gcc:-DAES_EXPERIMENTAL -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:x86cpuid-elf.o:bn86-elf.o co86-elf.o mo86-elf.o:dx86-elf.o yx86-elf.o:aes_x86core.o aes_cbc.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::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "dist", "cc:-O::(unknown)::::::", # Basic configs that should work on any (32 and less bit) box @@ -205,12 +207,12 @@ my %table=( #### SPARC Solaris with GNU C setups "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc "solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### -"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -O -g -mcpu=ultrasparc -pedantic -ansi -Wall -Wshadow -Wno-long-long -D__EXTENSIONS__ -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SPARC Solaris with Sun C setups @@ -218,11 +220,11 @@ my %table=( # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8 # SC5.0 note: Compiler common patch 107357-01 or later is required! "solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-xarch=v9 -G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", #### -"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::sparcv8.o:::::::::::dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:solaris-shared:-KPIC:-G -dy -z text:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SunOS configs, assuming sparc for the gcc one. @@ -236,11 +238,11 @@ my %table=( #### IRIX 6.x configs # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke # './Configure irix-cc -o32' manually. -"irix-mips3-gcc","gcc:-mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT::bn-mips3.o:::::::::::dlfcn:irix-shared::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT::bn-mips3.o:::::::::::dlfcn:irix-shared::-n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-mips3-gcc","gcc:-mabi=n32 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips3_asm}:dlfcn:irix-shared::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-mips3-cc", "cc:-n32 -mips3 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_asm}:dlfcn:irix-shared::-n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # N64 ABI builds. -"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o:::::::::::dlfcn:irix-shared::-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG::bn-mips3.o:::::::::::dlfcn:irix-shared::-64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_asm}:dlfcn:irix-shared::-mabi=64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -G0 -rdata_shared -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE:::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_asm}:dlfcn:irix-shared::-64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Unified HP-UX ANSI C configs. # Special notes: @@ -273,8 +275,8 @@ my %table=( # Since there is mention of this in shlib/hpux10-cc.sh "hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:${no_asm}:dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1::pa-risc2.o:::::::::::dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o:::::::::::dlfcn:hpux-shared:-fpic:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc2-gcc","gcc:-march=2.0 -O3 -DB_ENDIAN -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL DES_RISC1::pa-risc2.o::::::::::::dl:hpux-shared:-fPIC:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux64-parisc2-gcc","gcc:-O3 -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o::::::::::::dlfcn:hpux-shared:-fpic:-shared:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # More attempts at unified 10.X and 11.X targets for HP C compiler. # @@ -282,8 +284,8 @@ my %table=( # Kevin Steves "hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "hpux-parisc1_0-cc","cc:+DAportable +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-Wl,+s -ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:${no_asm}:dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2.o:::::::::::dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o:::::::::::dlfcn:hpux-shared:+Z:+DD64 -b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-Wl,+s -ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2.o::::::::::::dl:hpux-shared:+Z:-b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::pa-risc2W.o::::::::::::dlfcn:hpux-shared:+Z:+DD64 -b:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # HP/UX IA-64 targets "hpux-ia64-cc","cc:-Ae +DD32 +O2 +Olit=all -z -DB_ENDIAN -D_REENTRANT::::-ldl:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX DES_UNROLL DES_RISC1 DES_INT:${ia64_asm}:dlfcn:hpux-shared:+Z:+DD32 -b:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -320,14 +322,14 @@ my %table=( # *-generic* is endian-neutral target, but ./config is free to # throw in -D[BL]_ENDIAN, whichever appropriate... "linux-generic32","gcc:-DTERMIO -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)", -"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:ppccpuid_linux32.o:linux_ppc32.o linux_ppc32-mont.o:::::sha1-ppc_linux32.o sha256-ppc_linux32.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:ppccpuid_linux32.o:linux_ppc32.o linux_ppc32-mont.o:::::sha1-ppc_linux32.o sha256-ppc_linux32.o:::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### 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)", "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -march=i486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", #### "linux-generic64","gcc:-DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"linux-ppc64", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:ppccpuid_linux64.o:linux_ppc64.o linux_ppc64-mont.o:::::sha1-ppc_linux64.o sha256-ppc_linux64.o sha512-ppc_linux64.o::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-ppc64", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:ppccpuid_linux64.o:linux_ppc64.o linux_ppc64-mont.o:::::sha1-ppc_linux64.o sha256-ppc_linux64.o sha512-ppc_linux64.o:::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -336,7 +338,7 @@ my %table=( #### SPARC Linux setups # Ray Miller has patiently # assisted with debugging of following two configs. -"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv8_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # it's a real mess with -mcpu=ultrasparc option under Linux, but # -Wa,-Av8plus should do the trick no matter what. "linux-sparcv9","gcc:-m32 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${sparcv9_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -365,7 +367,7 @@ my %table=( "BSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-BSD-x86-elf", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wall -g::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"BSD-sparcv8", "gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::sparcv8.o:des_enc-sparc.o fcrypt_b.o::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"BSD-sparcv8", "gcc:-DB_ENDIAN -DTERMIOS -O3 -mv8 -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "BSD-generic64","gcc:-DTERMIOS -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it @@ -413,12 +415,12 @@ my %table=( #### IBM's AIX. "aix3-cc", "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::", -"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR:ppccpuid_aix32.o:aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", -"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:ppccpuid_aix64.o:aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64", +"aix-gcc", "gcc:-O -DB_ENDIAN::-D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR:ppccpuid_aix32.o:aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o:::::::dlfcn:aix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", +"aix64-gcc","gcc:-maix64 -O -DB_ENDIAN::-D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:ppccpuid_aix64.o:aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o:::::::dlfcn:aix-shared::-maix64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X64", # Below targets assume AIX 5. Idea is to effectively disregard $OBJECT_MODE # at build time. $OBJECT_MODE is respected at ./config stage! -"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:ppccpuid_aix32.o:aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", -"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:ppccpuid_aix64.o:aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o::::::dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64", +"aix-cc", "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::BN_LLONG RC4_CHAR:ppccpuid_aix32.o:aix_ppc32.o aix_ppc32-mont.o:::::sha1-ppc_aix32.o sha256-ppc_aix32.o:::::::dlfcn:aix-shared::-q32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32", +"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:ppccpuid_aix64.o:aix_ppc64.o aix_ppc64-mont.o:::::sha1-ppc_aix64.o sha256-ppc_aix64.o sha512-ppc_aix64.o:::::::dlfcn:aix-shared::-q64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64", # # Cray T90 and similar (SDSC) @@ -510,10 +512,10 @@ my %table=( ##### MacOS X (a.k.a. Rhapsody or Darwin) setup "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::", -"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:ppccpuid_osx32.o:osx_ppc32.o osx_ppc32-mont.o:::::sha1-ppc_osx32.o sha256-ppc_osx32.o::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -"darwin64-ppc-cc","cc:-m64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:ppccpuid_osx64.o:osx_ppc64.o osx_ppc64-mont.o:::::sha1-ppc_osx64.o sha256-ppc_osx64.o sha512-ppc_osx64.o::::::dlfcn:darwin-shared:-fPIC -fno-common:-m64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:ppccpuid_osx32.o:osx_ppc32.o osx_ppc32-mont.o:::::sha1-ppc_osx32.o sha256-ppc_osx32.o:::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +"darwin64-ppc-cc","cc:-m64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:ppccpuid_osx64.o:osx_ppc64.o osx_ppc64-mont.o:::::sha1-ppc_osx64.o sha256-ppc_osx64.o sha512-ppc_osx64.o:::::::dlfcn:darwin-shared:-fPIC -fno-common:-m64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", "darwin-i386-cc","cc:-O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", -"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o osx_ppc32-mont.o:::::sha1-ppc_osx32.o::::::dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o osx_ppc32-mont.o:::::sha1-ppc_osx32.o:::::::dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ##### A/UX "aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", @@ -563,6 +565,7 @@ my $idx_rc4_obj = $idx++; my $idx_rmd160_obj = $idx++; my $idx_rc5_obj = $idx++; my $idx_wp_obj = $idx++; +my $idx_cmll_obj = $idx++; my $idx_dso_scheme = $idx++; my $idx_shared_target = $idx++; my $idx_shared_cflag = $idx++; @@ -606,6 +609,7 @@ my $rc5_enc="rc5_enc.o"; my $md5_obj=""; my $sha1_obj=""; my $rmd160_obj=""; +my $cmll_enc="camellia.o cmll_misc.o cmll_cbc.o"; my $processor=""; my $default_ranlib; my $perl; @@ -979,6 +983,7 @@ my $rc4_obj = $fields[$idx_rc4_obj]; my $rmd160_obj = $fields[$idx_rmd160_obj]; my $rc5_obj = $fields[$idx_rc5_obj]; my $wp_obj = $fields[$idx_wp_obj]; +my $cmll_obj = $fields[$idx_cmll_obj]; my $dso_scheme = $fields[$idx_dso_scheme]; my $shared_target = $fields[$idx_shared_target]; my $shared_cflag = $fields[$idx_shared_cflag]; @@ -1258,6 +1263,7 @@ if ($wp_obj =~ /\.o$/) else { $wp_obj="wp_block.o"; } +$cmll_obj=$cmll_enc unless ($cmll_obj =~ /.o$/); # "Stringify" the C flags string. This permits it to be made part of a string # and works as well on command lines. @@ -1354,6 +1360,7 @@ while () s/^SHA1_ASM_OBJ=.*$/SHA1_ASM_OBJ= $sha1_obj/; s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $rmd160_obj/; s/^WP_ASM_OBJ=.*$/WP_ASM_OBJ= $wp_obj/; + s/^CMLL_ENC=.*$/CMLL_ENC= $cmll_obj/; s/^PROCESSOR=.*/PROCESSOR= $processor/; s/^ARFLAGS=.*/ARFLAGS= $arflags/; s/^PERL=.*/PERL= $perl/; @@ -1404,6 +1411,7 @@ print "RC5_ENC =$rc5_obj\n"; print "MD5_OBJ_ASM =$md5_obj\n"; print "SHA1_OBJ_ASM =$sha1_obj\n"; print "RMD160_OBJ_ASM=$rmd160_obj\n"; +print "CMLL_ENC= =$cmll_obj\n"; print "PROCESSOR =$processor\n"; print "RANLIB =$ranlib\n"; print "ARFLAGS =$arflags\n"; @@ -1785,7 +1793,7 @@ sub print_table_entry (my $cc,my $cflags,my $unistd,my $thread_cflag,my $sys_id,my $lflags, my $bn_ops,my $cpuid_obj,my $bn_obj,my $des_obj,my $aes_obj, my $bf_obj, my $md5_obj,my $sha1_obj,my $cast_obj,my $rc4_obj,my $rmd160_obj, - my $rc5_obj,my $wp_obj,my $dso_scheme,my $shared_target,my $shared_cflag, + my $rc5_obj,my $wp_obj,my $cmll_obj,my $dso_scheme,my $shared_target,my $shared_cflag, my $shared_ldflag,my $shared_extension,my $ranlib,my $arflags)= split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); @@ -1811,6 +1819,7 @@ sub print_table_entry \$rmd160_obj = $rmd160_obj \$rc5_obj = $rc5_obj \$wp_obj = $wp_obj +\$cmll_obj = $cmll_obj \$dso_scheme = $dso_scheme \$shared_target= $shared_target \$shared_cflag = $shared_cflag diff --git a/Makefile.org b/Makefile.org index d473eb5688..2e64b1eab6 100644 --- a/Makefile.org +++ b/Makefile.org @@ -97,6 +97,7 @@ MD5_ASM_OBJ= SHA1_ASM_OBJ= RMD160_ASM_OBJ= WP_ASM_OBJ= +CMLL_ENC= # KRB5 stuff KRB5_INCLUDES= diff --git a/TABLE b/TABLE index b20c0ba85a..08835a4a76 100644 --- a/TABLE +++ b/TABLE @@ -20,6 +20,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = win32 $shared_target= $shared_cflag = @@ -48,6 +49,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -76,6 +78,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-gcc-shared $shared_cflag = -fPIC @@ -104,6 +107,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-gcc-shared $shared_cflag = -fPIC @@ -132,6 +136,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-gcc-shared $shared_cflag = -fPIC @@ -160,6 +165,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-gcc-shared $shared_cflag = -fPIC @@ -188,6 +194,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-gcc-shared $shared_cflag = -fPIC @@ -216,6 +223,7 @@ $rc4_obj = rx86-out.o $rmd160_obj = rm86-out.o $rc5_obj = r586-out.o $wp_obj = wp_block.o w86mmx-out.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-shared $shared_cflag = -fPIC @@ -244,6 +252,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-shared $shared_cflag = -fPIC @@ -272,6 +281,7 @@ $rc4_obj = rc4-x86_64.o $rmd160_obj = $rc5_obj = $wp_obj = wp-x86_64.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-gcc-shared $shared_cflag = -fPIC @@ -300,6 +310,7 @@ $rc4_obj = rx86-cof.o $rmd160_obj = rm86-cof.o $rc5_obj = r586-cof.o $wp_obj = wp_block.o w86mmx-cof.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= cygwin-shared $shared_cflag = -D_WINDLL @@ -328,6 +339,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = win32 $shared_target= $shared_cflag = @@ -356,6 +368,7 @@ $rc4_obj = rx86-out.o $rmd160_obj = rm86-out.o $rc5_obj = r586-out.o $wp_obj = wp_block.o w86mmx-out.o +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -384,6 +397,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -412,6 +426,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -440,6 +455,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -468,6 +484,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= reliantunix-shared $shared_cflag = @@ -496,6 +513,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -524,6 +542,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -552,6 +571,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = win32 $shared_target= $shared_cflag = @@ -580,6 +600,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = win32 $shared_target= $shared_cflag = @@ -608,6 +629,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = win32 $shared_target= $shared_cflag = @@ -636,6 +658,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = win32 $shared_target= $shared_cflag = @@ -664,6 +687,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = win32 $shared_target= $shared_cflag = @@ -692,6 +716,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = win32 $shared_target= $shared_cflag = @@ -720,6 +745,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= aix-shared $shared_cflag = @@ -748,6 +774,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= aix-shared $shared_cflag = @@ -776,6 +803,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -804,6 +832,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= aix-shared $shared_cflag = @@ -832,6 +861,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= aix-shared $shared_cflag = @@ -860,6 +890,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -888,6 +919,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = beos $shared_target= beos-shared $shared_cflag = -fPIC @@ -916,6 +948,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = beos $shared_target= beos-shared $shared_cflag = -fPIC -DPIC @@ -944,6 +977,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-gcc-shared $shared_cflag = -fPIC @@ -972,6 +1006,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1000,6 +1035,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1028,6 +1064,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1056,6 +1093,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= darwin-shared $shared_cflag = -fPIC -fno-common @@ -1084,6 +1122,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= darwin-shared $shared_cflag = -fPIC -fno-common @@ -1112,6 +1151,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= darwin-shared $shared_cflag = -fPIC -fno-common @@ -1140,6 +1180,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1168,6 +1209,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= bsd-shared $shared_cflag = -fPIC @@ -1196,6 +1238,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= cygwin-shared $shared_cflag = -D_WINDLL @@ -1224,6 +1267,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1252,6 +1296,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1280,6 +1325,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1308,6 +1354,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1336,6 +1383,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1364,6 +1412,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1392,6 +1441,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= darwin-shared $shared_cflag = -fPIC @@ -1420,6 +1470,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1448,6 +1499,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1476,6 +1528,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1504,6 +1557,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1532,6 +1586,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1560,6 +1615,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1588,6 +1644,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1616,6 +1673,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -1644,6 +1702,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= $shared_cflag = @@ -1672,6 +1731,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= $shared_cflag = @@ -1700,6 +1760,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1718,7 +1779,7 @@ $lflags = -lsocket -lnsl -ldl $bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR $cpuid_obj = $bn_obj = sparcv8.o -$des_obj = +$des_obj = des_enc-sparc.o fcrypt_b.o $aes_obj = $bf_obj = $md5_obj = @@ -1728,6 +1789,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -KPIC @@ -1746,7 +1808,7 @@ $lflags = -lsocket -lnsl -ldl $bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR $cpuid_obj = $bn_obj = sparcv8.o -$des_obj = +$des_obj = des_enc-sparc.o fcrypt_b.o $aes_obj = $bf_obj = $md5_obj = @@ -1756,6 +1818,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -1784,6 +1847,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -KPIC @@ -1812,6 +1876,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -1840,6 +1905,7 @@ $rc4_obj = rc4-x86_64.o $rmd160_obj = $rc5_obj = $wp_obj = wp-x86_64.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = @@ -1868,6 +1934,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = @@ -1896,6 +1963,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = @@ -1924,6 +1992,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = win32 $shared_target= cygwin-shared $shared_cflag = @@ -1952,6 +2021,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -1980,6 +2050,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -2008,6 +2079,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -2036,6 +2108,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -2064,6 +2137,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -2092,6 +2166,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -2120,6 +2195,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dl $shared_target= hpux-shared $shared_cflag = +Z @@ -2148,6 +2224,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dl $shared_target= hpux-shared $shared_cflag = -fPIC @@ -2176,6 +2253,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= hpux-shared $shared_cflag = +Z @@ -2204,6 +2282,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= hpux-shared $shared_cflag = -fpic @@ -2232,6 +2311,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dl $shared_target= hpux-shared $shared_cflag = +Z @@ -2260,6 +2340,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dl $shared_target= hpux-shared $shared_cflag = +Z @@ -2288,6 +2369,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dl $shared_target= hpux-shared $shared_cflag = -fPIC @@ -2316,6 +2398,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dl $shared_target= hpux-shared $shared_cflag = +Z @@ -2344,6 +2427,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dl $shared_target= hpux-shared $shared_cflag = +Z @@ -2372,6 +2456,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dl $shared_target= hpux-shared $shared_cflag = -fPIC @@ -2400,6 +2485,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= hpux-shared $shared_cflag = +Z @@ -2428,6 +2514,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= hpux-shared $shared_cflag = -fpic @@ -2456,6 +2543,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= hpux-shared $shared_cflag = +Z @@ -2484,6 +2572,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= hpux-shared $shared_cflag = -fpic @@ -2512,6 +2601,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -2540,6 +2630,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= irix-shared $shared_cflag = @@ -2568,6 +2659,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= irix-shared $shared_cflag = @@ -2596,6 +2688,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= irix-shared $shared_cflag = @@ -2624,6 +2717,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= irix-shared $shared_cflag = @@ -2652,6 +2746,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= irix-shared $shared_cflag = @@ -2680,6 +2775,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= irix-shared $shared_cflag = @@ -2708,6 +2804,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -2736,6 +2833,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -2764,6 +2862,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -2792,6 +2891,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -2820,6 +2920,7 @@ $rc4_obj = rx86-out.o $rmd160_obj = rm86-out.o $rc5_obj = r586-out.o $wp_obj = wp_block.o w86mmx-out.o +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -2848,6 +2949,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -2876,6 +2978,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -2904,6 +3007,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -2932,6 +3036,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -KPIC @@ -2960,6 +3065,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -2988,6 +3094,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3016,6 +3123,7 @@ $rc4_obj = rc4-ia64.o rc4_skey.o $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3044,6 +3152,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3072,6 +3181,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3100,6 +3210,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3128,6 +3239,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3156,6 +3268,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3184,6 +3297,7 @@ $rc4_obj = rc4-x86_64.o $rmd160_obj = $rc5_obj = $wp_obj = wp-x86_64.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3212,6 +3326,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= linux-shared $shared_cflag = -fPIC @@ -3240,6 +3355,7 @@ $rc4_obj = rx86-cof.o $rmd160_obj = rm86-cof.o $rc5_obj = r586-cof.o $wp_obj = wp_block.o w86mmx-cof.o +$cmll_obj = $dso_scheme = win32 $shared_target= cygwin-shared $shared_cflag = -D_WINDLL -DOPENSSL_USE_APPLINK @@ -3268,6 +3384,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3296,6 +3413,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3324,6 +3442,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3352,6 +3471,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3380,6 +3500,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3408,6 +3529,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3436,6 +3558,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3464,6 +3587,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3492,6 +3616,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= alpha-osf1-shared $shared_cflag = @@ -3520,6 +3645,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= alpha-osf1-shared $shared_cflag = @@ -3548,6 +3674,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3576,6 +3703,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3604,6 +3732,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3632,6 +3761,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -3660,6 +3790,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= svr3-shared $shared_cflag = -Kpic @@ -3688,6 +3819,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= svr3-shared $shared_cflag = -fPIC @@ -3716,6 +3848,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -KPIC @@ -3744,6 +3877,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -3772,6 +3906,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -KPIC @@ -3800,6 +3935,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -3828,6 +3964,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -KPIC @@ -3856,6 +3993,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -3884,6 +4022,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -KPIC @@ -3912,6 +4051,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -3940,6 +4080,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -KPIC @@ -3968,6 +4109,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -3996,6 +4138,7 @@ $rc4_obj = rc4-x86_64.o $rmd160_obj = $rc5_obj = $wp_obj = wp-x86_64.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -KPIC @@ -4024,6 +4167,7 @@ $rc4_obj = rc4-x86_64.o $rmd160_obj = $rc5_obj = $wp_obj = wp-x86_64.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= solaris-shared $shared_cflag = -fPIC @@ -4052,6 +4196,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4080,6 +4225,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4108,6 +4254,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = dlfcn $shared_target= alpha-osf1-shared $shared_cflag = @@ -4136,6 +4283,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4164,6 +4312,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4192,6 +4341,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4220,6 +4370,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4248,6 +4399,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= svr5-shared $shared_cflag = -Kpic @@ -4276,6 +4428,7 @@ $rc4_obj = rx86-elf.o $rmd160_obj = rm86-elf.o $rc5_obj = r586-elf.o $wp_obj = wp_block.o w86mmx-elf.o +$cmll_obj = $dso_scheme = dlfcn $shared_target= gnu-shared $shared_cflag = -fPIC @@ -4304,6 +4457,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4332,6 +4486,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4360,6 +4515,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4388,6 +4544,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4416,6 +4573,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = @@ -4444,6 +4602,7 @@ $rc4_obj = $rmd160_obj = $rc5_obj = $wp_obj = +$cmll_obj = $dso_scheme = $shared_target= $shared_cflag = diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile index 1579de5ce5..6e9d762e90 100644 --- a/crypto/camellia/Makefile +++ b/crypto/camellia/Makefile @@ -11,7 +11,7 @@ CFLAG=-g MAKEFILE= Makefile AR= ar r -CAMELLIA_ASM_OBJ= +CMLL_ENC= camellia.o cmll_misc.o cmll_cbc.o CFLAGS= $(INCLUDES) $(CFLAG) ASFLAGS= $(INCLUDES) $(ASFLAG) @@ -25,8 +25,7 @@ LIB=$(TOP)/libcrypto.a LIBSRC=camellia.c cmll_misc.c cmll_ecb.c cmll_cbc.c cmll_ofb.c \ cmll_cfb.c cmll_ctr.c -LIBOBJ= camellia.o cmll_misc.o cmll_ecb.o cmll_cbc.o cmll_ofb.o \ - cmll_cfb.o cmll_ctr.o $(CAMELLIA_ASM_OBJ) +LIBOBJ= cmll_ecb.o cmll_ofb.o cmll_cfb.o cmll_ctr.o $(CMLL_ENC) SRC= $(LIBSRC) -- 2.25.1