Commit 69aeb99f authored by Rich Salz's avatar Rich Salz
Browse files

Revert "Remove engine_rsax and its asm file." 



This reverts commit 5226c62b.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 53e652ae

Configure

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ my $x86_asm="x86cpuid.o:bn-586.o co-586.o x86-mont.o x86-gf2m.o:des-586.o crypt5 


my $x86_elf_asm="$x86_asm:elf";



my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:";

my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o x86_64-mont5.o x86_64-gf2m.o modexp512-x86_64.o::aes-x86_64.o vpaes-x86_64.o bsaes-x86_64.o aesni-x86_64.o aesni-sha1-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o rc4-md5-x86_64.o:::wp-x86_64.o:cmll-x86_64.o cmll_misc.o:ghash-x86_64.o:";

my $ia64_asm="ia64cpuid.o:bn-ia64.o ia64-mont.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:::::ghash-ia64.o::void";

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:::::::ghash-sparcv9.o::void";

my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";

crypto/bn/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ x86_64-mont5.s: asm/x86_64-mont5.pl 
	$(PERL) asm/x86_64-mont5.pl $(PERLASM_SCHEME) > $@

x86_64-gf2m.s:	asm/x86_64-gf2m.pl

	$(PERL) asm/x86_64-gf2m.pl $(PERLASM_SCHEME) > $@

modexp512-x86_64.s:	asm/modexp512-x86_64.pl

	$(PERL) asm/modexp512-x86_64.pl $(PERLASM_SCHEME) > $@



bn-ia64.s:	asm/ia64.S

	$(CC) $(CFLAGS) -E asm/ia64.S > $@

crypto/bn/asm/modexp512-x86_64.pl

0 → 100644
+1497 −0

File added.

Preview size limit exceeded, changes collapsed.

crypto/engine/Makefile

+16 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ LIBSRC= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \ 
	tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \

	tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \

	eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \

	eng_rdrand.c

	eng_rsax.c eng_rdrand.c

LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \

	eng_table.o eng_pkey.o eng_fat.o eng_all.o \

	tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \

	tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \

	eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \

	eng_rdrand.o

	eng_rsax.o eng_rdrand.o



SRC= $(LIBSRC)
@@ -265,6 +265,20 @@ eng_rdrand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h 
eng_rdrand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

eng_rdrand.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

eng_rdrand.o: eng_rdrand.c

eng_rsax.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

eng_rsax.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h

eng_rsax.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

eng_rsax.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

eng_rsax.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

eng_rsax.o: ../../include/openssl/err.h ../../include/openssl/evp.h

eng_rsax.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

eng_rsax.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

eng_rsax.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

eng_rsax.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h

eng_rsax.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

eng_rsax.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

eng_rsax.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

eng_rsax.o: eng_rsax.c

eng_table.o: ../../e_os.h ../../include/openssl/asn1.h

eng_table.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

eng_table.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

crypto/engine/eng_all.c

+3 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ void ENGINE_load_builtin_engines(void) 
#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))

    ENGINE_load_cryptodev();

#endif

#ifndef OPENSSL_NO_RSAX

    ENGINE_load_rsax();

#endif

#ifndef OPENSSL_NO_RDRAND

    ENGINE_load_rdrand();

#endif