From 905fd45b3627553543c3b953f28de2198241edb7 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Thu, 9 Dec 2004 15:39:55 +0000 Subject: [PATCH] Engage SHA1 IA64 assembler on IA64 platforms. --- Configure | 2 +- TABLE | 12 ++++++------ crypto/sha/Makefile.ssl | 2 ++ crypto/sha/sha_locl.h | 5 +++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Configure b/Configure index ac3d86f771..e2b6f99359 100755 --- a/Configure +++ b/Configure @@ -118,7 +118,7 @@ my $x86_elf_asm="x86cpuid-elf.o:asm/bn86-elf.o asm/co86-elf.o:asm/dx86-elf.o asm my $x86_coff_asm="x86cpuid-cof.o:asm/bn86-cof.o asm/co86-cof.o:asm/dx86-cof.o asm/yx86-cof.o::asm/bx86-cof.o:asm/mx86-cof.o:asm/sx86-cof.o asm/s512sse2-cof.o:asm/cx86-cof.o:asm/rx86-cof.o:asm/rm86-cof.o:asm/r586-cof.o"; my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o:dx86-out.o yx86-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"; -my $ia64_asm=":asm/ia64.o::asm/aes-ia64.o:::asm/sha256-ia64.o asm/sha512-ia64.o::asm/rc4-ia64.o::"; +my $ia64_asm=":asm/ia64.o::asm/aes-ia64.o:::asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o::asm/rc4-ia64.o::"; my $no_asm="::::::::::"; diff --git a/TABLE b/TABLE index 04c340a4db..e9391294ac 100644 --- a/TABLE +++ b/TABLE @@ -257,7 +257,7 @@ $des_obj = $aes_obj = asm/aes-ia64.o $bf_obj = $md5_obj = -$sha1_obj = asm/sha256-ia64.o asm/sha512-ia64.o +$sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o $cast_obj = $rc4_obj = asm/rc4-ia64.o $rmd160_obj = @@ -2417,7 +2417,7 @@ $des_obj = $aes_obj = asm/aes-ia64.o $bf_obj = $md5_obj = -$sha1_obj = asm/sha256-ia64.o asm/sha512-ia64.o +$sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o $cast_obj = $rc4_obj = asm/rc4-ia64.o $rmd160_obj = @@ -2633,7 +2633,7 @@ $des_obj = $aes_obj = asm/aes-ia64.o $bf_obj = $md5_obj = -$sha1_obj = asm/sha256-ia64.o asm/sha512-ia64.o +$sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o $cast_obj = $rc4_obj = asm/rc4-ia64.o $rmd160_obj = @@ -2660,7 +2660,7 @@ $des_obj = $aes_obj = asm/aes-ia64.o $bf_obj = $md5_obj = -$sha1_obj = asm/sha256-ia64.o asm/sha512-ia64.o +$sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o $cast_obj = $rc4_obj = asm/rc4-ia64.o $rmd160_obj = @@ -3146,7 +3146,7 @@ $des_obj = $aes_obj = asm/aes-ia64.o $bf_obj = $md5_obj = -$sha1_obj = asm/sha256-ia64.o asm/sha512-ia64.o +$sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o $cast_obj = $rc4_obj = asm/rc4-ia64.o $rmd160_obj = @@ -3173,7 +3173,7 @@ $des_obj = $aes_obj = asm/aes-ia64.o $bf_obj = $md5_obj = -$sha1_obj = asm/sha256-ia64.o asm/sha512-ia64.o +$sha1_obj = asm/sha1-ia64.o asm/sha256-ia64.o asm/sha512-ia64.o $cast_obj = $rc4_obj = asm/rc4-ia64.o $rmd160_obj = diff --git a/crypto/sha/Makefile.ssl b/crypto/sha/Makefile.ssl index 8d85dd442c..16a4351b01 100644 --- a/crypto/sha/Makefile.ssl +++ b/crypto/sha/Makefile.ssl @@ -64,6 +64,8 @@ sx86-out.s: asm/sha1-586.pl ../perlasm/x86asm.pl s512sse2-out.s: asm/sha512-sse2.pl ../perlasm/x86asm.pl (cd asm; $(PERL) sha512-sse2.pl a.out $(CFLAGS) $(PROCESSOR) > ../$@) +asm/sha1-ia64.s: asm/sha1-ia64.pl + (cd asm; $(PERL) sha1-ia64.pl $(CFLAGS) ) > $@ asm/sha256-ia64.s: asm/sha512-ia64.pl (cd asm; $(PERL) sha512-ia64.pl ../$@ $(CFLAGS)) asm/sha512-ia64.s: asm/sha512-ia64.pl diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_locl.h index 210f22f7a6..d1f64c5fd0 100644 --- a/crypto/sha/sha_locl.h +++ b/crypto/sha/sha_locl.h @@ -121,6 +121,11 @@ # define sha1_block_data_order sha1_block_asm_data_order # define DONT_IMPLEMENT_BLOCK_DATA_ORDER # define HASH_BLOCK_DATA_ORDER_ALIGNED sha1_block_asm_data_order +# elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64) +# define sha1_block_host_order sha1_block_asm_host_order +# define DONT_IMPLEMENT_BLOCK_HOST_ORDER +# define sha1_block_data_order sha1_block_asm_data_order +# define DONT_IMPLEMENT_BLOCK_DATA_ORDER # endif # endif void sha1_block_host_order (SHA_CTX *c, const void *p,size_t num); -- 2.25.1