diff -r 59b406bc4a3a -r ee09edbd5876 components/openssl/openssl-1.0.1/patches/37_openssl_t4_inline.patch --- a/components/openssl/openssl-1.0.1/patches/37_openssl_t4_inline.patch Wed Oct 12 06:26:22 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2276 +0,0 @@ -# -# This file adds inline T4 instruction support to OpenSSL upstream code. -# The change was brought in from OpenSSL 1.0.2. -# -Index: Configure -=================================================================== -diff -ru openssl-1.0.1e/Configure openssl-1.0.1e/Configure ---- openssl-1.0.1e/Configure 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/Configure 2011-07-27 10:48:17.817470000 -0700 -@@ -135,7 +135,7 @@ - - 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 $sparcv9_asm="sparcv9cap.o sparccpuid.o:bn-sparcv9.o sparcv9-mont.o sparcv9a-mont.o vis3-mont.o sparct4-mont.o sparcv9-gf2m.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"; - my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void"; - my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void"; - my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::"; -Index: crypto/sparccpuid.S -=================================================================== -diff -ru openssl-1.0.1e/crypto/sparccpuid.S openssl-1.0.1e/crypto/sparccpuid.S ---- openssl-1.0.1e/crypto/sparccpuid.S 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/crypto/sparccpuid.S 2011-07-27 10:48:17.817470000 -0700 -@@ -1,3 +1,7 @@ -+#ifdef OPENSSL_FIPSCANISTER -+#include -+#endif -+ - #if defined(__SUNPRO_C) && defined(__sparcv9) - # define ABI64 /* They've said -xarch=v9 at command line */ - #elif defined(__GNUC__) && defined(__arch64__) -@@ -235,10 +239,10 @@ - .global _sparcv9_vis1_probe - .align 8 - _sparcv9_vis1_probe: -+ .word 0x81b00d80 !fxor %f0,%f0,%f0 - add %sp,BIAS+2,%o1 -- .word 0xc19a5a40 !ldda [%o1]ASI_FP16_P,%f0 - retl -- .word 0x81b00d80 !fxor %f0,%f0,%f0 -+ .word 0xc19a5a40 !ldda [%o1]ASI_FP16_P,%f0 - .type _sparcv9_vis1_probe,#function - .size _sparcv9_vis1_probe,.-_sparcv9_vis1_probe - -@@ -251,7 +255,12 @@ - ! UltraSPARC IIe 7 - ! UltraSPARC III 7 - ! UltraSPARC T1 24 -+! SPARC T4 65(*) - ! -+! (*) result has lesser to do with VIS instruction latencies, rdtick -+! appears that slow, but it does the trick in sense that FP and -+! VIS code paths are still slower than integer-only ones. -+! - ! Numbers for T2 and SPARC64 V-VII are more than welcomed. - ! - ! It would be possible to detect specifically US-T1 by instrumenting -@@ -260,6 +269,8 @@ - .global _sparcv9_vis1_instrument - .align 8 - _sparcv9_vis1_instrument: -+ .word 0x81b00d80 !fxor %f0,%f0,%f0 -+ .word 0x85b08d82 !fxor %f2,%f2,%f2 - .word 0x91410000 !rd %tick,%o0 - .word 0x81b00d80 !fxor %f0,%f0,%f0 - .word 0x85b08d82 !fxor %f2,%f2,%f2 -@@ -314,6 +325,30 @@ - .type _sparcv9_fmadd_probe,#function - .size _sparcv9_fmadd_probe,.-_sparcv9_fmadd_probe - -+.global _sparcv9_rdcfr -+.align 8 -+_sparcv9_rdcfr: -+ retl -+ .word 0x91468000 !rd %asr26,%o0 -+.type _sparcv9_rdcfr,#function -+.size _sparcv9_rdcfr,.-_sparcv9_rdcfr -+ -+.global _sparcv9_vis3_probe -+.align 8 -+_sparcv9_vis3_probe: -+ retl -+ .word 0x81b022a0 !xmulx %g0,%g0,%g0 -+.type _sparcv9_vis3_probe,#function -+.size _sparcv9_vis3_probe,.-_sparcv9_vis3_probe -+ -+.global _sparcv9_random -+.align 8 -+_sparcv9_random: -+ retl -+ .word 0x91b002a0 !random %o0 -+.type _sparcv9_random,#function -+.size _sparcv9_random,.-_sparcv9_vis3_probe -+ - .global OPENSSL_cleanse - .align 32 - OPENSSL_cleanse: -@@ -398,6 +433,102 @@ - .size OPENSSL_cleanse,.-OPENSSL_cleanse - - #ifndef _BOOT -+.global _sparcv9_vis1_instrument_bus -+.align 8 -+_sparcv9_vis1_instrument_bus: -+ mov %o1,%o3 ! save cnt -+ .word 0x99410000 !rd %tick,%o4 ! tick -+ mov %o4,%o5 ! lasttick = tick -+ set 0,%g4 ! diff -+ -+ andn %o0,63,%g1 -+ .word 0xc1985e00 !ldda [%g1]0xf0,%f0 ! block load -+ .word 0x8143e040 !membar #Sync -+ .word 0xc1b85c00 !stda %f0,[%g1]0xe0 ! block store and commit -+ .word 0x8143e040 !membar #Sync -+ ld [%o0],%o4 -+ add %o4,%g4,%g4 -+ .word 0xc9e2100c !cas [%o0],%o4,%g4 -+ -+.Loop: .word 0x99410000 !rd %tick,%o4 -+ sub %o4,%o5,%g4 ! diff=tick-lasttick -+ mov %o4,%o5 ! lasttick=tick -+ -+ andn %o0,63,%g1 -+ .word 0xc1985e00 !ldda [%g1]0xf0,%f0 ! block load -+ .word 0x8143e040 !membar #Sync -+ .word 0xc1b85c00 !stda %f0,[%g1]0xe0 ! block store and commit -+ .word 0x8143e040 !membar #Sync -+ ld [%o0],%o4 -+ add %o4,%g4,%g4 -+ .word 0xc9e2100c !cas [%o0],%o4,%g4 -+ subcc %o1,1,%o1 ! --$cnt -+ bnz .Loop -+ add %o0,4,%o0 ! ++$out -+ -+ retl -+ mov %o3,%o0 -+.type _sparcv9_vis1_instrument_bus,#function -+.size _sparcv9_vis1_instrument_bus,.-_sparcv9_vis1_instrument_bus -+ -+.global _sparcv9_vis1_instrument_bus2 -+.align 8 -+_sparcv9_vis1_instrument_bus2: -+ mov %o1,%o3 ! save cnt -+ sll %o1,2,%o1 ! cnt*=4 -+ -+ .word 0x99410000 !rd %tick,%o4 ! tick -+ mov %o4,%o5 ! lasttick = tick -+ set 0,%g4 ! diff -+ -+ andn %o0,63,%g1 -+ .word 0xc1985e00 !ldda [%g1]0xf0,%f0 ! block load -+ .word 0x8143e040 !membar #Sync -+ .word 0xc1b85c00 !stda %f0,[%g1]0xe0 ! block store and commit -+ .word 0x8143e040 !membar #Sync -+ ld [%o0],%o4 -+ add %o4,%g4,%g4 -+ .word 0xc9e2100c !cas [%o0],%o4,%g4 -+ -+ .word 0x99410000 !rd %tick,%o4 ! tick -+ sub %o4,%o5,%g4 ! diff=tick-lasttick -+ mov %o4,%o5 ! lasttick=tick -+ mov %g4,%g5 ! lastdiff=diff -+.Loop2: -+ andn %o0,63,%g1 -+ .word 0xc1985e00 !ldda [%g1]0xf0,%f0 ! block load -+ .word 0x8143e040 !membar #Sync -+ .word 0xc1b85c00 !stda %f0,[%g1]0xe0 ! block store and commit -+ .word 0x8143e040 !membar #Sync -+ ld [%o0],%o4 -+ add %o4,%g4,%g4 -+ .word 0xc9e2100c !cas [%o0],%o4,%g4 -+ -+ subcc %o2,1,%o2 ! --max -+ bz .Ldone2 -+ nop -+ -+ .word 0x99410000 !rd %tick,%o4 ! tick -+ sub %o4,%o5,%g4 ! diff=tick-lasttick -+ mov %o4,%o5 ! lasttick=tick -+ cmp %g4,%g5 -+ mov %g4,%g5 ! lastdiff=diff -+ -+ .word 0x83408000 !rd %ccr,%g1 -+ and %g1,4,%g1 ! isolate zero flag -+ xor %g1,4,%g1 ! flip zero flag -+ -+ subcc %o1,%g1,%o1 ! conditional --$cnt -+ bnz .Loop2 -+ add %o0,%g1,%o0 ! conditional ++$out -+ -+.Ldone2: -+ srl %o1,2,%o1 -+ retl -+ sub %o3,%o1,%o0 -+.type _sparcv9_vis1_instrument_bus2,#function -+.size _sparcv9_vis1_instrument_bus2,.-_sparcv9_vis1_instrument_bus2 -+ - .section ".init",#alloc,#execinstr - call solaris_locking_setup - nop -Index: crypto/sparcv9cap.c -=================================================================== -diff -ru openssl-1.0.1e/crypto/sparcv9cap.c openssl-1.0.1e/crypto/sparcv9cap.c ---- openssl-1.0.1e/crypto/sparcv9cap.c 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/crypto/sparcv9cap.c 2011-07-27 10:48:17.817470000 -0700 -@@ -4,34 +4,58 @@ - #include - #include - #include -+#include - #include - --#define SPARCV9_TICK_PRIVILEGED (1<<0) --#define SPARCV9_PREFER_FPU (1<<1) --#define SPARCV9_VIS1 (1<<2) --#define SPARCV9_VIS2 (1<<3) /* reserved */ --#define SPARCV9_FMADD (1<<4) /* reserved for SPARC64 V */ -+#include "sparc_arch.h" - -+#if defined(__GNUC__) && defined(__linux) -+__attribute__((visibility("hidden"))) -+#endif - #ifndef _BOOT --static int OPENSSL_sparcv9cap_P = SPARCV9_TICK_PRIVILEGED; -+unsigned int OPENSSL_sparcv9cap_P[2] = {SPARCV9_TICK_PRIVILEGED, 0}; - #else --static int OPENSSL_sparcv9cap_P = SPARCV9_VIS1; -+unsigned int OPENSSL_sparcv9cap_P[2] = {SPARCV9_VIS1, 0}; - #endif - - int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, - const BN_ULONG *np, const BN_ULONG *n0, int num) - { -+ int bn_mul_mont_vis3(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, -+ const BN_ULONG *np,const BN_ULONG *n0, int num); - int bn_mul_mont_fpu(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, - const BN_ULONG *np, const BN_ULONG *n0, int num); - int bn_mul_mont_int(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, - const BN_ULONG *np, const BN_ULONG *n0, int num); - -- if (num >= 8 && !(num & 1) && -- (OPENSSL_sparcv9cap_P & (SPARCV9_PREFER_FPU | SPARCV9_VIS1)) == -- (SPARCV9_PREFER_FPU | SPARCV9_VIS1)) -- return bn_mul_mont_fpu(rp, ap, bp, np, n0, num); -- else -- return bn_mul_mont_int(rp, ap, bp, np, n0, num); -+ if (!(num&1) && num>=6) { -+ if ((num&15)==0 && num<=64 && -+ (OPENSSL_sparcv9cap_P[1]&(CFR_MONTMUL|CFR_MONTSQR))== -+ (CFR_MONTMUL|CFR_MONTSQR)) -+ { -+ typedef int (*bn_mul_mont_f)(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); -+ int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); -+ int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); -+ int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); -+ int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); -+ static const bn_mul_mont_f funcs[4] = { -+ bn_mul_mont_t4_8, bn_mul_mont_t4_16, -+ bn_mul_mont_t4_24, bn_mul_mont_t4_32 }; -+ bn_mul_mont_f worker = funcs[num/16-1]; -+ -+ if ((*worker)(rp,ap,bp,np,n0)) return 1; -+ /* retry once and fall back */ -+ if ((*worker)(rp,ap,bp,np,n0)) return 1; -+ return bn_mul_mont_vis3(rp,ap,bp,np,n0,num); -+ } -+ if ((OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS3)) -+ return bn_mul_mont_vis3(rp,ap,bp,np,n0,num); -+ else if (num>=8 && -+ (OPENSSL_sparcv9cap_P[0]&(SPARCV9_PREFER_FPU|SPARCV9_VIS1)) == -+ (SPARCV9_PREFER_FPU|SPARCV9_VIS1)) -+ return bn_mul_mont_fpu(rp,ap,bp,np,n0,num); -+ } -+ return bn_mul_mont_int(rp,ap,bp,np,n0,num); - } - - unsigned long _sparcv9_rdtick(void); -@@ -39,11 +63,18 @@ - unsigned long _sparcv9_vis1_instrument(void); - void _sparcv9_vis2_probe(void); - void _sparcv9_fmadd_probe(void); -+unsigned long _sparcv9_rdcfr(void); -+void _sparcv9_vis3_probe(void); -+unsigned long _sparcv9_random(void); -+#ifndef _BOOT -+size_t _sparcv9_vis1_instrument_bus(unsigned int *,size_t); -+size_t _sparcv9_vis1_instrument_bus2(unsigned int *,size_t,size_t); -+#endif - - #ifndef _BOOT - unsigned long OPENSSL_rdtsc(void) - { -- if (OPENSSL_sparcv9cap_P & SPARCV9_TICK_PRIVILEGED) -+ if (OPENSSL_sparcv9cap_P[0] & SPARCV9_TICK_PRIVILEGED) - #if defined(__sun) && defined(__SVR4) - return gethrtime(); - #else -@@ -52,6 +83,24 @@ - else - return _sparcv9_rdtick(); - } -+ -+size_t OPENSSL_instrument_bus(unsigned int *out,size_t cnt) -+{ -+ if ((OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED|SPARCV9_BLK)) == -+ SPARCV9_BLK) -+ return _sparcv9_vis1_instrument_bus(out,cnt); -+ else -+ return 0; -+} -+ -+size_t OPENSSL_instrument_bus2(unsigned int *out,size_t cnt,size_t max) -+{ -+ if ((OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED|SPARCV9_BLK)) == -+ SPARCV9_BLK) -+ return _sparcv9_vis1_instrument_bus2(out,cnt,max); -+ else -+ return 0; -+} - #endif - - #if defined(_BOOT) -@@ -61,7 +110,7 @@ - */ - void OPENSSL_cpuid_setup(void) - { -- OPENSSL_sparcv9cap_P = SPARCV9_VIS1; -+ OPENSSL_sparcv9cap_P[0] = SPARCV9_VIS1; - } - - #elif 0 && defined(__sun) && defined(__SVR4) -@@ -90,11 +139,11 @@ - if (!strcmp(name, "SUNW,UltraSPARC") || - /* covers II,III,IV */ - !strncmp(name, "SUNW,UltraSPARC-I", 17)) { -- OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU | SPARCV9_VIS1; -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_PREFER_FPU | SPARCV9_VIS1; - - /* %tick is privileged only on UltraSPARC-I/II, but not IIe */ - if (name[14] != '\0' && name[17] != '\0' && name[18] != '\0') -- OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; -+ OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED; - - return DI_WALK_TERMINATE; - } -@@ -100,7 +149,7 @@ - } - /* This is expected to catch remaining UltraSPARCs, such as T1 */ - else if (!strncmp(name, "SUNW,UltraSPARC", 15)) { -- OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; -+ OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED; - - return DI_WALK_TERMINATE; - } -@@ -119,7 +168,7 @@ - trigger = 1; - - if ((e = getenv("OPENSSL_sparcv9cap"))) { -- OPENSSL_sparcv9cap_P = strtoul(e, NULL, 0); -+ OPENSSL_sparcv9cap_P[0] = strtoul(e, NULL, 0); - return; - } - -@@ -126,15 +175,15 @@ - if (sysinfo(SI_MACHINE, si, sizeof(si)) > 0) { - if (strcmp(si, "sun4v")) - /* FPU is preferred for all CPUs, but US-T1/2 */ -- OPENSSL_sparcv9cap_P |= SPARCV9_PREFER_FPU; -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_PREFER_FPU; - } - - if (sysinfo(SI_ISALIST, si, sizeof(si)) > 0) { - if (strstr(si, "+vis")) -- OPENSSL_sparcv9cap_P |= SPARCV9_VIS1; -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1 | SPARCV9_BLK; - if (strstr(si, "+vis2")) { -- OPENSSL_sparcv9cap_P |= SPARCV9_VIS2; -- OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2; -+ OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED; - return; - } - } -@@ -204,12 +253,14 @@ - trigger = 1; - - if ((e = getenv("OPENSSL_sparcv9cap"))) { -- OPENSSL_sparcv9cap_P = strtoul(e, NULL, 0); -+ OPENSSL_sparcv9cap_P[0] = strtoul(e, NULL, 0); -+ if ((e = strchr(e, ':'))) -+ OPENSSL_sparcv9cap_P[1] = strtoul(e + 1, NULL, 0); - return; - } - - /* Initial value, fits UltraSPARC-I&II... */ -- OPENSSL_sparcv9cap_P = SPARCV9_PREFER_FPU | SPARCV9_TICK_PRIVILEGED; -+ OPENSSL_sparcv9cap_P[0] = SPARCV9_PREFER_FPU | SPARCV9_TICK_PRIVILEGED; - - sigfillset(&all_masked); - sigdelset(&all_masked, SIGILL); -@@ -232,18 +283,18 @@ - - if (sigsetjmp(common_jmp, 1) == 0) { - _sparcv9_rdtick(); -- OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED; -+ OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED; - } - - if (sigsetjmp(common_jmp, 1) == 0) { - _sparcv9_vis1_probe(); -- OPENSSL_sparcv9cap_P |= SPARCV9_VIS1; -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS1 | SPARCV9_BLK; - /* detect UltraSPARC-Tx, see sparccpud.S for details... */ - if (_sparcv9_vis1_instrument() >= 12) -- OPENSSL_sparcv9cap_P &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU); -+ OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU); - else { - _sparcv9_vis2_probe(); -- OPENSSL_sparcv9cap_P |= SPARCV9_VIS2; -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS2; - } - } - -@@ -249,13 +300,50 @@ - - if (sigsetjmp(common_jmp, 1) == 0) { - _sparcv9_fmadd_probe(); -- OPENSSL_sparcv9cap_P |= SPARCV9_FMADD; -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD; - } - -+ /* -+ * VIS3 flag is tested independently from VIS1, unlike VIS2 that is, -+ * because VIS3 defines even integer instructions. -+ */ -+ if (sigsetjmp(common_jmp,1) == 0) { -+ _sparcv9_vis3_probe(); -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_VIS3; -+ } -+ -+ if (sigsetjmp(common_jmp,1) == 0) { -+ (void)_sparcv9_random(); -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_RANDOM; -+ } -+ -+ /* -+ * In wait for better solution _sparcv9_rdcfr is masked by -+ * VIS3 flag, because it goes to uninterruptable endless -+ * loop on UltraSPARC II running Solaris. Things might be -+ * different on Linux... -+ */ -+ if ((OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS3) && -+ sigsetjmp(common_jmp, 1) == 0) { -+ OPENSSL_sparcv9cap_P[1] = (unsigned int)_sparcv9_rdcfr(); -+ } -+ - sigaction(SIGBUS, &bus_oact, NULL); - sigaction(SIGILL, &ill_oact, NULL); - - sigprocmask(SIG_SETMASK, &oset, NULL); -+ -+ if (sizeof(size_t) == 8) -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK; -+#ifdef __linux -+ else -+ { -+ int ret = syscall(340); -+ -+ if (ret >= 0 && ret & 1) -+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_64BIT_STACK; -+ } -+#endif - } - - #endif -Index: crypto/md5/Makefile -=================================================================== -diff -ru openssl-1.0.1e/crypto/md5/Makefile openssl-1.0.1e/crypto/md5/Makefile ---- openssl-1.0.1e/crypto/md5/Makefile 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/crypto/md5/Makefile 2011-07-27 10:48:17.817470000 -0700 -@@ -52,6 +52,9 @@ - $(CC) $(CFLAGS) -E asm/md5-ia64.S | \ - $(PERL) -ne 's/;\s+/;\n/g; print;' > $@ - -+md5-sparcv9.S: asm/md5-sparcv9.pl -+ $(PERL) asm/md5-sparcv9.pl $@ $(CFLAGS) -+ - files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO - -Index: crypto/md5/md5_locl.h -=================================================================== -diff -ru openssl-1.0.1e/crypto/md5/md5_locl.h openssl-1.0.1e/crypto/md5/md5_locl.h ---- openssl-1.0.1e/crypto/md5/md5_locl.h 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/crypto/md5/md5_locl.h 2011-07-27 10:48:17.817470000 -0700 -@@ -71,6 +71,8 @@ - # define md5_block_data_order md5_block_asm_data_order - # elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64) - # define md5_block_data_order md5_block_asm_data_order -+# elif defined(__sparc) || defined(__sparc__) -+# define md5_block_data_order md5_block_asm_data_order - # endif - #endif - -Index: crypto/sha/Makefile -=================================================================== -diff -ru openssl-1.0.1e/crypto/sha/Makefile openssl-1.0.1e/crypto/sha/Makefile ---- openssl-1.0.1e/crypto/sha/Makefile 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/crypto/sha/Makefile 2011-07-27 10:48:17.817470000 -0700 -@@ -68,9 +68,9 @@ - sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@ - sha256-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@ - sha512-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@ --sha1-sparcv9.s: asm/sha1-sparcv9.pl; $(PERL) asm/sha1-sparcv9.pl $@ $(CFLAGS) --sha256-sparcv9.s:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS) --sha512-sparcv9.s:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS) -+sha1-sparcv9.S: asm/sha1-sparcv9.pl; $(PERL) asm/sha1-sparcv9.pl $@ $(CFLAGS) -+sha256-sparcv9.S:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS) -+sha512-sparcv9.S:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS) - - sha1-ppc.s: asm/sha1-ppc.pl; $(PERL) asm/sha1-ppc.pl $(PERLASM_SCHEME) $@ - sha256-ppc.s: asm/sha512-ppc.pl; $(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@ -Index: crypto/sha/asm/sha1-sparcv9.pl -=================================================================== -diff -ru openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl ---- openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl 2011-07-27 10:48:17.817470000 -0700 -@@ -5,6 +5,8 @@ - # project. The module is, however, dual licensed under OpenSSL and - # CRYPTOGAMS licenses depending on where you obtain it. For further - # details see http://www.openssl.org/~appro/cryptogams/. -+# -+# Hardware SPARC T4 support by David S. Miller . - # ==================================================================== - - # Performance improvement is not really impressive on pre-T1 CPU: +8% -@@ -18,6 +20,11 @@ - # ensure scalability on UltraSPARC T1, or rather to avoid decay when - # amount of active threads exceeds the number of physical cores. - -+# SPARC T4 SHA1 hardware achieves 3.72 cycles per byte, which is 3.1x -+# faster than software. Multi-process benchmark saturates at 11x -+# single-process result on 8-core processor, or ~9GBps per 2.85GHz -+# socket. -+ - $bits=32; - for (@ARGV) { $bits=64 if (/\-m64/ || /\-xarch\=v9/); } - if ($bits==64) { $bias=2047; $frame=192; } -@@ -183,11 +190,93 @@ - .register %g3,#scratch - ___ - $code.=<<___; -+#include "sparc_arch.h" -+ - .section ".text",#alloc,#execinstr - -+#ifdef __PIC__ -+SPARC_PIC_THUNK(%g1) -+#endif -+ - .align 32 - .globl sha1_block_data_order - sha1_block_data_order: -+ SPARC_LOAD_ADDRESS_LEAF(OPENSSL_sparcv9cap_P,%g1,%g5) -+ ld [%g1+4],%g1 ! OPENSSL_sparcv9cap_P[1] -+ -+ andcc %g1, CFR_SHA1, %g0 -+ be .Lsoftware -+ nop -+ -+ ld [%o0 + 0x00], %f0 ! load context -+ ld [%o0 + 0x04], %f1 -+ ld [%o0 + 0x08], %f2 -+ andcc %o1, 0x7, %g0 -+ ld [%o0 + 0x0c], %f3 -+ bne,pn %icc, .Lhwunaligned -+ ld [%o0 + 0x10], %f4 -+ -+.Lhw_loop: -+ ldd [%o1 + 0x00], %f8 -+ ldd [%o1 + 0x08], %f10 -+ ldd [%o1 + 0x10], %f12 -+ ldd [%o1 + 0x18], %f14 -+ ldd [%o1 + 0x20], %f16 -+ ldd [%o1 + 0x28], %f18 -+ ldd [%o1 + 0x30], %f20 -+ subcc %o2, 1, %o2 ! done yet? -+ ldd [%o1 + 0x38], %f22 -+ add %o1, 0x40, %o1 -+ -+ .word 0x81b02820 ! SHA1 -+ -+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhw_loop -+ nop -+ -+.Lhwfinish: -+ st %f0, [%o0 + 0x00] ! store context -+ st %f1, [%o0 + 0x04] -+ st %f2, [%o0 + 0x08] -+ st %f3, [%o0 + 0x0c] -+ retl -+ st %f4, [%o0 + 0x10] -+ -+.align 8 -+.Lhwunaligned: -+ alignaddr %o1, %g0, %o1 -+ -+ ldd [%o1 + 0x00], %f10 -+.Lhwunaligned_loop: -+ ldd [%o1 + 0x08], %f12 -+ ldd [%o1 + 0x10], %f14 -+ ldd [%o1 + 0x18], %f16 -+ ldd [%o1 + 0x20], %f18 -+ ldd [%o1 + 0x28], %f20 -+ ldd [%o1 + 0x30], %f22 -+ ldd [%o1 + 0x38], %f24 -+ subcc %o2, 1, %o2 ! done yet? -+ ldd [%o1 + 0x40], %f26 -+ add %o1, 0x40, %o1 -+ -+ faligndata %f10, %f12, %f8 -+ faligndata %f12, %f14, %f10 -+ faligndata %f14, %f16, %f12 -+ faligndata %f16, %f18, %f14 -+ faligndata %f18, %f20, %f16 -+ faligndata %f20, %f22, %f18 -+ faligndata %f22, %f24, %f20 -+ faligndata %f24, %f26, %f22 -+ -+ .word 0x81b02820 ! SHA1 -+ -+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwunaligned_loop -+ for %f26, %f26, %f10 ! %f10=%f26 -+ -+ ba .Lhwfinish -+ nop -+ -+.align 16 -+.Lsoftware: - save %sp,-$frame,%sp - sllx $len,6,$len - add $inp,$len,$len -@@ -279,6 +368,62 @@ - .align 4 - ___ - --$code =~ s/\`([^\`]*)\`/eval $1/gem; --print $code; -+# Purpose of these subroutines is to explicitly encode VIS instructions, -+# so that one can compile the module without having to specify VIS -+# extentions on compiler command line, e.g. -xarch=v9 vs. -xarch=v9a. -+# Idea is to reserve for option to produce "universal" binary and let -+# programmer detect if current CPU is VIS capable at run-time. -+sub unvis { -+my ($mnemonic,$rs1,$rs2,$rd)=@_; -+my $ref,$opf; -+my %visopf = ( "faligndata" => 0x048, -+ "for" => 0x07c ); -+ -+ $ref = "$mnemonic\t$rs1,$rs2,$rd"; -+ -+ if ($opf=$visopf{$mnemonic}) { -+ foreach ($rs1,$rs2,$rd) { -+ return $ref if (!/%f([0-9]{1,2})/); -+ $_=$1; -+ if ($1>=32) { -+ return $ref if ($1&1); -+ # re-encode for upper double register addressing -+ $_=($1|$1>>5)&31; -+ } -+ } -+ -+ return sprintf ".word\t0x%08x !%s", -+ 0x81b00000|$rd<<25|$rs1<<14|$opf<<5|$rs2, -+ $ref; -+ } else { -+ return $ref; -+ } -+} -+sub unalignaddr { -+my ($mnemonic,$rs1,$rs2,$rd)=@_; -+my %bias = ( "g" => 0, "o" => 8, "l" => 16, "i" => 24 ); -+my $ref="$mnemonic\t$rs1,$rs2,$rd"; -+ -+ foreach ($rs1,$rs2,$rd) { -+ if (/%([goli])([0-7])/) { $_=$bias{$1}+$2; } -+ else { return $ref; } -+ } -+ return sprintf ".word\t0x%08x !%s", -+ 0x81b00300|$rd<<25|$rs1<<14|$rs2, -+ $ref; -+} -+ -+foreach (split("\n",$code)) { -+ s/\`([^\`]*)\`/eval $1/ge; -+ -+ s/\b(f[^\s]*)\s+(%f[0-9]{1,2}),\s*(%f[0-9]{1,2}),\s*(%f[0-9]{1,2})/ -+ &unvis($1,$2,$3,$4) -+ /ge; -+ s/\b(alignaddr)\s+(%[goli][0-7]),\s*(%[goli][0-7]),\s*(%[goli][0-7])/ -+ &unalignaddr($1,$2,$3,$4) -+ /ge; -+ -+ print $_,"\n"; -+} -+ - close STDOUT; - -Index: crypto/sha/asm/sha512-sparcv9.pl -=================================================================== -diff -ru openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl ---- openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl 2011-07-27 10:48:17.817470000 -0700 -@@ -5,6 +5,8 @@ - # project. The module is, however, dual licensed under OpenSSL and - # CRYPTOGAMS licenses depending on where you obtain it. For further - # details see http://www.openssl.org/~appro/cryptogams/. -+# -+# Hardware SPARC T4 support by David S. Miller . - # ==================================================================== - - # SHA256 performance improvement over compiler generated code varies -@@ -41,6 +43,12 @@ - # loads are always slower than one 64-bit load. Once again this - # is unlike pre-T1 UltraSPARC, where, if scheduled appropriately, - # 2x32-bit loads can be as fast as 1x64-bit ones. -+# -+# SPARC T4 SHA256/512 hardware achieves 3.17/2.01 cycles per byte, -+# which is 9.3x/11.1x faster than software. Multi-process benchmark -+# saturates at 11.5x single-process result on 8-core processor, or -+# ~11/16GBps per 2.85GHz socket. -+ - - $bits=32; - for (@ARGV) { $bits=64 if (/\-m64/ || /\-xarch\=v9/); } -@@ -386,6 +394,8 @@ - .register %g3,#scratch - ___ - $code.=<<___; -+#include "sparc_arch.h" -+ - .section ".text",#alloc,#execinstr - - .align 64 -@@ -457,8 +467,196 @@ - } - $code.=<<___; - .size K${label},.-K${label} -+ -+#ifdef __PIC__ -+SPARC_PIC_THUNK(%g1) -+#endif -+ - .globl sha${label}_block_data_order -+.align 32 - sha${label}_block_data_order: -+ SPARC_LOAD_ADDRESS_LEAF(OPENSSL_sparcv9cap_P,%g1,%g5) -+ ld [%g1+4],%g1 ! OPENSSL_sparcv9cap_P[1] -+ -+ andcc %g1, CFR_SHA${label}, %g0 -+ be .Lsoftware -+ nop -+___ -+$code.=<<___ if ($SZ==8); # SHA512 -+ ldd [%o0 + 0x00], %f0 ! load context -+ ldd [%o0 + 0x08], %f2 -+ ldd [%o0 + 0x10], %f4 -+ ldd [%o0 + 0x18], %f6 -+ ldd [%o0 + 0x20], %f8 -+ ldd [%o0 + 0x28], %f10 -+ andcc %o1, 0x7, %g0 -+ ldd [%o0 + 0x30], %f12 -+ bne,pn %icc, .Lhwunaligned -+ ldd [%o0 + 0x38], %f14 -+ -+.Lhwaligned_loop: -+ ldd [%o1 + 0x00], %f16 -+ ldd [%o1 + 0x08], %f18 -+ ldd [%o1 + 0x10], %f20 -+ ldd [%o1 + 0x18], %f22 -+ ldd [%o1 + 0x20], %f24 -+ ldd [%o1 + 0x28], %f26 -+ ldd [%o1 + 0x30], %f28 -+ ldd [%o1 + 0x38], %f30 -+ ldd [%o1 + 0x40], %f32 -+ ldd [%o1 + 0x48], %f34 -+ ldd [%o1 + 0x50], %f36 -+ ldd [%o1 + 0x58], %f38 -+ ldd [%o1 + 0x60], %f40 -+ ldd [%o1 + 0x68], %f42 -+ ldd [%o1 + 0x70], %f44 -+ subcc %o2, 1, %o2 ! done yet? -+ ldd [%o1 + 0x78], %f46 -+ add %o1, 0x80, %o1 -+ -+ .word 0x81b02860 ! SHA512 -+ -+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwaligned_loop -+ nop -+ -+.Lhwfinish: -+ std %f0, [%o0 + 0x00] ! store context -+ std %f2, [%o0 + 0x08] -+ std %f4, [%o0 + 0x10] -+ std %f6, [%o0 + 0x18] -+ std %f8, [%o0 + 0x20] -+ std %f10, [%o0 + 0x28] -+ std %f12, [%o0 + 0x30] -+ retl -+ std %f14, [%o0 + 0x38] -+ -+.align 16 -+.Lhwunaligned: -+ alignaddr %o1, %g0, %o1 -+ -+ ldd [%o1 + 0x00], %f18 -+.Lhwunaligned_loop: -+ ldd [%o1 + 0x08], %f20 -+ ldd [%o1 + 0x10], %f22 -+ ldd [%o1 + 0x18], %f24 -+ ldd [%o1 + 0x20], %f26 -+ ldd [%o1 + 0x28], %f28 -+ ldd [%o1 + 0x30], %f30 -+ ldd [%o1 + 0x38], %f32 -+ ldd [%o1 + 0x40], %f34 -+ ldd [%o1 + 0x48], %f36 -+ ldd [%o1 + 0x50], %f38 -+ ldd [%o1 + 0x58], %f40 -+ ldd [%o1 + 0x60], %f42 -+ ldd [%o1 + 0x68], %f44 -+ ldd [%o1 + 0x70], %f46 -+ ldd [%o1 + 0x78], %f48 -+ subcc %o2, 1, %o2 ! done yet? -+ ldd [%o1 + 0x80], %f50 -+ add %o1, 0x80, %o1 -+ -+ faligndata %f18, %f20, %f16 -+ faligndata %f20, %f22, %f18 -+ faligndata %f22, %f24, %f20 -+ faligndata %f24, %f26, %f22 -+ faligndata %f26, %f28, %f24 -+ faligndata %f28, %f30, %f26 -+ faligndata %f30, %f32, %f28 -+ faligndata %f32, %f34, %f30 -+ faligndata %f34, %f36, %f32 -+ faligndata %f36, %f38, %f34 -+ faligndata %f38, %f40, %f36 -+ faligndata %f40, %f42, %f38 -+ faligndata %f42, %f44, %f40 -+ faligndata %f44, %f46, %f42 -+ faligndata %f46, %f48, %f44 -+ faligndata %f48, %f50, %f46 -+ -+ .word 0x81b02860 ! SHA512 -+ -+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwunaligned_loop -+ for %f50, %f50, %f18 ! %f18=%f50 -+ -+ ba .Lhwfinish -+ nop -+___ -+$code.=<<___ if ($SZ==4); # SHA256 -+ ld [%o0 + 0x00], %f0 -+ ld [%o0 + 0x04], %f1 -+ ld [%o0 + 0x08], %f2 -+ ld [%o0 + 0x0c], %f3 -+ ld [%o0 + 0x10], %f4 -+ ld [%o0 + 0x14], %f5 -+ andcc %o1, 0x7, %g0 -+ ld [%o0 + 0x18], %f6 -+ bne,pn %icc, .Lhwunaligned -+ ld [%o0 + 0x1c], %f7 -+ -+.Lhwloop: -+ ldd [%o1 + 0x00], %f8 -+ ldd [%o1 + 0x08], %f10 -+ ldd [%o1 + 0x10], %f12 -+ ldd [%o1 + 0x18], %f14 -+ ldd [%o1 + 0x20], %f16 -+ ldd [%o1 + 0x28], %f18 -+ ldd [%o1 + 0x30], %f20 -+ subcc %o2, 1, %o2 ! done yet? -+ ldd [%o1 + 0x38], %f22 -+ add %o1, 0x40, %o1 -+ -+ .word 0x81b02840 ! SHA256 -+ -+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwloop -+ nop -+ -+.Lhwfinish: -+ st %f0, [%o0 + 0x00] ! store context -+ st %f1, [%o0 + 0x04] -+ st %f2, [%o0 + 0x08] -+ st %f3, [%o0 + 0x0c] -+ st %f4, [%o0 + 0x10] -+ st %f5, [%o0 + 0x14] -+ st %f6, [%o0 + 0x18] -+ retl -+ st %f7, [%o0 + 0x1c] -+ -+.align 8 -+.Lhwunaligned: -+ alignaddr %o1, %g0, %o1 -+ -+ ldd [%o1 + 0x00], %f10 -+.Lhwunaligned_loop: -+ ldd [%o1 + 0x08], %f12 -+ ldd [%o1 + 0x10], %f14 -+ ldd [%o1 + 0x18], %f16 -+ ldd [%o1 + 0x20], %f18 -+ ldd [%o1 + 0x28], %f20 -+ ldd [%o1 + 0x30], %f22 -+ ldd [%o1 + 0x38], %f24 -+ subcc %o2, 1, %o2 ! done yet? -+ ldd [%o1 + 0x40], %f26 -+ add %o1, 0x40, %o1 -+ -+ faligndata %f10, %f12, %f8 -+ faligndata %f12, %f14, %f10 -+ faligndata %f14, %f16, %f12 -+ faligndata %f16, %f18, %f14 -+ faligndata %f18, %f20, %f16 -+ faligndata %f20, %f22, %f18 -+ faligndata %f22, %f24, %f20 -+ faligndata %f24, %f26, %f22 -+ -+ .word 0x81b02840 ! SHA256 -+ -+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwunaligned_loop -+ for %f26, %f26, %f10 ! %f10=%f26 -+ -+ ba .Lhwfinish -+ nop -+___ -+$code.=<<___; -+.align 16 -+.Lsoftware: - save %sp,`-$frame-$locals`,%sp - and $inp,`$align-1`,$tmp31 - sllx $len,`log(16*$SZ)/log(2)`,$len -@@ -589,6 +787,62 @@ - .align 4 - ___ - --$code =~ s/\`([^\`]*)\`/eval $1/gem; --print $code; -+# Purpose of these subroutines is to explicitly encode VIS instructions, -+# so that one can compile the module without having to specify VIS -+# extentions on compiler command line, e.g. -xarch=v9 vs. -xarch=v9a. -+# Idea is to reserve for option to produce "universal" binary and let -+# programmer detect if current CPU is VIS capable at run-time. -+sub unvis { -+my ($mnemonic,$rs1,$rs2,$rd)=@_; -+my $ref,$opf; -+my %visopf = ( "faligndata" => 0x048, -+ "for" => 0x07c ); -+ -+ $ref = "$mnemonic\t$rs1,$rs2,$rd"; -+ -+ if ($opf=$visopf{$mnemonic}) { -+ foreach ($rs1,$rs2,$rd) { -+ return $ref if (!/%f([0-9]{1,2})/); -+ $_=$1; -+ if ($1>=32) { -+ return $ref if ($1&1); -+ # re-encode for upper double register addressing -+ $_=($1|$1>>5)&31; -+ } -+ } -+ -+ return sprintf ".word\t0x%08x !%s", -+ 0x81b00000|$rd<<25|$rs1<<14|$opf<<5|$rs2, -+ $ref; -+ } else { -+ return $ref; -+ } -+} -+sub unalignaddr { -+my ($mnemonic,$rs1,$rs2,$rd)=@_; -+my %bias = ( "g" => 0, "o" => 8, "l" => 16, "i" => 24 ); -+my $ref="$mnemonic\t$rs1,$rs2,$rd"; -+ -+ foreach ($rs1,$rs2,$rd) { -+ if (/%([goli])([0-7])/) { $_=$bias{$1}+$2; } -+ else { return $ref; } -+ } -+ return sprintf ".word\t0x%08x !%s", -+ 0x81b00300|$rd<<25|$rs1<<14|$rs2, -+ $ref; -+} -+ -+foreach (split("\n",$code)) { -+ s/\`([^\`]*)\`/eval $1/ge; -+ -+ s/\b(f[^\s]*)\s+(%f[0-9]{1,2}),\s*(%f[0-9]{1,2}),\s*(%f[0-9]{1,2})/ -+ &unvis($1,$2,$3,$4) -+ /ge; -+ s/\b(alignaddr)\s+(%[goli][0-7]),\s*(%[goli][0-7]),\s*(%[goli][0-7])/ -+ &unalignaddr($1,$2,$3,$4) -+ /ge; -+ -+ print $_,"\n"; -+} -+ - close STDOUT; -Index: crypto/des/Makefile -=================================================================== -diff -ru openssl-1.0.1e/crypto/des/Makefile.orig openssl-1.0.1e/crypto/des/Makefile ---- a/crypto/des/Makefile -+++ b/crypto/des/Makefile -@@ -61,6 +61,8 @@ des: des.o cbc3_enc.o lib - - des_enc-sparc.S: asm/des_enc.m4 - m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S -+dest4-sparcv9.s: asm/dest4-sparcv9.pl -+ $(PERL) asm/dest4-sparcv9.pl $(CFLAGS) > $@ - - des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl - $(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@ -Index: crypto/evp/e_des.c -=================================================================== -diff -ru openssl-1.0.1e/crypto/evp/e_des.c.orig openssl-1.0.1e/crypto/evp/e_des.c ---- a/crypto/evp/e_des.c -+++ b/crypto/evp/e_des.c -@@ -65,6 +65,30 @@ - # include - # include - -+typedef struct { -+ union { double align; DES_key_schedule ks; } ks; -+ union { -+ void (*cbc)(const void *,void *,size_t,const void *,void *); -+ } stream; -+} EVP_DES_KEY; -+ -+#if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__)) -+/* ---------^^^ this is not a typo, just a way to detect that -+ * assembler support was in general requested... -+ */ -+#include "sparc_arch.h" -+ -+extern unsigned int OPENSSL_sparcv9cap_P[]; -+ -+#define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES) -+ -+void des_t4_key_expand(const void *key, DES_key_schedule *ks); -+void des_t4_cbc_encrypt(const void *inp,void *out,size_t len, -+ DES_key_schedule *ks,unsigned char iv[8]); -+void des_t4_cbc_decrypt(const void *inp,void *out,size_t len, -+ DES_key_schedule *ks,unsigned char iv[8]); -+#endif -+ - static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc); - static int des_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr); -@@ -102,6 +126,12 @@ static int des_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - static int des_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, size_t inl) - { -+ EVP_DES_KEY *dat = (EVP_DES_KEY *)ctx->cipher_data; -+ -+ if (dat->stream.cbc) { -+ (*dat->stream.cbc)(in,out,inl,&dat->ks.ks,ctx->iv); -+ return 1; -+ } - while (inl >= EVP_MAXCHUNK) { - DES_ncbc_encrypt(in, out, (long)EVP_MAXCHUNK, ctx->cipher_data, - (DES_cblock *)ctx->iv, ctx->encrypt); -@@ -179,16 +209,16 @@ - return 1; - } - --BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8, 8, 64, -+BLOCK_CIPHER_defs(des, EVP_DES_KEY, NID_des, 8, 8, 8, 64, - EVP_CIPH_RAND_KEY, des_init_key, NULL, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl) - - --BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 1, -+BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 1, - EVP_CIPH_RAND_KEY, des_init_key, NULL, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl) - --BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 8, -+BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 8, - EVP_CIPH_RAND_KEY, des_init_key, NULL, - EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl) - -@@ -196,8 +226,23 @@ static int des_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc) - { - DES_cblock *deskey = (DES_cblock *)key; -+ EVP_DES_KEY *dat = (EVP_DES_KEY *)ctx->cipher_data; -+ -+ dat->stream.cbc = NULL; -+#if defined(SPARC_DES_CAPABLE) -+ if (SPARC_DES_CAPABLE) { -+ int mode = ctx->cipher->flags & EVP_CIPH_MODE; -+ -+ if (mode == EVP_CIPH_CBC_MODE) { -+ des_t4_key_expand(key,&dat->ks.ks); -+ dat->stream.cbc = enc ? des_t4_cbc_encrypt : -+ des_t4_cbc_decrypt; -+ return 1; -+ } -+ } -+#endif - # ifdef EVP_CHECK_DES_KEY -- if (DES_set_key_checked(deskey, ctx->cipher_data) != 0) -+ if (DES_set_key_checked(deskey, dat->ks.ks) != 0) - return 0; - # else - DES_set_key_unchecked(deskey, ctx->cipher_data); -Index: crypto/evp/e_des3.c -=================================================================== -diff -ru openssl-1.0.1e/crypto/evp/e_des3.c.orig openssl-1.0.1e/crypto/evp/e_des3.c ---- a/crypto/evp/e_des3.c -+++ b/crypto/evp/e_des3.c -@@ -65,6 +65,32 @@ - # include - # include - -+typedef struct { -+ union { double align; DES_key_schedule ks[3]; } ks; -+ union { -+ void (*cbc)(const void *,void *,size_t,const void *,void *); -+ } stream; -+} DES_EDE_KEY; -+#define ks1 ks.ks[0] -+#define ks2 ks.ks[1] -+#define ks3 ks.ks[2] -+ -+#if defined(AES_ASM) && (defined(__sparc) || defined(__sparc__)) -+/* ---------^^^ this is not a typo, just a way to detect that -+ * assembler support was in general requested... */ -+#include "sparc_arch.h" -+ -+extern unsigned int OPENSSL_sparcv9cap_P[]; -+ -+#define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES) -+ -+void des_t4_key_expand(const void *key, DES_key_schedule *ks); -+void des_t4_ede3_cbc_encrypt(const void *inp,void *out,size_t len, -+ DES_key_schedule *ks,unsigned char iv[8]); -+void des_t4_ede3_cbc_decrypt(const void *inp,void *out,size_t len, -+ DES_key_schedule *ks,unsigned char iv[8]); -+#endif -+ - # ifndef OPENSSL_FIPS - - static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, -@@ -75,12 +100,6 @@ static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - - static int des3_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr); - --typedef struct { -- DES_key_schedule ks1; /* key schedule */ -- DES_key_schedule ks2; /* key schedule (for ede) */ -- DES_key_schedule ks3; /* key schedule (for ede3) */ --} DES_EDE_KEY; -- - # define data(ctx) ((DES_EDE_KEY *)(ctx)->cipher_data) - - /* -@@ -123,6 +117,7 @@ static int des_ede_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, size_t inl) - { -+ DES_EDE_KEY *dat = data(ctx); - # ifdef KSSL_DEBUG - { - int i; -@@ -134,11 +155,15 @@ - fprintf(stderr, "\n"); - } - # endif /* KSSL_DEBUG */ -+ if (dat->stream.cbc) { -+ (*dat->stream.cbc)(in,out,inl,&dat->ks,ctx->iv); -+ return 1; -+ } -+ - while (inl >= EVP_MAXCHUNK) { - DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, -- &data(ctx)->ks1, &data(ctx)->ks2, -- &data(ctx)->ks3, (DES_cblock *)ctx->iv, -- ctx->encrypt); -+ &dat->ks1, &dat->ks2, &dat->ks3, -+ (DES_cblock *)ctx->iv, ctx->encrypt); - inl -= EVP_MAXCHUNK; - in += EVP_MAXCHUNK; - out += EVP_MAXCHUNK; -@@ -145,9 +170,8 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - } - if (inl) - DES_ede3_cbc_encrypt(in, out, (long)inl, -- &data(ctx)->ks1, &data(ctx)->ks2, -- &data(ctx)->ks3, (DES_cblock *)ctx->iv, -- ctx->encrypt); -+ &dat->ks1, &dat->ks2, &dat->ks3, -+ (DES_cblock *)ctx->iv, ctx->encrypt); - return 1; - } - -@@ -215,39 +239,58 @@ static int des_ede3_cfb8_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - } - - BLOCK_CIPHER_defs(des_ede, DES_EDE_KEY, NID_des_ede, 8, 16, 8, 64, -- EVP_CIPH_RAND_KEY, des_ede_init_key, NULL, -- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des3_ctrl) -+ EVP_CIPH_RAND_KEY|EVP_CIPH_FLAG_DEFAULT_ASN1, -+ des_ede_init_key, NULL, NULL, NULL, -+ des3_ctrl) - # define des_ede3_cfb64_cipher des_ede_cfb64_cipher - # define des_ede3_ofb_cipher des_ede_ofb_cipher - # define des_ede3_cbc_cipher des_ede_cbc_cipher - # define des_ede3_ecb_cipher des_ede_ecb_cipher - BLOCK_CIPHER_defs(des_ede3, DES_EDE_KEY, NID_des_ede3, 8, 24, 8, 64, -- EVP_CIPH_RAND_KEY, des_ede3_init_key, NULL, -- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des3_ctrl) -+ EVP_CIPH_RAND_KEY|EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1, -+ des_ede3_init_key, NULL, NULL, NULL, -+ des3_ctrl) - - BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 1, -- EVP_CIPH_RAND_KEY, des_ede3_init_key, NULL, -- EVP_CIPHER_set_asn1_iv, -- EVP_CIPHER_get_asn1_iv, des3_ctrl) -+ EVP_CIPH_RAND_KEY|EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1, -+ des_ede3_init_key, NULL, NULL, NULL, -+ des3_ctrl) - - BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 8, -- EVP_CIPH_RAND_KEY, des_ede3_init_key, NULL, -- EVP_CIPHER_set_asn1_iv, -- EVP_CIPHER_get_asn1_iv, des3_ctrl) -+ EVP_CIPH_RAND_KEY|EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1, -+ des_ede3_init_key, NULL, NULL, NULL, -+ des3_ctrl) - - static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc) - { - DES_cblock *deskey = (DES_cblock *)key; -+ DES_EDE_KEY *dat = data(ctx); -+ -+ dat->stream.cbc = NULL; -+#if defined(SPARC_DES_CAPABLE) -+ if (SPARC_DES_CAPABLE) { -+ int mode = ctx->cipher->flags & EVP_CIPH_MODE; -+ -+ if (mode == EVP_CIPH_CBC_MODE) { -+ des_t4_key_expand(&deskey[0],&dat->ks1); -+ des_t4_key_expand(&deskey[1],&dat->ks2); -+ memcpy(&dat->ks3,&dat->ks1,sizeof(dat->ks1)); -+ dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt : -+ des_t4_ede3_cbc_decrypt; -+ return 1; -+ } -+ } -+#endif - # ifdef EVP_CHECK_DES_KEY -- if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) -- || DES_set_key_checked(&deskey[1], &data(ctx)->ks2)) -+ if (DES_set_key_checked(&deskey[0],&dat->ks1) -+ || DES_set_key_checked(&deskey[1],&dat->ks2)) - return 0; - # else -- DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); -- DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2); -+ DES_set_key_unchecked(&deskey[0],&dat->ks1); -+ DES_set_key_unchecked(&deskey[1],&dat->ks2); - # endif -- memcpy(&data(ctx)->ks3, &data(ctx)->ks1, sizeof(data(ctx)->ks1)); -+ memcpy(&dat->ks3,&dat->ks1, sizeof(dat->ks1)); - return 1; - } - -@@ -255,6 +298,8 @@ static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - const unsigned char *iv, int enc) - { - DES_cblock *deskey = (DES_cblock *)key; -+ DES_EDE_KEY *dat = data(ctx); -+ - # ifdef KSSL_DEBUG - { - int i; -@@ -272,15 +317,30 @@ static int des_ede3_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - } - # endif /* KSSL_DEBUG */ - -+ dat->stream.cbc = NULL; -+#if defined(SPARC_DES_CAPABLE) -+ if (SPARC_DES_CAPABLE) { -+ int mode = ctx->cipher->flags & EVP_CIPH_MODE; -+ -+ if (mode == EVP_CIPH_CBC_MODE) { -+ des_t4_key_expand(&deskey[0],&dat->ks1); -+ des_t4_key_expand(&deskey[1],&dat->ks2); -+ des_t4_key_expand(&deskey[2],&dat->ks3); -+ dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt : -+ des_t4_ede3_cbc_decrypt; -+ return 1; -+ } -+ } -+#endif - # ifdef EVP_CHECK_DES_KEY -- if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1) -- || DES_set_key_checked(&deskey[1], &data(ctx)->ks2) -- || DES_set_key_checked(&deskey[2], &data(ctx)->ks3)) -+ if (DES_set_key_checked(&deskey[0],&dat->ks1) -+ || DES_set_key_checked(&deskey[1],&dat->ks2) -+ || DES_set_key_checked(&deskey[2],&dat->ks3)) - return 0; - # else -- DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1); -- DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2); -- DES_set_key_unchecked(&deskey[2], &data(ctx)->ks3); -+ DES_set_key_unchecked(&deskey[0],&dat->ks1); -+ DES_set_key_unchecked(&deskey[1],&dat->ks2); -+ DES_set_key_unchecked(&deskey[2],&dat->ks3); - # endif - return 1; - } -Index: openssl/crypto/bn/Makefile -=================================================================== -diff -ru openssl-1.0.1e/crypto/bn/Makefile openssl-1.0.1e/crypto/bn/Makefile.new ---- openssl-1.0.1e/crypto/bn/Makefile 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/crypto/bn/Makefile 2011-07-27 10:48:17.817470000 -0700 -@@ -77,6 +77,12 @@ - $(PERL) asm/sparcv9a-mont.pl $(CFLAGS) > $@ - sparcv9-mont.s: asm/sparcv9-mont.pl - $(PERL) asm/sparcv9-mont.pl $(CFLAGS) > $@ -+vis3-mont.s: asm/vis3-mont.pl -+ $(PERL) asm/vis3-mont.pl $(CFLAGS) > $@ -+sparct4-mont.S: asm/sparct4-mont.pl -+ $(PERL) asm/sparct4-mont.pl $(CFLAGS) > $@ -+sparcv9-gf2m.S: asm/sparcv9-gf2m.pl -+ $(PERL) asm/sparcv9-gf2m.pl $(CFLAGS) > $@ - - bn-mips3.o: asm/mips3.s - @if [ "$(CC)" = "gcc" ]; then \ -Index: openssl/crypto/bn/bn_exp.c -=================================================================== -diff -ru openssl-1.0.1e/crypto/bn/bn_exp.c openssl-1.0.1e/crypto/bn/bn_exp.c.new ---- bn_exp.c 2011/10/29 19:25:13 1.38 -+++ bn_exp.c 2012/11/17 10:34:11 1.39 -@@ -122,8 +122,15 @@ - # ifndef alloca - # define alloca(s) __builtin_alloca((s)) - # endif -+#else -+#include - #endif - -+#if defined(OPENSSL_BN_ASM_MONT) && defined(__sparc) -+# include "sparc_arch.h" -+extern unsigned int OPENSSL_sparcv9cap_P[]; -+#endif -+ - /* maximum precomputation table size for *variable* sliding windows */ - #define TABLE_SIZE 32 - -@@ -464,8 +471,16 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, - wstart = bits - 1; /* The top bit of the window */ - wend = 0; /* The bottom bit of the window */ - -+#if 1 /* by Shay Gueron's suggestion */ -+ j = mont->N.top; /* borrow j */ -+ if (bn_wexpand(r,j) == NULL) goto err; -+ r->d[0] = (0-m->d[0])&BN_MASK2; /* 2^(top*BN_BITS2) - m */ -+ for(i=1;id[i] = (~m->d[i])&BN_MASK2; -+ r->top = j; -+#else - if (!BN_to_montgomery(r, BN_value_one(), mont, ctx)) - goto err; -+#endif - for (;;) { - if (BN_is_bit_set(p, wstart) == 0) { - if (!start) { -@@ -515,6 +530,17 @@ int BN_mod_exp_mont(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, - if (wstart < 0) - break; - } -+#if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) || defined(__sparc)) -+ if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3|SPARCV9_PREFER_FPU)) { -+ j = mont->N.top; /* borrow j */ -+ val[0]->d[0] = 1; /* borrow val[0] */ -+ for (i=1;id[i] = 0; -+ val[0]->top = j; -+ if (!BN_mod_mul_montgomery(rr, r, val[0], mont, ctx)) -+ goto err; -+ } else -+#endif - if (!BN_from_montgomery(rr, r, mont, ctx)) - goto err; - ret = 1; -@@ -526,6 +552,26 @@ err: - return (ret); - } - -+#if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) || defined(__sparc)) -+static BN_ULONG bn_get_bits(const BIGNUM *a, int bitpos) { -+ BN_ULONG ret = 0; -+ int wordpos; -+ -+ wordpos = bitpos / BN_BITS2; -+ bitpos %= BN_BITS2; -+ if (wordpos>=0 && wordpos < a->top) { -+ ret = a->d[wordpos]&BN_MASK2; -+ if (bitpos) { -+ ret >>= bitpos; -+ if (++wordpos < a->top) -+ ret |= a->d[wordpos]<<(BN_BITS2-bitpos); -+ } -+ } -+ -+ return ret & BN_MASK2; -+} -+#endif -+ - /* - * BN_mod_exp_mont_consttime() stores the precomputed powers in a specific - * layout so that accessing any of these table values shows the same access -@@ -594,6 +640,9 @@ - int powerbufLen = 0; - unsigned char *powerbuf = NULL; - BIGNUM tmp, am; -+#if defined(OPENSSL_BN_ASM_MONT) && defined(__sparc) -+ unsigned int t4=0; -+#endif - - bn_check_top(a); - bn_check_top(p); -@@ -628,10 +677,18 @@ - - /* Get the window size to use with size of p. */ - window = BN_window_bits_for_ctime_exponent_size(bits); -+#if defined(OPENSSL_BN_ASM_MONT) && defined(__sparc) -+ if (window>=5 && (top&15)==0 && top<=64 && -+ (OPENSSL_sparcv9cap_P[1]&(CFR_MONTMUL|CFR_MONTSQR))== -+ (CFR_MONTMUL|CFR_MONTSQR) && (t4=OPENSSL_sparcv9cap_P[0])) -+ window=5; -+ else -+#endif - #if defined(OPENSSL_BN_ASM_MONT5) - if (window == 6 && bits <= 1024) - window = 5; /* ~5% improvement of 2048-bit RSA sign */ - #endif -+ (void) 0; - - /* - * Allocate a buffer large enough to hold all of the pre-computed powers -@@ -670,14 +727,14 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, - tmp.flags = am.flags = BN_FLG_STATIC_DATA; - - /* prepare a^0 in Montgomery domain */ --#if 1 -- if (!BN_to_montgomery(&tmp, BN_value_one(), mont, ctx)) -- goto err; --#else -+#if 1 /* by Shay Gueron's suggestion */ - tmp.d[0] = (0 - m->d[0]) & BN_MASK2; /* 2^(top*BN_BITS2) - m */ - for (i = 1; i < top; i++) - tmp.d[i] = (~m->d[i]) & BN_MASK2; - tmp.top = top; -+#else -+ if (!BN_to_montgomery(&tmp,BN_value_one(),mont,ctx)) -+ goto err; - #endif - - /* prepare a^1 in Montgomery domain */ -@@ -689,6 +746,122 @@ - } else if (!BN_to_montgomery(&am, a, mont, ctx)) - goto err; - -+#if defined(OPENSSL_BN_ASM_MONT) && defined(__sparc) -+ if (t4) { -+ typedef int (*bn_pwr5_mont_f)(BN_ULONG *tp,const BN_ULONG *np, -+ const BN_ULONG *n0,const void *table,int power,int bits); -+ int bn_pwr5_mont_t4_8(BN_ULONG *tp,const BN_ULONG *np, -+ const BN_ULONG *n0,const void *table,int power,int bits); -+ int bn_pwr5_mont_t4_16(BN_ULONG *tp,const BN_ULONG *np, -+ const BN_ULONG *n0,const void *table,int power,int bits); -+ int bn_pwr5_mont_t4_24(BN_ULONG *tp,const BN_ULONG *np, -+ const BN_ULONG *n0,const void *table,int power,int bits); -+ int bn_pwr5_mont_t4_32(BN_ULONG *tp,const BN_ULONG *np, -+ const BN_ULONG *n0,const void *table,int power,int bits); -+ static const bn_pwr5_mont_f pwr5_funcs[4] = { -+ bn_pwr5_mont_t4_8, bn_pwr5_mont_t4_16, -+ bn_pwr5_mont_t4_24, bn_pwr5_mont_t4_32 }; -+ bn_pwr5_mont_f pwr5_worker = pwr5_funcs[top/16-1]; -+ -+ typedef int (*bn_mul_mont_f)(BN_ULONG *rp,const BN_ULONG *ap, -+ const void *bp,const BN_ULONG *np,const BN_ULONG *n0); -+ int bn_mul_mont_t4_8(BN_ULONG *rp,const BN_ULONG *ap, -+ const void *bp,const BN_ULONG *np,const BN_ULONG *n0); -+ int bn_mul_mont_t4_16(BN_ULONG *rp,const BN_ULONG *ap, -+ const void *bp,const BN_ULONG *np,const BN_ULONG *n0); -+ int bn_mul_mont_t4_24(BN_ULONG *rp,const BN_ULONG *ap, -+ const void *bp,const BN_ULONG *np,const BN_ULONG *n0); -+ int bn_mul_mont_t4_32(BN_ULONG *rp,const BN_ULONG *ap, -+ const void *bp,const BN_ULONG *np,const BN_ULONG *n0); -+ static const bn_mul_mont_f mul_funcs[4] = { -+ bn_mul_mont_t4_8, bn_mul_mont_t4_16, -+ bn_mul_mont_t4_24, bn_mul_mont_t4_32 }; -+ bn_mul_mont_f mul_worker = mul_funcs[top/16-1]; -+ -+ void bn_mul_mont_vis3(BN_ULONG *rp,const BN_ULONG *ap, -+ const void *bp,const BN_ULONG *np, -+ const BN_ULONG *n0,int num); -+ void bn_mul_mont_t4(BN_ULONG *rp,const BN_ULONG *ap, -+ const void *bp,const BN_ULONG *np, -+ const BN_ULONG *n0,int num); -+ void bn_mul_mont_gather5_t4(BN_ULONG *rp,const BN_ULONG *ap, -+ const void *table,const BN_ULONG *np, -+ const BN_ULONG *n0,int num,int power); -+ void bn_flip_n_scatter5_t4(const BN_ULONG *inp,size_t num, -+ void *table,size_t power); -+ void bn_gather5_t4(BN_ULONG *out,size_t num, -+ void *table,size_t power); -+ void bn_flip_t4(BN_ULONG *dst,BN_ULONG *src,size_t num); -+ -+ BN_ULONG *np=mont->N.d, *n0=mont->n0; -+ int stride = 5*(6-(top/16-1)); /* multiple of 5, but less than 32 */ -+ -+ /* -+ * BN_to_montgomery can contaminate words above .top -+ * [in BN_DEBUG[_DEBUG] build]... -+ */ -+ for (i=am.top; iN.d,top); -+ -+ bits--; -+ for (wvalue=0, i=bits%5; i>=0; i--,bits--) -+ wvalue = (wvalue<<1)+BN_is_bit_set(p,bits); -+ bn_gather5_t4(tmp.d,top,powerbuf,wvalue); -+ -+ /* Scan the exponent one window at a time starting from the most -+ * significant bits. -+ */ -+ while (bits >= 0) { -+ if (bits < stride) -+ stride = bits+1; -+ bits -= stride; -+ wvalue = (bn_get_bits(p,bits+1)); -+ -+ if ((*pwr5_worker)(tmp.d,np,n0,powerbuf,wvalue,stride)) -+ continue; -+ /* retry once and fall back */ -+ if ((*pwr5_worker)(tmp.d,np,n0,powerbuf,wvalue,stride)) -+ continue; -+ -+ bits += stride-5; -+ wvalue >>= stride-5; -+ wvalue &= 31; -+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top); -+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top); -+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top); -+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top); -+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top); -+ bn_mul_mont_gather5_t4(tmp.d,tmp.d,powerbuf,np,n0,top,wvalue); -+ } -+ -+ bn_flip_t4(tmp.d,tmp.d,top); -+ top *= 2; -+ /* back to 32-bit domain */ -+ tmp.top=top; -+ bn_correct_top(&tmp); -+ OPENSSL_cleanse(np,top*sizeof(BN_ULONG)); -+ } else -+#endif - #if defined(OPENSSL_BN_ASM_MONT5) - if (window == 5 && top > 1) { - /* -@@ -844,6 +1017,15 @@ int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p, - } - - /* Convert the final result from montgomery to standard format */ -+#if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) || defined(__sparc)) -+ if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3|SPARCV9_PREFER_FPU)) { -+ am.d[0] = 1; /* borrow am */ -+ for (i = 1; i < top; i++) -+ am.d[i] = 0; -+ if (!BN_mod_mul_montgomery(rr,&tmp,&am,mont,ctx)) -+ goto err; -+ } else -+#endif - if (!BN_from_montgomery(rr, &tmp, mont, ctx)) - goto err; - ret = 1; -Index: openssl/apps/speed.c -=================================================================== -diff -ru openssl-1.0.1e/apps/spped.c openssl-1.0.1e/apps/speed.c ---- openssl-1.0.1e/apps/speed.c 2011-05-24 17:02:24.000000000 -0700 -+++ openssl-1.0.1e/apps/spped.c 2011-07-27 10:48:17.817470000 -0700 -@@ -1586,8 +1586,7 @@ - print_message(names[D_MD5], c[D_MD5][j], lengths[j]); - Time_F(START); - for (count = 0, run = 1; COND(c[D_MD5][j]); count++) -- EVP_Digest(&(buf[0]), (unsigned long)lengths[j], &(md5[0]), -- NULL, EVP_get_digestbyname("md5"), NULL); -+ MD5(buf, lengths[j], md5); - d = Time_F(STOP); - print_result(D_MD5, j, count, d); - } -@@ -1622,8 +1621,7 @@ - print_message(names[D_SHA1], c[D_SHA1][j], lengths[j]); - Time_F(START); - for (count = 0, run = 1; COND(c[D_SHA1][j]); count++) -- EVP_Digest(buf, (unsigned long)lengths[j], &(sha[0]), NULL, -- EVP_sha1(), NULL); -+ SHA1(buf, lengths[j], sha); - d = Time_F(STOP); - print_result(D_SHA1, j, count, d); - } -Index: openssl/crypto/aes/Makefile -=================================================================== ---- Makefile Thu May 2 13:42:37 2013 -+++ Makefile.orig Thu May 2 13:41:51 2013 -@@ -69,6 +69,9 @@ - aes-sparcv9.s: asm/aes-sparcv9.pl - $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@ - -+aest4-sparcv9.s: asm/aest4-sparcv9.pl -+ $(PERL) asm/aest4-sparcv9.pl $(CFLAGS) > $@ -+ - aes-ppc.s: asm/aes-ppc.pl - $(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@ - -Index: openssl/crypto/evp/e_aes.c -=================================================================== ---- e_aes.c Mon Feb 11 07:26:04 2013 -+++ e_aes.c.56 Thu May 2 14:26:35 2013 -@@ -56,12 +58,11 @@ - # include - # include - # include "evp_locl.h" --# ifndef OPENSSL_FIPS - # include "modes_lcl.h" - # include - - typedef struct { -- AES_KEY ks; -+ union { double align; AES_KEY ks; } ks; - block128_f block; - union { - cbc128_f cbc; -@@ -70,7 +69,7 @@ - } EVP_AES_KEY; - - typedef struct { -- AES_KEY ks; /* AES key schedule to use */ -+ union { double align; AES_KEY ks; } ks; /* AES key schedule to use */ - int key_set; /* Set if key initialised */ - int iv_set; /* Set if an iv is set */ - GCM128_CONTEXT gcm; -@@ -83,7 +82,7 @@ - } EVP_AES_GCM_CTX; - - typedef struct { -- AES_KEY ks1, ks2; /* AES key schedules to use */ -+ union { double align; AES_KEY ks; } ks1, ks2; /* AES key schedules to use */ - XTS128_CONTEXT xts; - void (*stream) (const unsigned char *in, - unsigned char *out, size_t length, -@@ -92,7 +91,7 @@ - } EVP_AES_XTS_CTX; - - typedef struct { -- AES_KEY ks; /* AES key schedule to use */ -+ union { double align; AES_KEY ks; } ks; /* AES key schedule to use */ - int key_set; /* Set if key initialised */ - int iv_set; /* Set if an iv is set */ - int tag_set; /* Set if tag is valid */ -@@ -155,7 +154,7 @@ - defined(_M_AMD64) || defined(_M_X64) || \ - defined(__INTEL__) ) - --extern unsigned int OPENSSL_ia32cap_P[2]; -+extern unsigned int OPENSSL_ia32cap_P[]; - - # ifdef VPAES_ASM - # define VPAES_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(41-32))) -@@ -297,7 +296,7 @@ - if (!iv && !key) - return 1; - if (key) { -- aesni_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks); -+ aesni_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks); - CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f) aesni_encrypt); - gctx->ctr = (ctr128_f) aesni_ctr32_encrypt_blocks; - /* -@@ -336,17 +335,17 @@ - if (key) { - /* key_len is two AES keys */ - if (enc) { -- aesni_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1); -+ aesni_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); - xctx->xts.block1 = (block128_f) aesni_encrypt; - xctx->stream = aesni_xts_encrypt; - } else { -- aesni_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1); -+ aesni_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); - xctx->xts.block1 = (block128_f) aesni_decrypt; - xctx->stream = aesni_xts_decrypt; - } - - aesni_set_encrypt_key(key + ctx->key_len / 2, -- ctx->key_len * 4, &xctx->ks2); -+ ctx->key_len * 4, &xctx->ks2.ks); - xctx->xts.block2 = (block128_f) aesni_encrypt; - - xctx->xts.key1 = &xctx->ks1; -@@ -371,7 +370,7 @@ - if (!iv && !key) - return 1; - if (key) { -- aesni_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks); -+ aesni_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks); - CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, - &cctx->ks, (block128_f) aesni_encrypt); - cctx->str = enc ? (ccm128_f) aesni_ccm64_encrypt_blocks : -@@ -432,6 +431,364 @@ - const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \ - { return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; } - -+#elif defined(AES_ASM) && (defined(__sparc) || defined(__sparc__)) -+ -+#include "sparc_arch.h" -+ -+extern unsigned int OPENSSL_sparcv9cap_P[]; -+ -+#define SPARC_AES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_AES) -+ -+void aes_t4_set_encrypt_key (const unsigned char *key, int bits, -+ AES_KEY *ks); -+void aes_t4_set_decrypt_key (const unsigned char *key, int bits, -+ AES_KEY *ks); -+void aes_t4_encrypt (const unsigned char *in, unsigned char *out, -+ const AES_KEY *key); -+void aes_t4_decrypt (const unsigned char *in, unsigned char *out, -+ const AES_KEY *key); -+/* -+ * Key-length specific subroutines were chosen for following reason. -+ * Each SPARC T4 core can execute up to 8 threads which share core's -+ * resources. Loading as much key material to registers allows to -+ * minimize references to shared memory interface, as well as amount -+ * of instructions in inner loops [much needed on T4]. But then having -+ * non-key-length specific routines would require conditional branches -+ * either in inner loops or on subroutines' entries. Former is hardly -+ * acceptable, while latter means code size increase to size occupied -+ * by multiple key-length specfic subroutines, so why fight? -+ */ -+void aes128_t4_cbc_encrypt (const unsigned char *in, unsigned char *out, -+ size_t len, const AES_KEY *key, -+ unsigned char *ivec); -+void aes128_t4_cbc_decrypt (const unsigned char *in, unsigned char *out, -+ size_t len, const AES_KEY *key, -+ unsigned char *ivec); -+void aes192_t4_cbc_encrypt (const unsigned char *in, unsigned char *out, -+ size_t len, const AES_KEY *key, -+ unsigned char *ivec); -+void aes192_t4_cbc_decrypt (const unsigned char *in, unsigned char *out, -+ size_t len, const AES_KEY *key, -+ unsigned char *ivec); -+void aes256_t4_cbc_encrypt (const unsigned char *in, unsigned char *out, -+ size_t len, const AES_KEY *key, -+ unsigned char *ivec); -+void aes256_t4_cbc_decrypt (const unsigned char *in, unsigned char *out, -+ size_t len, const AES_KEY *key, -+ unsigned char *ivec); -+void aes128_t4_ctr32_encrypt (const unsigned char *in, unsigned char *out, -+ size_t blocks, const AES_KEY *key, -+ unsigned char *ivec); -+void aes192_t4_ctr32_encrypt (const unsigned char *in, unsigned char *out, -+ size_t blocks, const AES_KEY *key, -+ unsigned char *ivec); -+void aes256_t4_ctr32_encrypt (const unsigned char *in, unsigned char *out, -+ size_t blocks, const AES_KEY *key, -+ unsigned char *ivec); -+ -+static int aes_t4_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc) -+{ -+ int ret, mode, bits; -+ EVP_AES_KEY *dat = (EVP_AES_KEY *)ctx->cipher_data; -+ -+ mode = ctx->cipher->flags & EVP_CIPH_MODE; -+ bits = ctx->key_len*8; -+ if ((mode == EVP_CIPH_ECB_MODE || mode == EVP_CIPH_CBC_MODE) && !enc) { -+ ret = 0; -+ aes_t4_set_decrypt_key(key, bits, ctx->cipher_data); -+ dat->block = (block128_f)aes_t4_decrypt; -+ switch (bits) { -+ case 128: -+ dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ? -+ (cbc128_f)aes128_t4_cbc_decrypt : -+ NULL; -+ break; -+ case 192: -+ dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ? -+ (cbc128_f)aes192_t4_cbc_decrypt : -+ NULL; -+ break; -+ case 256: -+ dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ? -+ (cbc128_f)aes256_t4_cbc_decrypt : -+ NULL; -+ break; -+ default: -+ ret = -1; -+ } -+ } else { -+ ret = 0; -+ aes_t4_set_encrypt_key(key, bits, ctx->cipher_data); -+ dat->block = (block128_f)aes_t4_encrypt; -+ switch (bits) { -+ case 128: -+ if (mode==EVP_CIPH_CBC_MODE) -+ dat->stream.cbc = (cbc128_f)aes128_t4_cbc_encrypt; -+ else if (mode==EVP_CIPH_CTR_MODE) -+ dat->stream.ctr = (ctr128_f)aes128_t4_ctr32_encrypt; -+ else -+ dat->stream.cbc = NULL; -+ break; -+ case 192: -+ if (mode==EVP_CIPH_CBC_MODE) -+ dat->stream.cbc = (cbc128_f)aes192_t4_cbc_encrypt; -+ else if (mode==EVP_CIPH_CTR_MODE) -+ dat->stream.ctr = (ctr128_f)aes192_t4_ctr32_encrypt; -+ else -+ dat->stream.cbc = NULL; -+ break; -+ case 256: -+ if (mode==EVP_CIPH_CBC_MODE) -+ dat->stream.cbc = (cbc128_f)aes256_t4_cbc_encrypt; -+ else if (mode==EVP_CIPH_CTR_MODE) -+ dat->stream.ctr = (ctr128_f)aes256_t4_ctr32_encrypt; -+ else -+ dat->stream.cbc = NULL; -+ break; -+ default: -+ ret = -1; -+ } -+ } -+ -+ if (ret < 0) { -+ EVPerr(EVP_F_AES_T4_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED); -+ return 0; -+ } -+ -+ return 1; -+} -+ -+#define aes_t4_cbc_cipher aes_cbc_cipher -+static int aes_t4_cbc_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out, -+ const unsigned char *in, size_t len); -+ -+#define aes_t4_ecb_cipher aes_ecb_cipher -+static int aes_t4_ecb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out, -+ const unsigned char *in, size_t len); -+ -+#define aes_t4_ofb_cipher aes_ofb_cipher -+static int aes_t4_ofb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out, -+ const unsigned char *in,size_t len); -+ -+#define aes_t4_cfb_cipher aes_cfb_cipher -+static int aes_t4_cfb_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out, -+ const unsigned char *in,size_t len); -+ -+#define aes_t4_cfb8_cipher aes_cfb8_cipher -+static int aes_t4_cfb8_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out, -+ const unsigned char *in,size_t len); -+ -+#define aes_t4_cfb1_cipher aes_cfb1_cipher -+static int aes_t4_cfb1_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out, -+ const unsigned char *in,size_t len); -+ -+#define aes_t4_ctr_cipher aes_ctr_cipher -+static int aes_t4_ctr_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, size_t len); -+ -+static int aes_t4_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc) -+{ -+ EVP_AES_GCM_CTX *gctx = ctx->cipher_data; -+ if (!iv && !key) -+ return 1; -+ if (key) { -+ int bits = ctx->key_len * 8; -+ aes_t4_set_encrypt_key(key, bits, &gctx->ks.ks); -+ CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, -+ (block128_f)aes_t4_encrypt); -+ switch (bits) { -+ case 128: -+ gctx->ctr = (ctr128_f)aes128_t4_ctr32_encrypt; -+ break; -+ case 192: -+ gctx->ctr = (ctr128_f)aes192_t4_ctr32_encrypt; -+ break; -+ case 256: -+ gctx->ctr = (ctr128_f)aes256_t4_ctr32_encrypt; -+ break; -+ default: -+ return 0; -+ } -+ /* If we have an iv can set it directly, otherwise use -+ * saved IV. -+ */ -+ if (iv == NULL && gctx->iv_set) -+ iv = gctx->iv; -+ if (iv) { -+ CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen); -+ gctx->iv_set = 1; -+ } -+ gctx->key_set = 1; -+ } else { -+ /* If key set use IV, otherwise copy */ -+ if (gctx->key_set) -+ CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen); -+ else -+ memcpy(gctx->iv, iv, gctx->ivlen); -+ gctx->iv_set = 1; -+ gctx->iv_gen = 0; -+ } -+ return 1; -+} -+ -+#define aes_t4_gcm_cipher aes_gcm_cipher -+static int aes_t4_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, size_t len); -+ -+static int aes_t4_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc) -+{ -+ EVP_AES_XTS_CTX *xctx = ctx->cipher_data; -+ if (!iv && !key) -+ return 1; -+ -+ if (key) { -+ int bits = ctx->key_len * 4; -+ /* key_len is two AES keys */ -+ if (enc) { -+ aes_t4_set_encrypt_key(key, bits, &xctx->ks1.ks); -+ xctx->xts.block1 = (block128_f)aes_t4_encrypt; -+#if 0 /* not yet */ -+ switch (bits) { -+ case 128: -+ xctx->stream = aes128_t4_xts_encrypt; -+ break; -+ case 192: -+ xctx->stream = aes192_t4_xts_encrypt; -+ break; -+ case 256: -+ xctx->stream = aes256_t4_xts_encrypt; -+ break; -+ default: -+ return 0; -+ } -+#endif -+ } else { -+ aes_t4_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); -+ xctx->xts.block1 = (block128_f)aes_t4_decrypt; -+#if 0 /* not yet */ -+ switch (bits) { -+ case 128: -+ xctx->stream = aes128_t4_xts_decrypt; -+ break; -+ case 192: -+ xctx->stream = aes192_t4_xts_decrypt; -+ break; -+ case 256: -+ xctx->stream = aes256_t4_xts_decrypt; -+ break; -+ default: -+ return 0; -+ } -+#endif -+ } -+ -+ aes_t4_set_encrypt_key(key + ctx->key_len/2, -+ ctx->key_len * 4, &xctx->ks2.ks); -+ xctx->xts.block2 = (block128_f)aes_t4_encrypt; -+ -+ xctx->xts.key1 = &xctx->ks1; -+ } -+ -+ if (iv) { -+ xctx->xts.key2 = &xctx->ks2; -+ memcpy(ctx->iv, iv, 16); -+ } -+ -+ return 1; -+} -+ -+#define aes_t4_xts_cipher aes_xts_cipher -+static int aes_t4_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, size_t len); -+ -+static int aes_t4_ccm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, -+ const unsigned char *iv, int enc) -+{ -+ EVP_AES_CCM_CTX *cctx = ctx->cipher_data; -+ if (!iv && !key) -+ return 1; -+ if (key) { -+ int bits = ctx->key_len * 8; -+ aes_t4_set_encrypt_key(key, bits, &cctx->ks.ks); -+ CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, -+ &cctx->ks, (block128_f)aes_t4_encrypt); -+#if 0 /* not yet */ -+ switch (bits) { -+ case 128: -+ cctx->str = enc?(ccm128_f)aes128_t4_ccm64_encrypt : -+ (ccm128_f)ae128_t4_ccm64_decrypt; -+ break; -+ case 192: -+ cctx->str = enc?(ccm128_f)aes192_t4_ccm64_encrypt : -+ (ccm128_f)ae192_t4_ccm64_decrypt; -+ break; -+ case 256: -+ cctx->str = enc?(ccm128_f)aes256_t4_ccm64_encrypt : -+ (ccm128_f)ae256_t4_ccm64_decrypt; -+ break; -+ default: -+ return 0; -+ } -+#endif -+ cctx->key_set = 1; -+ } -+ if (iv) { -+ memcpy(ctx->iv, iv, 15 - cctx->L); -+ cctx->iv_set = 1; -+ } -+ return 1; -+} -+ -+#define aes_t4_ccm_cipher aes_ccm_cipher -+static int aes_t4_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, -+ const unsigned char *in, size_t len); -+ -+#define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \ -+static const EVP_CIPHER aes_t4_##keylen##_##mode = { \ -+ nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \ -+ flags|EVP_CIPH_##MODE##_MODE, \ -+ aes_t4_init_key, \ -+ aes_t4_##mode##_cipher, \ -+ NULL, \ -+ sizeof(EVP_AES_KEY), \ -+ NULL,NULL,NULL,NULL }; \ -+static const EVP_CIPHER aes_##keylen##_##mode = { \ -+ nid##_##keylen##_##nmode,blocksize, \ -+ keylen/8,ivlen, \ -+ flags|EVP_CIPH_##MODE##_MODE, \ -+ aes_init_key, \ -+ aes_##mode##_cipher, \ -+ NULL, \ -+ sizeof(EVP_AES_KEY), \ -+ NULL,NULL,NULL,NULL }; \ -+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \ -+{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; } -+ -+#define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \ -+static const EVP_CIPHER aes_t4_##keylen##_##mode = { \ -+ nid##_##keylen##_##mode,blocksize, \ -+ (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE?2:1)*keylen/8, ivlen, \ -+ flags|EVP_CIPH_##MODE##_MODE, \ -+ aes_t4_##mode##_init_key, \ -+ aes_t4_##mode##_cipher, \ -+ aes_##mode##_cleanup, \ -+ sizeof(EVP_AES_##MODE##_CTX), \ -+ NULL,NULL,aes_##mode##_ctrl,NULL }; \ -+static const EVP_CIPHER aes_##keylen##_##mode = { \ -+ nid##_##keylen##_##mode,blocksize, \ -+ (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE?2:1)*keylen/8, ivlen, \ -+ flags|EVP_CIPH_##MODE##_MODE, \ -+ aes_##mode##_init_key, \ -+ aes_##mode##_cipher, \ -+ aes_##mode##_cleanup, \ -+ sizeof(EVP_AES_##MODE##_CTX), \ -+ NULL,NULL,aes_##mode##_ctrl,NULL }; \ -+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \ -+{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; } -+ - # else - - # define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \ -@@ -480,7 +837,7 @@ - && !enc) - # ifdef BSAES_CAPABLE - if (BSAES_CAPABLE && mode == EVP_CIPH_CBC_MODE) { -- ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks); -+ ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks); - dat->block = (block128_f) AES_decrypt; - dat->stream.cbc = (cbc128_f) bsaes_cbc_encrypt; - } else -@@ -487,7 +844,7 @@ - # endif - # ifdef VPAES_CAPABLE - if (VPAES_CAPABLE) { -- ret = vpaes_set_decrypt_key(key, ctx->key_len * 8, &dat->ks); -+ ret = vpaes_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks); - dat->block = (block128_f) vpaes_decrypt; - dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? - (cbc128_f) vpaes_cbc_encrypt : NULL; -@@ -494,7 +851,7 @@ - } else - # endif - { -- ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks); -+ ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks); - dat->block = (block128_f) AES_decrypt; - dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? - (cbc128_f) AES_cbc_encrypt : NULL; -@@ -502,7 +859,7 @@ - } else - # ifdef BSAES_CAPABLE - if (BSAES_CAPABLE && mode == EVP_CIPH_CTR_MODE) { -- ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks); -+ ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks.ks); - dat->block = (block128_f) AES_encrypt; - dat->stream.ctr = (ctr128_f) bsaes_ctr32_encrypt_blocks; - } else -@@ -508,7 +865,7 @@ - # endif - # ifdef VPAES_CAPABLE - if (VPAES_CAPABLE) { -- ret = vpaes_set_encrypt_key(key, ctx->key_len * 8, &dat->ks); -+ ret = vpaes_set_encrypt_key(key, ctx->key_len * 8, &dat->ks.ks); - dat->block = (block128_f) vpaes_encrypt; - dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? - (cbc128_f) vpaes_cbc_encrypt : NULL; -@@ -515,7 +872,7 @@ - } else - # endif - { -- ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks); -+ ret = AES_set_encrypt_key(key, ctx->key_len*8, &dat->ks.ks); - dat->block = (block128_f) AES_encrypt; - dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ? - (cbc128_f) AES_cbc_encrypt : NULL; -@@ -810,7 +1167,7 @@ - do { - # ifdef BSAES_CAPABLE - if (BSAES_CAPABLE) { -- AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks); -+ AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks); - CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, - (block128_f) AES_encrypt); - gctx->ctr = (ctr128_f) bsaes_ctr32_encrypt_blocks; -@@ -819,7 +1176,7 @@ - # endif - # ifdef VPAES_CAPABLE - if (VPAES_CAPABLE) { -- vpaes_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks); -+ vpaes_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks); - CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, - (block128_f) vpaes_encrypt); - gctx->ctr = NULL; -@@ -828,7 +1185,7 @@ - # endif - (void)0; /* terminate potentially open 'else' */ - -- AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks); -+ AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks); - CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, - (block128_f) AES_encrypt); - # ifdef AES_CTR_ASM -@@ -1049,15 +1406,15 @@ - # ifdef VPAES_CAPABLE - if (VPAES_CAPABLE) { - if (enc) { -- vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1); -+ vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); - xctx->xts.block1 = (block128_f) vpaes_encrypt; - } else { -- vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1); -+ vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); - xctx->xts.block1 = (block128_f) vpaes_decrypt; - } - - vpaes_set_encrypt_key(key + ctx->key_len / 2, -- ctx->key_len * 4, &xctx->ks2); -+ ctx->key_len * 4, &xctx->ks2.ks); - xctx->xts.block2 = (block128_f) vpaes_encrypt; - - xctx->xts.key1 = &xctx->ks1; -@@ -1067,15 +1424,15 @@ - (void)0; /* terminate potentially open 'else' */ - - if (enc) { -- AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1); -+ AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); - xctx->xts.block1 = (block128_f) AES_encrypt; - } else { -- AES_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1); -+ AES_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks); - xctx->xts.block1 = (block128_f) AES_decrypt; - } - - AES_set_encrypt_key(key + ctx->key_len / 2, -- ctx->key_len * 4, &xctx->ks2); -+ ctx->key_len * 4, &xctx->ks2.ks); - xctx->xts.block2 = (block128_f) AES_encrypt; - - xctx->xts.key1 = &xctx->ks1; -@@ -1196,7 +1553,7 @@ - do { - # ifdef VPAES_CAPABLE - if (VPAES_CAPABLE) { -- vpaes_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks); -+ vpaes_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks); - CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, - &cctx->ks, (block128_f) vpaes_encrypt); - cctx->str = NULL; -@@ -1204,7 +1561,7 @@ - break; - } - # endif -- AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks); -+ AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks); - CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L, - &cctx->ks, (block128_f) AES_encrypt); - cctx->str = NULL; -@@ -1285,5 +1642,4 @@ - EVP_CIPH_FLAG_FIPS | CUSTOM_FLAGS) - BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, ccm, CCM, - EVP_CIPH_FLAG_FIPS | CUSTOM_FLAGS) --# endif - #endif -Index: openssl/crypto/evp/evp.h -=================================================================== ---- evp.h Mon Feb 11 07:26:04 2013 -+++ evp.h.new Thu May 2 14:31:55 2013 -@@ -1325,6 +1325,7 @@ - # define EVP_F_AESNI_INIT_KEY 165 - # define EVP_F_AESNI_XTS_CIPHER 176 - # define EVP_F_AES_INIT_KEY 133 -+# define EVP_F_AES_T4_INIT_KEY 178 - # define EVP_F_AES_XTS 172 - # define EVP_F_AES_XTS_CIPHER 175 - # define EVP_F_ALG_MODULE_INIT 177 -Index: openssl/crypto/evp/evp_err.c -=================================================================== ---- evp_err.c Mon Feb 11 07:26:04 2013 -+++ evp_err.c.new Thu May 2 14:33:24 2013 -@@ -73,6 +73,7 @@ - {ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_INIT_KEY"}, - {ERR_FUNC(EVP_F_AESNI_XTS_CIPHER), "AESNI_XTS_CIPHER"}, - {ERR_FUNC(EVP_F_AES_INIT_KEY), "AES_INIT_KEY"}, -+ {ERR_FUNC(EVP_F_AES_T4_INIT_KEY), "AES_T4_INIT_KEY"}, - {ERR_FUNC(EVP_F_AES_XTS), "AES_XTS"}, - {ERR_FUNC(EVP_F_AES_XTS_CIPHER), "AES_XTS_CIPHER"}, - {ERR_FUNC(EVP_F_ALG_MODULE_INIT), "ALG_MODULE_INIT"},