4 # |
4 # |
5 Index: Configure |
5 Index: Configure |
6 =================================================================== |
6 =================================================================== |
7 diff -ru openssl-1.0.0d/Configure openssl-1.0.0d/Configure |
7 diff -ru openssl-1.0.0d/Configure openssl-1.0.0d/Configure |
8 --- openssl-1.0.0d/Configure 2011-05-24 17:02:24.000000000 -0700 |
8 --- openssl-1.0.0d/Configure 2011-05-24 17:02:24.000000000 -0700 |
9 +++ openssl-1.0.0d/Configure 2011-06-17 16:53:34.203229852 -0700 |
9 +++ openssl-1.0.0d/Configure 2011-07-27 10:48:17.817470000 -0700 |
10 @@ -134,8 +134,8 @@ |
10 @@ -134,8 +134,8 @@ |
11 |
11 |
12 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:cmll-x86_64.o cmll_misc.o"; |
12 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:cmll-x86_64.o cmll_misc.o"; |
13 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:::::void"; |
13 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:::::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:::sha1-sparcv9.o sha256-sparcv9.o sha512-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:aes_core.o aes_cbc.o aes-sparcv9.o:::sha1-sparcv9.o sha256-sparcv9.o sha512-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:aes_core.o aes_cbc.o aes-sparcv9.o t4_aes.o::t4_md5.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o t4_sha1.o t4_sha2.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 t4_aes.o::t4_md5.o:sha1-sparcv9.o sha256-sparcv9.o sha512-sparcv9.o t4_sha1.o t4_sha2.o:::::::void"; |
17 +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"; |
17 +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 $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o::::::::::::void"; |
18 my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o::::::::::::void"; |
19 my $mips3_asm=":bn-mips3.o::::::::::::void"; |
19 my $mips3_asm=":bn-mips3.o::::::::::::void"; |
20 my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o::aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::void"; |
20 my $s390x_asm="s390xcap.o s390xcpuid.o:bn-s390x.o s390x-mont.o::aes-s390x.o:::sha1-s390x.o sha256-s390x.o sha512-s390x.o::rc4-s390x.o:::::void"; |
21 Index: crypto/aes/Makefile |
21 Index: crypto/aes/Makefile |
22 =================================================================== |
22 =================================================================== |
43 + elfedit -e 'cap:hw1 -and -cmp vis vis3' $@ |
43 + elfedit -e 'cap:hw1 -and -cmp vis vis3' $@ |
44 + |
44 + |
45 aes-ppc.s: asm/aes-ppc.pl |
45 aes-ppc.s: asm/aes-ppc.pl |
46 $(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@ |
46 $(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@ |
47 |
47 |
|
48 Index: crypto/des/Makefile |
|
49 =================================================================== |
|
50 diff -ru openssl-1.0.0d/crypto/des/ openssl-1.0.0d/crypto/des/Makefile |
|
51 --- openssl-1.0.0d/crypto/des/Makefile 2011-07-26 17:47:28.530315349 -0700 |
|
52 +++ openssl-1.0.0d/crypto/des/Makefile 2011-07-27 10:41:47.362058958 -0700 |
|
53 @@ -17,6 +17,10 @@ |
|
54 ASFLAGS= $(INCLUDES) $(ASFLAG) |
|
55 AFLAGS= $(ASFLAGS) |
|
56 |
|
57 +BITS:= $(shell if grep '^SHARED_LDFLAGS.*=.*-m32' ../../Makefile >/dev/null; \ |
|
58 + then echo 32; else echo 64; fi) |
|
59 +ASFLAGSYF= -xregsym=no -K pic -P -xarch=v9v -D_sparcv9 -D_ASM -Dsparc -m$(BITS) |
|
60 + |
|
61 GENERAL=Makefile |
|
62 TEST=destest.c |
|
63 APPS= |
|
64 @@ -61,6 +65,10 @@ |
|
65 |
|
66 des_enc-sparc.S: asm/des_enc.m4 |
|
67 m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S |
|
68 + |
|
69 +t4_des.o: asm/t4_des.S |
|
70 + as $(ASFLAGSYF) -o $@ asm/t4_des.S |
|
71 + elfedit -e 'cap:hw1 -and -cmp vis vis3' $@ |
|
72 |
|
73 des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl |
|
74 $(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ |
48 Index: crypto/engine/Makefile |
75 Index: crypto/engine/Makefile |
49 =================================================================== |
76 =================================================================== |
50 diff -ru openssl-1.0.0d/crypto/engine/Makefile openssl-1.0.0d/crypto/engine/Makefile |
77 diff -ru openssl-1.0.0d/crypto/engine/Makefile openssl-1.0.0d/crypto/engine/Makefile |
51 --- openssl-1.0.0d/crypto/engine/Makefile 2011-05-24 17:04:12.000000000 -0700 |
78 --- openssl-1.0.0d/crypto/engine/Makefile 2011-05-24 17:04:12.000000000 -0700 |
52 +++ openssl-1.0.0d/crypto/engine/Makefile 2011-06-17 16:55:13.074884424 -0700 |
79 +++ openssl-1.0.0d/crypto/engine/Makefile 2011-07-28 10:10:00.000000000 -0700 |
53 @@ -22,12 +22,14 @@ |
80 @@ -22,12 +22,16 @@ |
54 tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ |
81 tb_rsa.c tb_dsa.c tb_ecdsa.c tb_dh.c tb_ecdh.c tb_rand.c tb_store.c \ |
55 tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \ |
82 tb_cipher.c tb_digest.c tb_pkmeth.c tb_asnmth.c \ |
56 eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \ |
83 eng_openssl.c eng_cnf.c eng_dyn.c eng_cryptodev.c \ |
57 + eng_t4.c eng_t4_digest.c \ |
84 + eng_t4.c eng_t4_des.c eng_t4_md5.c \ |
|
85 + eng_t4_sha1.c eng_t4_sha256.c eng_t4_sha512.c \ |
58 hw_pk11.c hw_pk11_pub.c hw_pk11_uri.c |
86 hw_pk11.c hw_pk11_pub.c hw_pk11_uri.c |
59 LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ |
87 LIBOBJ= eng_err.o eng_lib.o eng_list.o eng_init.o eng_ctrl.o \ |
60 eng_table.o eng_pkey.o eng_fat.o eng_all.o \ |
88 eng_table.o eng_pkey.o eng_fat.o eng_all.o \ |
61 tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ |
89 tb_rsa.o tb_dsa.o tb_ecdsa.o tb_dh.o tb_ecdh.o tb_rand.o tb_store.o \ |
62 tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \ |
90 tb_cipher.o tb_digest.o tb_pkmeth.o tb_asnmth.o \ |
63 eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \ |
91 eng_openssl.o eng_cnf.o eng_dyn.o eng_cryptodev.o \ |
64 + eng_t4.o eng_t4_digest.o \ |
92 + eng_t4.o eng_t4_des.o eng_t4_md5.o \ |
|
93 + eng_t4_sha1.o eng_t4_sha256.o eng_t4_sha512.o \ |
65 hw_pk11.o hw_pk11_pub.o hw_pk11_uri.o |
94 hw_pk11.o hw_pk11_pub.o hw_pk11_uri.o |
66 |
95 |
67 SRC= $(LIBSRC) |
96 SRC= $(LIBSRC) |
68 Index: crypto/engine/eng_all.c |
97 Index: crypto/engine/eng_all.c |
69 =================================================================== |
98 =================================================================== |