9 +++ openssl-1.0.0d/Configure 2011-07-27 10:48:17.817470000 -0700 |
9 +++ openssl-1.0.0d/Configure 2011-07-27 10:48:17.817470000 -0700 |
10 @@ -135,8 +135,9 @@ |
10 @@ -135,8 +135,9 @@ |
11 |
11 |
12 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:"; |
12 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:"; |
13 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"; |
13 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"; |
14 -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 aest4-sparcv9.o::md5-sparcv9.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void"; |
14 -my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o:::::::ghash-sparcv9.o::void"; |
15 -my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void"; |
15 -my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void"; |
16 +my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o t4_des.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o t4_md5.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o t4_sha1.o t4_sha2.o:::::::ghash-sparcv9.o::void"; |
16 +my $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o:des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o t4_md5.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o t4_sha1.o t4_sha2.o:::::::ghash-sparcv9.o::void"; |
17 +my $sparcv9_fips_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o:des_enc-sparc.o fcrypt_b.o t4_des.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o t4_md5.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o t4_sha1.o t4_sha2.o:::::::ghash-sparcv9.o::void"; |
17 +my $sparcv9_fips_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o:des_enc-sparc.o fcrypt_b.o dest4-sparcv9.o:aes_core.o aes_cbc.o aes-sparcv9.o aest4-sparcv9.o::md5-sparcv9.o t4_md5.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o t4_sha1.o t4_sha2.o:::::::ghash-sparcv9.o::void"; |
18 +my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o t4_des.o:t4_aes.o::t4_md5.o:t4_sha1.o t4_sha2.o:::::::void"; |
18 +my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:t4_aes.o::t4_md5.o:t4_sha1.o t4_sha2.o:::::::void"; |
19 my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void"; |
19 my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void"; |
20 my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::"; |
20 my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::"; |
21 my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::"; |
21 my $mips64_asm=":bn-mips.o mips-mont.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o sha512-mips.o::::::::"; |
22 @@ -264,9 +264,11 @@ |
22 @@ -264,9 +264,11 @@ |
23 # |
23 # |
47 +ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS) |
47 +ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS) |
48 + |
48 + |
49 GENERAL=Makefile |
49 GENERAL=Makefile |
50 #TEST=aestest.c |
50 #TEST=aestest.c |
51 TEST= |
51 TEST= |
52 @@ -69,6 +73,10 @@ |
52 @@ -72,6 +76,10 @@ |
53 aes-sparcv9.s: asm/aes-sparcv9.pl |
53 aes-sparcv9.s: asm/aes-sparcv9.pl |
54 $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@ |
54 $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@ |
55 |
55 |
56 +t4_aes.o: asm/t4_aes.S |
56 +t4_aes.o: asm/t4_aes.S |
57 + as $(ASFLAGSYF) -o $@ asm/t4_aes.S |
57 + as $(ASFLAGSYF) -o $@ asm/t4_aes.S |
58 + elfedit -e 'cap:hw1 -and -cmp vis vis3' $@ |
58 + elfedit -e 'cap:hw1 -and -cmp vis vis3' $@ |
59 + |
59 + |
60 aes-ppc.s: asm/aes-ppc.pl |
60 aes-ppc.s: asm/aes-ppc.pl |
61 $(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@ |
61 $(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@ |
62 |
62 |
63 Index: crypto/des/Makefile |
|
64 =================================================================== |
|
65 diff -ru openssl-1.0.0d/crypto/des/ openssl-1.0.0d/crypto/des/Makefile |
|
66 --- openssl-1.0.0d/crypto/des/Makefile 2011-07-26 17:47:28.530315349 -0700 |
|
67 +++ openssl-1.0.0d/crypto/des/Makefile 2011-07-27 10:41:47.362058958 -0700 |
|
68 @@ -17,6 +17,10 @@ |
|
69 ASFLAGS= $(INCLUDES) $(ASFLAG) |
|
70 AFLAGS= $(ASFLAGS) |
|
71 |
|
72 +BITS:= $(shell if grep '^SHARED_LDFLAGS.*=.*-m32' ../../Makefile >/dev/null; \ |
|
73 + then echo 32; else echo 64; fi) |
|
74 +ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS) |
|
75 + |
|
76 GENERAL=Makefile |
|
77 TEST=destest.c |
|
78 APPS= |
|
79 @@ -61,6 +65,10 @@ |
|
80 |
|
81 des_enc-sparc.S: asm/des_enc.m4 |
|
82 m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S |
|
83 + |
|
84 +t4_des.o: asm/t4_des.S |
|
85 + as $(ASFLAGSYF) -o $@ asm/t4_des.S |
|
86 + elfedit -e 'cap:hw1 -and -cmp vis vis3' $@ |
|
87 |
|
88 des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
|
89 $(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ |
|
90 Index: crypto/engine/Makefile |
63 Index: crypto/engine/Makefile |
91 =================================================================== |
64 =================================================================== |
92 diff -ru openssl-1.0.0d/crypto/engine/Makefile openssl-1.0.0d/crypto/engine/Makefile |
65 diff -ru openssl-1.0.0d/crypto/engine/Makefile openssl-1.0.0d/crypto/engine/Makefile |
93 --- openssl-1.0.0d/crypto/engine/Makefile 2011-05-24 17:04:12.000000000 -0700 |
66 --- openssl-1.0.0d/crypto/engine/Makefile 2011-05-24 17:04:12.000000000 -0700 |
94 +++ openssl-1.0.0d/crypto/engine/Makefile 2011-07-28 10:10:00.000000000 -0700 |
67 +++ openssl-1.0.0d/crypto/engine/Makefile 2011-07-28 10:10:00.000000000 -0700 |
95 @@ -22,12 +22,16 @@ |
68 @@ -22,12 +22,16 @@ |
96 tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ |
69 tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ |
97 tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \ |
70 tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \ |
98 eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \ |
71 eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \ |
99 + eng_t4.c eng_t4_des.c eng_t4_md5.c \ |
72 + eng_t4.c eng_t4_md5.c \ |
100 + eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c eng_t4_montmul.c \ |
73 + eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c eng_t4_montmul.c \ |
101 eng_rsax.c eng_rdrand.c hw_pk11.c hw_pk11_pub.c hw_pk11_uri.c |
74 eng_rsax.c eng_rdrand.c hw_pk11.c hw_pk11_pub.c hw_pk11_uri.c |
102 LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ |
75 LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ |
103 eng_table.o eng_pkey.o eng_fat.o eng_all.o \ |
76 eng_table.o eng_pkey.o eng_fat.o eng_all.o \ |
104 tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ |
77 tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ |
105 tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \ |
78 tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \ |
106 eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \ |
79 eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \ |
107 + eng_t4.o eng_t4_des.o eng_t4_md5.o \ |
80 + eng_t4.o eng_t4_md5.o \ |
108 + eng_t4_sha1.o eng_t4_sha256.o eng_t4_sha512.o eng_t4_montmul.o \ |
81 + eng_t4_sha1.o eng_t4_sha256.o eng_t4_sha512.o eng_t4_montmul.o \ |
109 eng_rsax.o eng_rdrand.o hw_pk11.o hw_pk11_pub.o hw_pk11_uri.o |
82 eng_rsax.o eng_rdrand.o hw_pk11.o hw_pk11_pub.o hw_pk11_uri.o |
110 |
83 |
111 SRC= $(LIBSRC) |
84 SRC= $(LIBSRC) |
112 Index: crypto/engine/eng_all.c |
85 Index: crypto/engine/eng_all.c |