upstream/oracle/userland-gate: components/openssl/openssl-1.0.1/patches/37_openssl_t4

2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1	#
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2	# This file adds inline T4 instruction support to OpenSSL upstream code.
3017 da8a40fb54dd PSARC/2014/077 OpenSSL Thread and Fork Safety Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2921 diff changeset	3	# The change was brought in from OpenSSL 1.0.2.
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	4	#
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	5	Index: Configure
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	6	===================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	7	diff -ru openssl-1.0.1e/Configure openssl-1.0.1e/Configure
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	8	--- openssl-1.0.1e/Configure 2011-05-24 17:02:24.000000000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	9	+++ openssl-1.0.1e/Configure 2011-07-27 10:48:17.817470000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	10	@@ -135,7 +135,7 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	11
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	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:";
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	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";
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	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:::::::ghash-sparcv9.o::void";
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	15	+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";
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	16	my $sparcv8_asm=":sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::::::void";
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	17	my $alpha_asm="alphacpuid.o:bn_asm.o alpha-mont.o:::::sha1-alpha.o:::::::ghash-alpha.o::void";
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	18	my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::";
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	19	Index: crypto/sparccpuid.S
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	20	===================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	21	diff -ru openssl-1.0.1e/crypto/sparccpuid.S openssl-1.0.1e/crypto/sparccpuid.S
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	22	--- openssl-1.0.1e/crypto/sparccpuid.S 2011-05-24 17:02:24.000000000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	23	+++ openssl-1.0.1e/crypto/sparccpuid.S 2011-07-27 10:48:17.817470000 -0700
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	24	@@ -1,3 +1,7 @@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	25	+#ifdef OPENSSL_FIPSCANISTER
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	26	+#include <openssl/fipssyms.h>
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	27	+#endif
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	28	+
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	29	#if defined(__SUNPRO_C) && defined(__sparcv9)
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	30	# define ABI64 /* They've said -xarch=v9 at command line */
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	31	#elif defined(__GNUC__) && defined(__arch64__)
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	32	@@ -235,10 +239,10 @@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	33	.global _sparcv9_vis1_probe
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	34	.align 8
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	35	_sparcv9_vis1_probe:
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	36	+ .word 0x81b00d80 !fxor %f0,%f0,%f0
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	37	add %sp,BIAS+2,%o1
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	38	- .word 0xc19a5a40 !ldda [%o1]ASI_FP16_P,%f0
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	39	retl
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	40	- .word 0x81b00d80 !fxor %f0,%f0,%f0
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	41	+ .word 0xc19a5a40 !ldda [%o1]ASI_FP16_P,%f0
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	42	.type _sparcv9_vis1_probe,#function
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	43	.size _sparcv9_vis1_probe,.-_sparcv9_vis1_probe
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	44
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	45	@@ -251,7 +255,12 @@
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	46	! UltraSPARC IIe 7
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	47	! UltraSPARC III 7
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	48	! UltraSPARC T1 24
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	49	+! SPARC T4 65(*)
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	50	!
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	51	+! (*) result has lesser to do with VIS instruction latencies, rdtick
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	52	+! appears that slow, but it does the trick in sense that FP and
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	53	+! VIS code paths are still slower than integer-only ones.
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	54	+!
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	55	! Numbers for T2 and SPARC64 V-VII are more than welcomed.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	56	!
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	57	! It would be possible to detect specifically US-T1 by instrumenting
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	58	@@ -260,6 +269,8 @@
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	59	.global _sparcv9_vis1_instrument
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	60	.align 8
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	61	_sparcv9_vis1_instrument:
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	62	+ .word 0x81b00d80 !fxor %f0,%f0,%f0
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	63	+ .word 0x85b08d82 !fxor %f2,%f2,%f2
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	64	.word 0x91410000 !rd %tick,%o0
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	65	.word 0x81b00d80 !fxor %f0,%f0,%f0
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	66	.word 0x85b08d82 !fxor %f2,%f2,%f2
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	67	@@ -314,6 +325,30 @@
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	68	.type _sparcv9_fmadd_probe,#function
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	69	.size _sparcv9_fmadd_probe,.-_sparcv9_fmadd_probe
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	70
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	71	+.global _sparcv9_rdcfr
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	72	+.align 8
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	73	+_sparcv9_rdcfr:
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	74	+ retl
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	75	+ .word 0x91468000 !rd %asr26,%o0
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	76	+.type _sparcv9_rdcfr,#function
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	77	+.size _sparcv9_rdcfr,.-_sparcv9_rdcfr
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	78	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	79	+.global _sparcv9_vis3_probe
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	80	+.align 8
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	81	+_sparcv9_vis3_probe:
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	82	+ retl
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	83	+ .word 0x81b022a0 !xmulx %g0,%g0,%g0
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	84	+.type _sparcv9_vis3_probe,#function
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	85	+.size _sparcv9_vis3_probe,.-_sparcv9_vis3_probe
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	86	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	87	+.global _sparcv9_random
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	88	+.align 8
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	89	+_sparcv9_random:
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	90	+ retl
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	91	+ .word 0x91b002a0 !random %o0
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	92	+.type _sparcv9_random,#function
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	93	+.size _sparcv9_random,.-_sparcv9_vis3_probe
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	94	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	95	.global OPENSSL_cleanse
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	96	.align 32
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	97	OPENSSL_cleanse:
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	98	@@ -398,6 +433,102 @@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	99	.size OPENSSL_cleanse,.-OPENSSL_cleanse
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	100
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	101	#ifndef _BOOT
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	102	+.global _sparcv9_vis1_instrument_bus
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	103	+.align 8
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	104	+_sparcv9_vis1_instrument_bus:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	105	+ mov %o1,%o3 ! save cnt
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	106	+ .word 0x99410000 !rd %tick,%o4 ! tick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	107	+ mov %o4,%o5 ! lasttick = tick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	108	+ set 0,%g4 ! diff
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	109	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	110	+ andn %o0,63,%g1
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	111	+ .word 0xc1985e00 !ldda [%g1]0xf0,%f0 ! block load
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	112	+ .word 0x8143e040 !membar #Sync
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	113	+ .word 0xc1b85c00 !stda %f0,[%g1]0xe0 ! block store and commit
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	114	+ .word 0x8143e040 !membar #Sync
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	115	+ ld [%o0],%o4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	116	+ add %o4,%g4,%g4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	117	+ .word 0xc9e2100c !cas [%o0],%o4,%g4
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	118	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	119	+.Loop: .word 0x99410000 !rd %tick,%o4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	120	+ sub %o4,%o5,%g4 ! diff=tick-lasttick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	121	+ mov %o4,%o5 ! lasttick=tick
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	122	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	123	+ andn %o0,63,%g1
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	124	+ .word 0xc1985e00 !ldda [%g1]0xf0,%f0 ! block load
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	125	+ .word 0x8143e040 !membar #Sync
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	126	+ .word 0xc1b85c00 !stda %f0,[%g1]0xe0 ! block store and commit
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	127	+ .word 0x8143e040 !membar #Sync
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	128	+ ld [%o0],%o4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	129	+ add %o4,%g4,%g4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	130	+ .word 0xc9e2100c !cas [%o0],%o4,%g4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	131	+ subcc %o1,1,%o1 ! --$cnt
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	132	+ bnz .Loop
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	133	+ add %o0,4,%o0 ! ++$out
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	134	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	135	+ retl
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	136	+ mov %o3,%o0
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	137	+.type _sparcv9_vis1_instrument_bus,#function
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	138	+.size _sparcv9_vis1_instrument_bus,.-_sparcv9_vis1_instrument_bus
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	139	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	140	+.global _sparcv9_vis1_instrument_bus2
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	141	+.align 8
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	142	+_sparcv9_vis1_instrument_bus2:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	143	+ mov %o1,%o3 ! save cnt
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	144	+ sll %o1,2,%o1 ! cnt*=4
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	145	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	146	+ .word 0x99410000 !rd %tick,%o4 ! tick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	147	+ mov %o4,%o5 ! lasttick = tick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	148	+ set 0,%g4 ! diff
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	149	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	150	+ andn %o0,63,%g1
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	151	+ .word 0xc1985e00 !ldda [%g1]0xf0,%f0 ! block load
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	152	+ .word 0x8143e040 !membar #Sync
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	153	+ .word 0xc1b85c00 !stda %f0,[%g1]0xe0 ! block store and commit
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	154	+ .word 0x8143e040 !membar #Sync
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	155	+ ld [%o0],%o4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	156	+ add %o4,%g4,%g4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	157	+ .word 0xc9e2100c !cas [%o0],%o4,%g4
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	158	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	159	+ .word 0x99410000 !rd %tick,%o4 ! tick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	160	+ sub %o4,%o5,%g4 ! diff=tick-lasttick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	161	+ mov %o4,%o5 ! lasttick=tick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	162	+ mov %g4,%g5 ! lastdiff=diff
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	163	+.Loop2:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	164	+ andn %o0,63,%g1
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	165	+ .word 0xc1985e00 !ldda [%g1]0xf0,%f0 ! block load
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	166	+ .word 0x8143e040 !membar #Sync
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	167	+ .word 0xc1b85c00 !stda %f0,[%g1]0xe0 ! block store and commit
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	168	+ .word 0x8143e040 !membar #Sync
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	169	+ ld [%o0],%o4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	170	+ add %o4,%g4,%g4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	171	+ .word 0xc9e2100c !cas [%o0],%o4,%g4
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	172	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	173	+ subcc %o2,1,%o2 ! --max
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	174	+ bz .Ldone2
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	175	+ nop
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	176	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	177	+ .word 0x99410000 !rd %tick,%o4 ! tick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	178	+ sub %o4,%o5,%g4 ! diff=tick-lasttick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	179	+ mov %o4,%o5 ! lasttick=tick
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	180	+ cmp %g4,%g5
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	181	+ mov %g4,%g5 ! lastdiff=diff
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	182	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	183	+ .word 0x83408000 !rd %ccr,%g1
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	184	+ and %g1,4,%g1 ! isolate zero flag
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	185	+ xor %g1,4,%g1 ! flip zero flag
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	186	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	187	+ subcc %o1,%g1,%o1 ! conditional --$cnt
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	188	+ bnz .Loop2
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	189	+ add %o0,%g1,%o0 ! conditional ++$out
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	190	+
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	191	+.Ldone2:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	192	+ srl %o1,2,%o1
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	193	+ retl
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	194	+ sub %o3,%o1,%o0
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	195	+.type _sparcv9_vis1_instrument_bus2,#function
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	196	+.size _sparcv9_vis1_instrument_bus2,.-_sparcv9_vis1_instrument_bus2
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	197	+
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	198	.section ".init",#alloc,#execinstr
3017 da8a40fb54dd PSARC/2014/077 OpenSSL Thread and Fork Safety Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2921 diff changeset	199	call solaris_locking_setup
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	200	nop
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	201	Index: crypto/sparcv9cap.c
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	202	===================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	203	diff -ru openssl-1.0.1e/crypto/sparcv9cap.c openssl-1.0.1e/crypto/sparcv9cap.c
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	204	--- openssl-1.0.1e/crypto/sparcv9cap.c 2011-05-24 17:02:24.000000000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	205	+++ openssl-1.0.1e/crypto/sparcv9cap.c 2011-07-27 10:48:17.817470000 -0700
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	206	@@ -4,34 +4,58 @@
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	207	#include <setjmp.h>
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	208	#include <signal.h>
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	209	#include <sys/time.h>
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	210	+#include <unistd.h>
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	211	#include <openssl/bn.h>
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	212
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	213	-#define SPARCV9_TICK_PRIVILEGED (1<<0)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	214	-#define SPARCV9_PREFER_FPU (1<<1)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	215	-#define SPARCV9_VIS1 (1<<2)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	216	-#define SPARCV9_VIS2 (1<<3) /* reserved */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	217	-#define SPARCV9_FMADD (1<<4) /* reserved for SPARC64 V */
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	218	+#include "sparc_arch.h"
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	219
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	220	+#if defined(__GNUC__) && defined(__linux)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	221	+__attribute__((visibility("hidden")))
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	222	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	223	#ifndef _BOOT
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	224	-static int OPENSSL_sparcv9cap_P = SPARCV9_TICK_PRIVILEGED;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	225	+unsigned int OPENSSL_sparcv9cap_P[2] = {SPARCV9_TICK_PRIVILEGED, 0};
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	226	#else
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	227	-static int OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	228	+unsigned int OPENSSL_sparcv9cap_P[2] = {SPARCV9_VIS1, 0};
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	229	#endif
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	230
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	231	int bn_mul_mont(BN_ULONG rp, const BN_ULONG ap, const BN_ULONG *bp,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	232	const BN_ULONG np, const BN_ULONG n0, int num)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	233	{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	234	+ int bn_mul_mont_vis3(BN_ULONG rp, const BN_ULONG ap, const BN_ULONG *bp,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	235	+ const BN_ULONG np,const BN_ULONG n0, int num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	236	int bn_mul_mont_fpu(BN_ULONG rp, const BN_ULONG ap, const BN_ULONG *bp,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	237	const BN_ULONG np, const BN_ULONG n0, int num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	238	int bn_mul_mont_int(BN_ULONG rp, const BN_ULONG ap, const BN_ULONG *bp,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	239	const BN_ULONG np, const BN_ULONG n0, int num);
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	240
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	241	- if (num >= 8 && !(num & 1) &&
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	242	- (OPENSSL_sparcv9cap_P & (SPARCV9_PREFER_FPU \| SPARCV9_VIS1)) ==
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	243	- (SPARCV9_PREFER_FPU \| SPARCV9_VIS1))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	244	- return bn_mul_mont_fpu(rp, ap, bp, np, n0, num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	245	- else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	246	- return bn_mul_mont_int(rp, ap, bp, np, n0, num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	247	+ if (!(num&1) && num>=6) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	248	+ if ((num&15)==0 && num<=64 &&
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	249	+ (OPENSSL_sparcv9cap_P[1]&(CFR_MONTMUL\|CFR_MONTSQR))==
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	250	+ (CFR_MONTMUL\|CFR_MONTSQR))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	251	+ {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	252	+ 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);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	253	+ 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);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	254	+ 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);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	255	+ 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);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	256	+ 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);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	257	+ static const bn_mul_mont_f funcs[4] = {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	258	+ bn_mul_mont_t4_8, bn_mul_mont_t4_16,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	259	+ bn_mul_mont_t4_24, bn_mul_mont_t4_32 };
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	260	+ bn_mul_mont_f worker = funcs[num/16-1];
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	261	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	262	+ if ((*worker)(rp,ap,bp,np,n0)) return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	263	+ /* retry once and fall back */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	264	+ if ((*worker)(rp,ap,bp,np,n0)) return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	265	+ return bn_mul_mont_vis3(rp,ap,bp,np,n0,num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	266	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	267	+ if ((OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS3))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	268	+ return bn_mul_mont_vis3(rp,ap,bp,np,n0,num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	269	+ else if (num>=8 &&
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	270	+ (OPENSSL_sparcv9cap_P[0]&(SPARCV9_PREFER_FPU\|SPARCV9_VIS1)) ==
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	271	+ (SPARCV9_PREFER_FPU\|SPARCV9_VIS1))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	272	+ return bn_mul_mont_fpu(rp,ap,bp,np,n0,num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	273	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	274	+ return bn_mul_mont_int(rp,ap,bp,np,n0,num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	275	}
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	276
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	277	unsigned long _sparcv9_rdtick(void);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	278	@@ -39,11 +63,18 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	279	unsigned long _sparcv9_vis1_instrument(void);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	280	void _sparcv9_vis2_probe(void);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	281	void _sparcv9_fmadd_probe(void);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	282	+unsigned long _sparcv9_rdcfr(void);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	283	+void _sparcv9_vis3_probe(void);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	284	+unsigned long _sparcv9_random(void);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	285	+#ifndef _BOOT
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	286	+size_t _sparcv9_vis1_instrument_bus(unsigned int *,size_t);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	287	+size_t _sparcv9_vis1_instrument_bus2(unsigned int *,size_t,size_t);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	288	+#endif
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	289
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	290	#ifndef _BOOT
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	291	unsigned long OPENSSL_rdtsc(void)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	292	{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	293	- if (OPENSSL_sparcv9cap_P & SPARCV9_TICK_PRIVILEGED)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	294	+ if (OPENSSL_sparcv9cap_P[0] & SPARCV9_TICK_PRIVILEGED)
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	295	#if defined(__sun) && defined(__SVR4)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	296	return gethrtime();
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	297	#else
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	298	@@ -52,6 +83,24 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	299	else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	300	return _sparcv9_rdtick();
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	301	}
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	302	+
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	303	+size_t OPENSSL_instrument_bus(unsigned int *out,size_t cnt)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	304	+{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	305	+ if ((OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED\|SPARCV9_BLK)) ==
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	306	+ SPARCV9_BLK)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	307	+ return _sparcv9_vis1_instrument_bus(out,cnt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	308	+ else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	309	+ return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	310	+}
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	311	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	312	+size_t OPENSSL_instrument_bus2(unsigned int *out,size_t cnt,size_t max)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	313	+{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	314	+ if ((OPENSSL_sparcv9cap_P[0]&(SPARCV9_TICK_PRIVILEGED\|SPARCV9_BLK)) ==
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	315	+ SPARCV9_BLK)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	316	+ return _sparcv9_vis1_instrument_bus2(out,cnt,max);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	317	+ else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	318	+ return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	319	+}
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	320	#endif
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	321
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	322	#if defined(_BOOT)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	323	@@ -61,7 +110,7 @@
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	324	*/
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	325	void OPENSSL_cpuid_setup(void)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	326	{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	327	- OPENSSL_sparcv9cap_P = SPARCV9_VIS1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	328	+ OPENSSL_sparcv9cap_P[0] = SPARCV9_VIS1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	329	}
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	330
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	331	#elif 0 && defined(__sun) && defined(__SVR4)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	332	@@ -90,11 +139,11 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	333	if (!strcmp(name, "SUNW,UltraSPARC") \|\|
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	334	/* covers II,III,IV */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	335	!strncmp(name, "SUNW,UltraSPARC-I", 17)) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	336	- OPENSSL_sparcv9cap_P \|= SPARCV9_PREFER_FPU \| SPARCV9_VIS1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	337	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_PREFER_FPU \| SPARCV9_VIS1;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	338
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	339	/* %tick is privileged only on UltraSPARC-I/II, but not IIe */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	340	if (name[14] != '\0' && name[17] != '\0' && name[18] != '\0')
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	341	- OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	342	+ OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	343
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	344	return DI_WALK_TERMINATE;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	345	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	346	@@ -100,7 +149,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	347	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	348	/* This is expected to catch remaining UltraSPARCs, such as T1 */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	349	else if (!strncmp(name, "SUNW,UltraSPARC", 15)) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	350	- OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	351	+ OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	352
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	353	return DI_WALK_TERMINATE;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	354	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	355	@@ -119,7 +168,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	356	trigger = 1;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	357
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	358	if ((e = getenv("OPENSSL_sparcv9cap"))) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	359	- OPENSSL_sparcv9cap_P = strtoul(e, NULL, 0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	360	+ OPENSSL_sparcv9cap_P[0] = strtoul(e, NULL, 0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	361	return;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	362	}
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	363
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	364	@@ -126,15 +175,15 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	365	if (sysinfo(SI_MACHINE, si, sizeof(si)) > 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	366	if (strcmp(si, "sun4v"))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	367	/* FPU is preferred for all CPUs, but US-T1/2 */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	368	- OPENSSL_sparcv9cap_P \|= SPARCV9_PREFER_FPU;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	369	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_PREFER_FPU;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	370	}
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	371
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	372	if (sysinfo(SI_ISALIST, si, sizeof(si)) > 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	373	if (strstr(si, "+vis"))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	374	- OPENSSL_sparcv9cap_P \|= SPARCV9_VIS1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	375	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_VIS1 \| SPARCV9_BLK;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	376	if (strstr(si, "+vis2")) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	377	- OPENSSL_sparcv9cap_P \|= SPARCV9_VIS2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	378	- OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	379	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_VIS2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	380	+ OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	381	return;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	382	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	383	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	384	@@ -204,12 +253,14 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	385	trigger = 1;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	386
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	387	if ((e = getenv("OPENSSL_sparcv9cap"))) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	388	- OPENSSL_sparcv9cap_P = strtoul(e, NULL, 0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	389	+ OPENSSL_sparcv9cap_P[0] = strtoul(e, NULL, 0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	390	+ if ((e = strchr(e, ':')))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	391	+ OPENSSL_sparcv9cap_P[1] = strtoul(e + 1, NULL, 0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	392	return;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	393	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	394
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	395	/* Initial value, fits UltraSPARC-I&II... */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	396	- OPENSSL_sparcv9cap_P = SPARCV9_PREFER_FPU \| SPARCV9_TICK_PRIVILEGED;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	397	+ OPENSSL_sparcv9cap_P[0] = SPARCV9_PREFER_FPU \| SPARCV9_TICK_PRIVILEGED;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	398
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	399	sigfillset(&all_masked);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	400	sigdelset(&all_masked, SIGILL);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	401	@@ -232,18 +283,18 @@
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	402
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	403	if (sigsetjmp(common_jmp, 1) == 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	404	_sparcv9_rdtick();
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	405	- OPENSSL_sparcv9cap_P &= ~SPARCV9_TICK_PRIVILEGED;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	406	+ OPENSSL_sparcv9cap_P[0] &= ~SPARCV9_TICK_PRIVILEGED;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	407	}
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	408
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	409	if (sigsetjmp(common_jmp, 1) == 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	410	_sparcv9_vis1_probe();
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	411	- OPENSSL_sparcv9cap_P \|= SPARCV9_VIS1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	412	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_VIS1 \| SPARCV9_BLK;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	413	/* detect UltraSPARC-Tx, see sparccpud.S for details... */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	414	if (_sparcv9_vis1_instrument() >= 12)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	415	- OPENSSL_sparcv9cap_P &= ~(SPARCV9_VIS1 \| SPARCV9_PREFER_FPU);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	416	+ OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 \| SPARCV9_PREFER_FPU);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	417	else {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	418	_sparcv9_vis2_probe();
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	419	- OPENSSL_sparcv9cap_P \|= SPARCV9_VIS2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	420	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_VIS2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	421	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	422	}
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	423
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	424	@@ -249,13 +300,50 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	425
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	426	if (sigsetjmp(common_jmp, 1) == 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	427	_sparcv9_fmadd_probe();
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	428	- OPENSSL_sparcv9cap_P \|= SPARCV9_FMADD;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	429	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_FMADD;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	430	}
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	431
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	432	+ /*
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	433	+ * VIS3 flag is tested independently from VIS1, unlike VIS2 that is,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	434	+ * because VIS3 defines even integer instructions.
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	435	+ */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	436	+ if (sigsetjmp(common_jmp,1) == 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	437	+ _sparcv9_vis3_probe();
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	438	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_VIS3;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	439	+ }
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	440	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	441	+ if (sigsetjmp(common_jmp,1) == 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	442	+ (void)_sparcv9_random();
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	443	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_RANDOM;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	444	+ }
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	445	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	446	+ /*
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	447	+ * In wait for better solution _sparcv9_rdcfr is masked by
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	448	+ * VIS3 flag, because it goes to uninterruptable endless
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	449	+ * loop on UltraSPARC II running Solaris. Things might be
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	450	+ * different on Linux...
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	451	+ */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	452	+ if ((OPENSSL_sparcv9cap_P[0]&SPARCV9_VIS3) &&
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	453	+ sigsetjmp(common_jmp, 1) == 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	454	+ OPENSSL_sparcv9cap_P[1] = (unsigned int)_sparcv9_rdcfr();
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	455	+ }
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	456	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	457	sigaction(SIGBUS, &bus_oact, NULL);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	458	sigaction(SIGILL, &ill_oact, NULL);
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	459
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	460	sigprocmask(SIG_SETMASK, &oset, NULL);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	461	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	462	+ if (sizeof(size_t) == 8)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	463	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_64BIT_STACK;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	464	+#ifdef __linux
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	465	+ else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	466	+ {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	467	+ int ret = syscall(340);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	468	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	469	+ if (ret >= 0 && ret & 1)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	470	+ OPENSSL_sparcv9cap_P[0] \|= SPARCV9_64BIT_STACK;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	471	+ }
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	472	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	473	}
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	474
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	475	#endif
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	476	Index: crypto/md5/Makefile
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	477	===================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	478	diff -ru openssl-1.0.1e/crypto/md5/Makefile openssl-1.0.1e/crypto/md5/Makefile
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	479	--- openssl-1.0.1e/crypto/md5/Makefile 2011-05-24 17:02:24.000000000 -0700
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	480	+++ openssl-1.0.1e/crypto/md5/Makefile 2011-07-27 10:48:17.817470000 -0700
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	481	@@ -52,6 +52,9 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	482	$(CC) $(CFLAGS) -E asm/md5-ia64.S \| \
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	483	$(PERL) -ne 's/;\s+/;\n/g; print;' > $@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	484
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	485	+md5-sparcv9.S: asm/md5-sparcv9.pl
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	486	+ $(PERL) asm/md5-sparcv9.pl $@ $(CFLAGS)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	487	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	488	files:
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	489	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	490
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	491	Index: crypto/md5/md5_locl.h
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	492	===================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	493	diff -ru openssl-1.0.1e/crypto/md5/md5_locl.h openssl-1.0.1e/crypto/md5/md5_locl.h
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	494	--- openssl-1.0.1e/crypto/md5/md5_locl.h 2011-05-24 17:02:24.000000000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	495	+++ openssl-1.0.1e/crypto/md5/md5_locl.h 2011-07-27 10:48:17.817470000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	496	@@ -71,6 +71,8 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	497	# define md5_block_data_order md5_block_asm_data_order
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	498	# elif defined(__ia64) \|\| defined(__ia64__) \|\| defined(_M_IA64)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	499	# define md5_block_data_order md5_block_asm_data_order
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	500	+# elif defined(__sparc) \|\| defined(__sparc__)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	501	+# define md5_block_data_order md5_block_asm_data_order
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	502	# endif
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	503	#endif
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	504
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	505	Index: crypto/sha/Makefile
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	506	===================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	507	diff -ru openssl-1.0.1e/crypto/sha/Makefile openssl-1.0.1e/crypto/sha/Makefile
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	508	--- openssl-1.0.1e/crypto/sha/Makefile 2011-05-24 17:02:24.000000000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	509	+++ openssl-1.0.1e/crypto/sha/Makefile 2011-07-27 10:48:17.817470000 -0700
2921 8da1e7689d13 PSARC/2013/383 OpenSSL FIPS 140-2 version update Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2717 diff changeset	510	@@ -68,9 +68,9 @@
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	511	sha1-x86_64.s: asm/sha1-x86_64.pl; $(PERL) asm/sha1-x86_64.pl $(PERLASM_SCHEME) > $@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	512	sha256-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	513	sha512-x86_64.s:asm/sha512-x86_64.pl; $(PERL) asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	514	-sha1-sparcv9.s: asm/sha1-sparcv9.pl; $(PERL) asm/sha1-sparcv9.pl $@ $(CFLAGS)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	515	-sha256-sparcv9.s:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	516	-sha512-sparcv9.s:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	517	+sha1-sparcv9.S: asm/sha1-sparcv9.pl; $(PERL) asm/sha1-sparcv9.pl $@ $(CFLAGS)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	518	+sha256-sparcv9.S:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	519	+sha512-sparcv9.S:asm/sha512-sparcv9.pl; $(PERL) asm/sha512-sparcv9.pl $@ $(CFLAGS)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	520
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	521	sha1-ppc.s: asm/sha1-ppc.pl; $(PERL) asm/sha1-ppc.pl $(PERLASM_SCHEME) $@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	522	sha256-ppc.s: asm/sha512-ppc.pl; $(PERL) asm/sha512-ppc.pl $(PERLASM_SCHEME) $@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	523	Index: crypto/sha/asm/sha1-sparcv9.pl
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	524	===================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	525	diff -ru openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	526	--- openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl 2011-05-24 17:02:24.000000000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	527	+++ openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl 2011-07-27 10:48:17.817470000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	528	@@ -5,6 +5,8 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	529	# project. The module is, however, dual licensed under OpenSSL and
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	530	# CRYPTOGAMS licenses depending on where you obtain it. For further
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	531	# details see http://www.openssl.org/~appro/cryptogams/.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	532	+#
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	533	+# Hardware SPARC T4 support by David S. Miller <[email protected]>.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	534	# ====================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	535
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	536	# Performance improvement is not really impressive on pre-T1 CPU: +8%
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	537	@@ -18,6 +20,11 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	538	# ensure scalability on UltraSPARC T1, or rather to avoid decay when
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	539	# amount of active threads exceeds the number of physical cores.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	540
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	541	+# SPARC T4 SHA1 hardware achieves 3.72 cycles per byte, which is 3.1x
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	542	+# faster than software. Multi-process benchmark saturates at 11x
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	543	+# single-process result on 8-core processor, or ~9GBps per 2.85GHz
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	544	+# socket.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	545	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	546	$bits=32;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	547	for (@ARGV) { $bits=64 if (/\-m64/ \|\| /\-xarch\=v9/); }
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	548	if ($bits==64) { $bias=2047; $frame=192; }
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	549	@@ -183,11 +190,93 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	550	.register %g3,#scratch
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	551	___
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	552	$code.=<<___;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	553	+#include "sparc_arch.h"
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	554	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	555	.section ".text",#alloc,#execinstr
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	556
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	557	+#ifdef __PIC__
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	558	+SPARC_PIC_THUNK(%g1)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	559	+#endif
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	560	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	561	.align 32
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	562	.globl sha1_block_data_order
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	563	sha1_block_data_order:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	564	+ SPARC_LOAD_ADDRESS_LEAF(OPENSSL_sparcv9cap_P,%g1,%g5)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	565	+ ld [%g1+4],%g1 ! OPENSSL_sparcv9cap_P[1]
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	566	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	567	+ andcc %g1, CFR_SHA1, %g0
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	568	+ be .Lsoftware
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	569	+ nop
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	570	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	571	+ ld [%o0 + 0x00], %f0 ! load context
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	572	+ ld [%o0 + 0x04], %f1
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	573	+ ld [%o0 + 0x08], %f2
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	574	+ andcc %o1, 0x7, %g0
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	575	+ ld [%o0 + 0x0c], %f3
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	576	+ bne,pn %icc, .Lhwunaligned
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	577	+ ld [%o0 + 0x10], %f4
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	578	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	579	+.Lhw_loop:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	580	+ ldd [%o1 + 0x00], %f8
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	581	+ ldd [%o1 + 0x08], %f10
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	582	+ ldd [%o1 + 0x10], %f12
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	583	+ ldd [%o1 + 0x18], %f14
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	584	+ ldd [%o1 + 0x20], %f16
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	585	+ ldd [%o1 + 0x28], %f18
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	586	+ ldd [%o1 + 0x30], %f20
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	587	+ subcc %o2, 1, %o2 ! done yet?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	588	+ ldd [%o1 + 0x38], %f22
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	589	+ add %o1, 0x40, %o1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	590	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	591	+ .word 0x81b02820 ! SHA1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	592	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	593	+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhw_loop
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	594	+ nop
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	595	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	596	+.Lhwfinish:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	597	+ st %f0, [%o0 + 0x00] ! store context
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	598	+ st %f1, [%o0 + 0x04]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	599	+ st %f2, [%o0 + 0x08]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	600	+ st %f3, [%o0 + 0x0c]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	601	+ retl
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	602	+ st %f4, [%o0 + 0x10]
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	603	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	604	+.align 8
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	605	+.Lhwunaligned:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	606	+ alignaddr %o1, %g0, %o1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	607	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	608	+ ldd [%o1 + 0x00], %f10
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	609	+.Lhwunaligned_loop:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	610	+ ldd [%o1 + 0x08], %f12
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	611	+ ldd [%o1 + 0x10], %f14
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	612	+ ldd [%o1 + 0x18], %f16
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	613	+ ldd [%o1 + 0x20], %f18
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	614	+ ldd [%o1 + 0x28], %f20
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	615	+ ldd [%o1 + 0x30], %f22
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	616	+ ldd [%o1 + 0x38], %f24
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	617	+ subcc %o2, 1, %o2 ! done yet?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	618	+ ldd [%o1 + 0x40], %f26
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	619	+ add %o1, 0x40, %o1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	620	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	621	+ faligndata %f10, %f12, %f8
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	622	+ faligndata %f12, %f14, %f10
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	623	+ faligndata %f14, %f16, %f12
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	624	+ faligndata %f16, %f18, %f14
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	625	+ faligndata %f18, %f20, %f16
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	626	+ faligndata %f20, %f22, %f18
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	627	+ faligndata %f22, %f24, %f20
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	628	+ faligndata %f24, %f26, %f22
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	629	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	630	+ .word 0x81b02820 ! SHA1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	631	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	632	+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwunaligned_loop
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	633	+ for %f26, %f26, %f10 ! %f10=%f26
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	634	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	635	+ ba .Lhwfinish
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	636	+ nop
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	637	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	638	+.align 16
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	639	+.Lsoftware:
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	640	save %sp,-$frame,%sp
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	641	sllx $len,6,$len
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	642	add $inp,$len,$len
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	643	@@ -279,6 +368,62 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	644	.align 4
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	645	___
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	646
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	647	-$code =~ s/\`([^\`]*)\`/eval $1/gem;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	648	-print $code;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	649	+# Purpose of these subroutines is to explicitly encode VIS instructions,
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	650	+# so that one can compile the module without having to specify VIS
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	651	+# extentions on compiler command line, e.g. -xarch=v9 vs. -xarch=v9a.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	652	+# Idea is to reserve for option to produce "universal" binary and let
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	653	+# programmer detect if current CPU is VIS capable at run-time.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	654	+sub unvis {
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	655	+my ($mnemonic,$rs1,$rs2,$rd)=@_;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	656	+my $ref,$opf;
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	657	+my %visopf = ( "faligndata" => 0x048,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	658	+ "for" => 0x07c );
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	659	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	660	+ $ref = "$mnemonic\t$rs1,$rs2,$rd";
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	661	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	662	+ if ($opf=$visopf{$mnemonic}) {
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	663	+ foreach ($rs1,$rs2,$rd) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	664	+ return $ref if (!/%f([0-9]{1,2})/);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	665	+ $_=$1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	666	+ if ($1>=32) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	667	+ return $ref if ($1&1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	668	+ # re-encode for upper double register addressing
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	669	+ $_=($1\|$1>>5)&31;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	670	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	671	+ }
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	672	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	673	+ return sprintf ".word\t0x%08x !%s",
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	674	+ 0x81b00000\|$rd<<25\|$rs1<<14\|$opf<<5\|$rs2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	675	+ $ref;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	676	+ } else {
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	677	+ return $ref;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	678	+ }
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	679	+}
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	680	+sub unalignaddr {
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	681	+my ($mnemonic,$rs1,$rs2,$rd)=@_;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	682	+my %bias = ( "g" => 0, "o" => 8, "l" => 16, "i" => 24 );
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	683	+my $ref="$mnemonic\t$rs1,$rs2,$rd";
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	684	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	685	+ foreach ($rs1,$rs2,$rd) {
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	686	+ if (/%([goli])([0-7])/) { $_=$bias{$1}+$2; }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	687	+ else { return $ref; }
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	688	+ }
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	689	+ return sprintf ".word\t0x%08x !%s",
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	690	+ 0x81b00300\|$rd<<25\|$rs1<<14\|$rs2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	691	+ $ref;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	692	+}
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	693	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	694	+foreach (split("\n",$code)) {
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	695	+ s/\`([^\`]*)\`/eval $1/ge;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	696	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	697	+ s/\b(f[^\s])\s+(%f[0-9]{1,2}),\s(%f[0-9]{1,2}),\s*(%f[0-9]{1,2})/
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	698	+ &unvis($1,$2,$3,$4)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	699	+ /ge;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	700	+ s/\b(alignaddr)\s+(%[goli][0-7]),\s(%[goli][0-7]),\s(%[goli][0-7])/
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	701	+ &unalignaddr($1,$2,$3,$4)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	702	+ /ge;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	703	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	704	+ print $_,"\n";
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	705	+}
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	706	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	707	close STDOUT;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	708
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	709	Index: crypto/sha/asm/sha512-sparcv9.pl
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	710	===================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	711	diff -ru openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	712	--- openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl 2011-05-24 17:02:24.000000000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	713	+++ openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl 2011-07-27 10:48:17.817470000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	714	@@ -5,6 +5,8 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	715	# project. The module is, however, dual licensed under OpenSSL and
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	716	# CRYPTOGAMS licenses depending on where you obtain it. For further
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	717	# details see http://www.openssl.org/~appro/cryptogams/.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	718	+#
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	719	+# Hardware SPARC T4 support by David S. Miller <[email protected]>.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	720	# ====================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	721
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	722	# SHA256 performance improvement over compiler generated code varies
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	723	@@ -41,6 +43,12 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	724	# loads are always slower than one 64-bit load. Once again this
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	725	# is unlike pre-T1 UltraSPARC, where, if scheduled appropriately,
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	726	# 2x32-bit loads can be as fast as 1x64-bit ones.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	727	+#
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	728	+# SPARC T4 SHA256/512 hardware achieves 3.17/2.01 cycles per byte,
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	729	+# which is 9.3x/11.1x faster than software. Multi-process benchmark
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	730	+# saturates at 11.5x single-process result on 8-core processor, or
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	731	+# ~11/16GBps per 2.85GHz socket.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	732	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	733
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	734	$bits=32;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	735	for (@ARGV) { $bits=64 if (/\-m64/ \|\| /\-xarch\=v9/); }
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	736	@@ -386,6 +394,8 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	737	.register %g3,#scratch
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	738	___
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	739	$code.=<<___;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	740	+#include "sparc_arch.h"
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	741	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	742	.section ".text",#alloc,#execinstr
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	743
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	744	.align 64
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	745	@@ -457,8 +467,196 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	746	}
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	747	$code.=<<___;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	748	.size K${label},.-K${label}
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	749	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	750	+#ifdef __PIC__
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	751	+SPARC_PIC_THUNK(%g1)
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	752	+#endif
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	753	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	754	.globl sha${label}_block_data_order
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	755	+.align 32
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	756	sha${label}_block_data_order:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	757	+ SPARC_LOAD_ADDRESS_LEAF(OPENSSL_sparcv9cap_P,%g1,%g5)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	758	+ ld [%g1+4],%g1 ! OPENSSL_sparcv9cap_P[1]
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	759	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	760	+ andcc %g1, CFR_SHA${label}, %g0
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	761	+ be .Lsoftware
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	762	+ nop
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	763	+___
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	764	+$code.=<<___ if ($SZ==8); # SHA512
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	765	+ ldd [%o0 + 0x00], %f0 ! load context
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	766	+ ldd [%o0 + 0x08], %f2
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	767	+ ldd [%o0 + 0x10], %f4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	768	+ ldd [%o0 + 0x18], %f6
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	769	+ ldd [%o0 + 0x20], %f8
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	770	+ ldd [%o0 + 0x28], %f10
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	771	+ andcc %o1, 0x7, %g0
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	772	+ ldd [%o0 + 0x30], %f12
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	773	+ bne,pn %icc, .Lhwunaligned
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	774	+ ldd [%o0 + 0x38], %f14
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	775	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	776	+.Lhwaligned_loop:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	777	+ ldd [%o1 + 0x00], %f16
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	778	+ ldd [%o1 + 0x08], %f18
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	779	+ ldd [%o1 + 0x10], %f20
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	780	+ ldd [%o1 + 0x18], %f22
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	781	+ ldd [%o1 + 0x20], %f24
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	782	+ ldd [%o1 + 0x28], %f26
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	783	+ ldd [%o1 + 0x30], %f28
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	784	+ ldd [%o1 + 0x38], %f30
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	785	+ ldd [%o1 + 0x40], %f32
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	786	+ ldd [%o1 + 0x48], %f34
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	787	+ ldd [%o1 + 0x50], %f36
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	788	+ ldd [%o1 + 0x58], %f38
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	789	+ ldd [%o1 + 0x60], %f40
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	790	+ ldd [%o1 + 0x68], %f42
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	791	+ ldd [%o1 + 0x70], %f44
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	792	+ subcc %o2, 1, %o2 ! done yet?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	793	+ ldd [%o1 + 0x78], %f46
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	794	+ add %o1, 0x80, %o1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	795	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	796	+ .word 0x81b02860 ! SHA512
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	797	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	798	+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwaligned_loop
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	799	+ nop
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	800	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	801	+.Lhwfinish:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	802	+ std %f0, [%o0 + 0x00] ! store context
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	803	+ std %f2, [%o0 + 0x08]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	804	+ std %f4, [%o0 + 0x10]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	805	+ std %f6, [%o0 + 0x18]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	806	+ std %f8, [%o0 + 0x20]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	807	+ std %f10, [%o0 + 0x28]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	808	+ std %f12, [%o0 + 0x30]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	809	+ retl
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	810	+ std %f14, [%o0 + 0x38]
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	811	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	812	+.align 16
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	813	+.Lhwunaligned:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	814	+ alignaddr %o1, %g0, %o1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	815	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	816	+ ldd [%o1 + 0x00], %f18
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	817	+.Lhwunaligned_loop:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	818	+ ldd [%o1 + 0x08], %f20
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	819	+ ldd [%o1 + 0x10], %f22
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	820	+ ldd [%o1 + 0x18], %f24
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	821	+ ldd [%o1 + 0x20], %f26
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	822	+ ldd [%o1 + 0x28], %f28
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	823	+ ldd [%o1 + 0x30], %f30
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	824	+ ldd [%o1 + 0x38], %f32
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	825	+ ldd [%o1 + 0x40], %f34
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	826	+ ldd [%o1 + 0x48], %f36
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	827	+ ldd [%o1 + 0x50], %f38
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	828	+ ldd [%o1 + 0x58], %f40
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	829	+ ldd [%o1 + 0x60], %f42
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	830	+ ldd [%o1 + 0x68], %f44
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	831	+ ldd [%o1 + 0x70], %f46
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	832	+ ldd [%o1 + 0x78], %f48
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	833	+ subcc %o2, 1, %o2 ! done yet?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	834	+ ldd [%o1 + 0x80], %f50
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	835	+ add %o1, 0x80, %o1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	836	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	837	+ faligndata %f18, %f20, %f16
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	838	+ faligndata %f20, %f22, %f18
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	839	+ faligndata %f22, %f24, %f20
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	840	+ faligndata %f24, %f26, %f22
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	841	+ faligndata %f26, %f28, %f24
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	842	+ faligndata %f28, %f30, %f26
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	843	+ faligndata %f30, %f32, %f28
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	844	+ faligndata %f32, %f34, %f30
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	845	+ faligndata %f34, %f36, %f32
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	846	+ faligndata %f36, %f38, %f34
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	847	+ faligndata %f38, %f40, %f36
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	848	+ faligndata %f40, %f42, %f38
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	849	+ faligndata %f42, %f44, %f40
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	850	+ faligndata %f44, %f46, %f42
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	851	+ faligndata %f46, %f48, %f44
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	852	+ faligndata %f48, %f50, %f46
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	853	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	854	+ .word 0x81b02860 ! SHA512
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	855	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	856	+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwunaligned_loop
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	857	+ for %f50, %f50, %f18 ! %f18=%f50
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	858	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	859	+ ba .Lhwfinish
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	860	+ nop
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	861	+___
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	862	+$code.=<<___ if ($SZ==4); # SHA256
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	863	+ ld [%o0 + 0x00], %f0
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	864	+ ld [%o0 + 0x04], %f1
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	865	+ ld [%o0 + 0x08], %f2
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	866	+ ld [%o0 + 0x0c], %f3
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	867	+ ld [%o0 + 0x10], %f4
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	868	+ ld [%o0 + 0x14], %f5
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	869	+ andcc %o1, 0x7, %g0
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	870	+ ld [%o0 + 0x18], %f6
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	871	+ bne,pn %icc, .Lhwunaligned
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	872	+ ld [%o0 + 0x1c], %f7
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	873	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	874	+.Lhwloop:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	875	+ ldd [%o1 + 0x00], %f8
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	876	+ ldd [%o1 + 0x08], %f10
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	877	+ ldd [%o1 + 0x10], %f12
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	878	+ ldd [%o1 + 0x18], %f14
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	879	+ ldd [%o1 + 0x20], %f16
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	880	+ ldd [%o1 + 0x28], %f18
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	881	+ ldd [%o1 + 0x30], %f20
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	882	+ subcc %o2, 1, %o2 ! done yet?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	883	+ ldd [%o1 + 0x38], %f22
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	884	+ add %o1, 0x40, %o1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	885	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	886	+ .word 0x81b02840 ! SHA256
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	887	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	888	+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwloop
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	889	+ nop
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	890	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	891	+.Lhwfinish:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	892	+ st %f0, [%o0 + 0x00] ! store context
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	893	+ st %f1, [%o0 + 0x04]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	894	+ st %f2, [%o0 + 0x08]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	895	+ st %f3, [%o0 + 0x0c]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	896	+ st %f4, [%o0 + 0x10]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	897	+ st %f5, [%o0 + 0x14]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	898	+ st %f6, [%o0 + 0x18]
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	899	+ retl
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	900	+ st %f7, [%o0 + 0x1c]
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	901	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	902	+.align 8
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	903	+.Lhwunaligned:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	904	+ alignaddr %o1, %g0, %o1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	905	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	906	+ ldd [%o1 + 0x00], %f10
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	907	+.Lhwunaligned_loop:
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	908	+ ldd [%o1 + 0x08], %f12
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	909	+ ldd [%o1 + 0x10], %f14
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	910	+ ldd [%o1 + 0x18], %f16
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	911	+ ldd [%o1 + 0x20], %f18
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	912	+ ldd [%o1 + 0x28], %f20
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	913	+ ldd [%o1 + 0x30], %f22
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	914	+ ldd [%o1 + 0x38], %f24
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	915	+ subcc %o2, 1, %o2 ! done yet?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	916	+ ldd [%o1 + 0x40], %f26
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	917	+ add %o1, 0x40, %o1
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	918	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	919	+ faligndata %f10, %f12, %f8
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	920	+ faligndata %f12, %f14, %f10
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	921	+ faligndata %f14, %f16, %f12
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	922	+ faligndata %f16, %f18, %f14
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	923	+ faligndata %f18, %f20, %f16
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	924	+ faligndata %f20, %f22, %f18
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	925	+ faligndata %f22, %f24, %f20
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	926	+ faligndata %f24, %f26, %f22
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	927	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	928	+ .word 0x81b02840 ! SHA256
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	929	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	930	+ bne,pt `$bits==64?"%xcc":"%icc"`, .Lhwunaligned_loop
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	931	+ for %f26, %f26, %f10 ! %f10=%f26
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	932	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	933	+ ba .Lhwfinish
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	934	+ nop
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	935	+___
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	936	+$code.=<<___;
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	937	+.align 16
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	938	+.Lsoftware:
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	939	save %sp,`-$frame-$locals`,%sp
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	940	and $inp,`$align-1`,$tmp31
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	941	sllx $len,`log(16*$SZ)/log(2)`,$len
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	942	@@ -589,6 +787,62 @@
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	943	.align 4
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	944	___
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	945
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	946	-$code =~ s/\`([^\`]*)\`/eval $1/gem;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	947	-print $code;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	948	+# Purpose of these subroutines is to explicitly encode VIS instructions,
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	949	+# so that one can compile the module without having to specify VIS
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	950	+# extentions on compiler command line, e.g. -xarch=v9 vs. -xarch=v9a.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	951	+# Idea is to reserve for option to produce "universal" binary and let
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	952	+# programmer detect if current CPU is VIS capable at run-time.
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	953	+sub unvis {
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	954	+my ($mnemonic,$rs1,$rs2,$rd)=@_;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	955	+my $ref,$opf;
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	956	+my %visopf = ( "faligndata" => 0x048,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	957	+ "for" => 0x07c );
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	958	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	959	+ $ref = "$mnemonic\t$rs1,$rs2,$rd";
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	960	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	961	+ if ($opf=$visopf{$mnemonic}) {
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	962	+ foreach ($rs1,$rs2,$rd) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	963	+ return $ref if (!/%f([0-9]{1,2})/);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	964	+ $_=$1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	965	+ if ($1>=32) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	966	+ return $ref if ($1&1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	967	+ # re-encode for upper double register addressing
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	968	+ $_=($1\|$1>>5)&31;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	969	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	970	+ }
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	971	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	972	+ return sprintf ".word\t0x%08x !%s",
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	973	+ 0x81b00000\|$rd<<25\|$rs1<<14\|$opf<<5\|$rs2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	974	+ $ref;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	975	+ } else {
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	976	+ return $ref;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	977	+ }
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	978	+}
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	979	+sub unalignaddr {
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	980	+my ($mnemonic,$rs1,$rs2,$rd)=@_;
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	981	+my %bias = ( "g" => 0, "o" => 8, "l" => 16, "i" => 24 );
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	982	+my $ref="$mnemonic\t$rs1,$rs2,$rd";
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	983	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	984	+ foreach ($rs1,$rs2,$rd) {
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	985	+ if (/%([goli])([0-7])/) { $_=$bias{$1}+$2; }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	986	+ else { return $ref; }
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	987	+ }
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	988	+ return sprintf ".word\t0x%08x !%s",
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	989	+ 0x81b00300\|$rd<<25\|$rs1<<14\|$rs2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	990	+ $ref;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	991	+}
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	992	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	993	+foreach (split("\n",$code)) {
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	994	+ s/\`([^\`]*)\`/eval $1/ge;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	995	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	996	+ s/\b(f[^\s])\s+(%f[0-9]{1,2}),\s(%f[0-9]{1,2}),\s*(%f[0-9]{1,2})/
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	997	+ &unvis($1,$2,$3,$4)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	998	+ /ge;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	999	+ s/\b(alignaddr)\s+(%[goli][0-7]),\s(%[goli][0-7]),\s(%[goli][0-7])/
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1000	+ &unalignaddr($1,$2,$3,$4)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1001	+ /ge;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1002	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1003	+ print $_,"\n";
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1004	+}
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1005	+
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1006	close STDOUT;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1007	Index: crypto/des/Makefile
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1008	===================================================================
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1009	diff -ru openssl-1.0.1e/crypto/des/Makefile.orig openssl-1.0.1e/crypto/des/Makefile
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1010	--- a/crypto/des/Makefile
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1011	+++ b/crypto/des/Makefile
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1012	@@ -61,6 +61,8 @@ des: des.o cbc3_enc.o lib
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1013
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1014	des_enc-sparc.S: asm/des_enc.m4
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1015	m4 -B 8192 asm/des_enc.m4 > des_enc-sparc.S
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1016	+dest4-sparcv9.s: asm/dest4-sparcv9.pl
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1017	+ $(PERL) asm/dest4-sparcv9.pl $(CFLAGS) > $@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1018
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1019	des-586.s: asm/des-586.pl ../perlasm/x86asm.pl ../perlasm/cbc.pl
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1020	$(PERL) asm/des-586.pl $(PERLASM_SCHEME) $(CFLAGS) > $@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1021	Index: crypto/evp/e_des.c
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1022	===================================================================
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1023	diff -ru openssl-1.0.1e/crypto/evp/e_des.c.orig openssl-1.0.1e/crypto/evp/e_des.c
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1024	--- a/crypto/evp/e_des.c
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1025	+++ b/crypto/evp/e_des.c
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1026	@@ -65,6 +65,30 @@
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1027	# include <openssl/des.h>
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1028	# include <openssl/rand.h>
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1029
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1030	+typedef struct {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1031	+ union { double align; DES_key_schedule ks; } ks;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1032	+ union {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1033	+ void (cbc)(const void ,void ,size_t,const void ,void *);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1034	+ } stream;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1035	+} EVP_DES_KEY;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1036	+
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1037	+#if defined(AES_ASM) && (defined(__sparc) \|\| defined(__sparc__))
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1038	+/* ---------^^^ this is not a typo, just a way to detect that
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1039	+ * assembler support was in general requested...
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1040	+ */
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1041	+#include "sparc_arch.h"
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1042	+
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1043	+extern unsigned int OPENSSL_sparcv9cap_P[];
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1044	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1045	+#define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1046	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1047	+void des_t4_key_expand(const void key, DES_key_schedule ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1048	+void des_t4_cbc_encrypt(const void inp,void out,size_t len,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1049	+ DES_key_schedule *ks,unsigned char iv[8]);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1050	+void des_t4_cbc_decrypt(const void inp,void out,size_t len,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1051	+ DES_key_schedule *ks,unsigned char iv[8]);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1052	+#endif
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1053	+
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1054	static int des_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1055	const unsigned char *iv, int enc);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1056	static int des_ctrl(EVP_CIPHER_CTX c, int type, int arg, void ptr);
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1057	@@ -102,6 +126,12 @@ static int des_ofb_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1058	static int des_cbc_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1059	const unsigned char *in, size_t inl)
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1060	{
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1061	+ EVP_DES_KEY dat = (EVP_DES_KEY )ctx->cipher_data;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1062	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1063	+ if (dat->stream.cbc) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1064	+ (*dat->stream.cbc)(in,out,inl,&dat->ks.ks,ctx->iv);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1065	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1066	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1067	while (inl >= EVP_MAXCHUNK) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1068	DES_ncbc_encrypt(in, out, (long)EVP_MAXCHUNK, ctx->cipher_data,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1069	(DES_cblock *)ctx->iv, ctx->encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1070	@@ -179,16 +209,16 @@
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1071	return 1;
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1072	}
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1073
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1074	-BLOCK_CIPHER_defs(des, DES_key_schedule, NID_des, 8, 8, 8, 64,
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1075	+BLOCK_CIPHER_defs(des, EVP_DES_KEY, NID_des, 8, 8, 8, 64,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1076	EVP_CIPH_RAND_KEY, des_init_key, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1077	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1078
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1079
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1080	-BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 1,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1081	+BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 1,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1082	EVP_CIPH_RAND_KEY, des_init_key, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1083	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1084
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1085	-BLOCK_CIPHER_def_cfb(des, DES_key_schedule, NID_des, 8, 8, 8,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1086	+BLOCK_CIPHER_def_cfb(des, EVP_DES_KEY, NID_des, 8, 8, 8,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1087	EVP_CIPH_RAND_KEY, des_init_key, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1088	EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1089
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1090	@@ -196,8 +226,23 @@ static int des_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1091	const unsigned char *iv, int enc)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1092	{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1093	DES_cblock deskey = (DES_cblock )key;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1094	+ EVP_DES_KEY dat = (EVP_DES_KEY )ctx->cipher_data;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1095	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1096	+ dat->stream.cbc = NULL;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1097	+#if defined(SPARC_DES_CAPABLE)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1098	+ if (SPARC_DES_CAPABLE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1099	+ int mode = ctx->cipher->flags & EVP_CIPH_MODE;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1100	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1101	+ if (mode == EVP_CIPH_CBC_MODE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1102	+ des_t4_key_expand(key,&dat->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1103	+ dat->stream.cbc = enc ? des_t4_cbc_encrypt :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1104	+ des_t4_cbc_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1105	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1106	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1107	+ }
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1108	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1109	# ifdef EVP_CHECK_DES_KEY
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1110	- if (DES_set_key_checked(deskey, ctx->cipher_data) != 0)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1111	+ if (DES_set_key_checked(deskey, dat->ks.ks) != 0)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1112	return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1113	# else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1114	DES_set_key_unchecked(deskey, ctx->cipher_data);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1115	Index: crypto/evp/e_des3.c
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1116	===================================================================
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1117	diff -ru openssl-1.0.1e/crypto/evp/e_des3.c.orig openssl-1.0.1e/crypto/evp/e_des3.c
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1118	--- a/crypto/evp/e_des3.c
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1119	+++ b/crypto/evp/e_des3.c
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1120	@@ -65,6 +65,32 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1121	# include <openssl/des.h>
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1122	# include <openssl/rand.h>
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1123
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1124	+typedef struct {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1125	+ union { double align; DES_key_schedule ks[3]; } ks;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1126	+ union {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1127	+ void (cbc)(const void ,void ,size_t,const void ,void *);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1128	+ } stream;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1129	+} DES_EDE_KEY;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1130	+#define ks1 ks.ks[0]
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1131	+#define ks2 ks.ks[1]
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1132	+#define ks3 ks.ks[2]
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1133	+
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1134	+#if defined(AES_ASM) && (defined(__sparc) \|\| defined(__sparc__))
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1135	+/* ---------^^^ this is not a typo, just a way to detect that
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1136	+ * assembler support was in general requested... */
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1137	+#include "sparc_arch.h"
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1138	+
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1139	+extern unsigned int OPENSSL_sparcv9cap_P[];
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1140	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1141	+#define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1142	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1143	+void des_t4_key_expand(const void key, DES_key_schedule ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1144	+void des_t4_ede3_cbc_encrypt(const void inp,void out,size_t len,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1145	+ DES_key_schedule *ks,unsigned char iv[8]);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1146	+void des_t4_ede3_cbc_decrypt(const void inp,void out,size_t len,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1147	+ DES_key_schedule *ks,unsigned char iv[8]);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1148	+#endif
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1149	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1150	# ifndef OPENSSL_FIPS
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1151
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1152	static int des_ede_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1153	@@ -75,12 +100,6 @@ static int des_ede3_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1154
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1155	static int des3_ctrl(EVP_CIPHER_CTX c, int type, int arg, void ptr);
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1156
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1157	-typedef struct {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1158	- DES_key_schedule ks1; /* key schedule */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1159	- DES_key_schedule ks2; /* key schedule (for ede) */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1160	- DES_key_schedule ks3; /* key schedule (for ede3) */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1161	-} DES_EDE_KEY;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1162	-
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1163	# define data(ctx) ((DES_EDE_KEY *)(ctx)->cipher_data)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1164
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1165	/*
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1166	@@ -123,6 +117,7 @@ static int des_ede_ofb_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1167	static int des_ede_cbc_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1168	const unsigned char *in, size_t inl)
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1169	{
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1170	+ DES_EDE_KEY *dat = data(ctx);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1171	# ifdef KSSL_DEBUG
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1172	{
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1173	int i;
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1174	@@ -134,11 +155,15 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1175	fprintf(stderr, "\n");
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1176	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1177	# endif /* KSSL_DEBUG */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1178	+ if (dat->stream.cbc) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1179	+ (*dat->stream.cbc)(in,out,inl,&dat->ks,ctx->iv);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1180	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1181	+ }
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1182	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1183	while (inl >= EVP_MAXCHUNK) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1184	DES_ede3_cbc_encrypt(in, out, (long)EVP_MAXCHUNK,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1185	- &data(ctx)->ks1, &data(ctx)->ks2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1186	- &data(ctx)->ks3, (DES_cblock *)ctx->iv,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1187	- ctx->encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1188	+ &dat->ks1, &dat->ks2, &dat->ks3,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1189	+ (DES_cblock *)ctx->iv, ctx->encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1190	inl -= EVP_MAXCHUNK;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1191	in += EVP_MAXCHUNK;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1192	out += EVP_MAXCHUNK;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1193	@@ -145,9 +170,8 @@ static int des_ede_cbc_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1194	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1195	if (inl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1196	DES_ede3_cbc_encrypt(in, out, (long)inl,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1197	- &data(ctx)->ks1, &data(ctx)->ks2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1198	- &data(ctx)->ks3, (DES_cblock *)ctx->iv,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1199	- ctx->encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1200	+ &dat->ks1, &dat->ks2, &dat->ks3,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1201	+ (DES_cblock *)ctx->iv, ctx->encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1202	return 1;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1203	}
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1204
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1205	@@ -215,39 +239,58 @@ static int des_ede3_cfb8_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1206	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1207
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1208	BLOCK_CIPHER_defs(des_ede, DES_EDE_KEY, NID_des_ede, 8, 16, 8, 64,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1209	- EVP_CIPH_RAND_KEY, des_ede_init_key, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1210	- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des3_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1211	+ EVP_CIPH_RAND_KEY\|EVP_CIPH_FLAG_DEFAULT_ASN1,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1212	+ des_ede_init_key, NULL, NULL, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1213	+ des3_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1214	# define des_ede3_cfb64_cipher des_ede_cfb64_cipher
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1215	# define des_ede3_ofb_cipher des_ede_ofb_cipher
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1216	# define des_ede3_cbc_cipher des_ede_cbc_cipher
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1217	# define des_ede3_ecb_cipher des_ede_ecb_cipher
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1218	BLOCK_CIPHER_defs(des_ede3, DES_EDE_KEY, NID_des_ede3, 8, 24, 8, 64,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1219	- EVP_CIPH_RAND_KEY, des_ede3_init_key, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1220	- EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, des3_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1221	+ EVP_CIPH_RAND_KEY\|EVP_CIPH_FLAG_FIPS\|EVP_CIPH_FLAG_DEFAULT_ASN1,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1222	+ des_ede3_init_key, NULL, NULL, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1223	+ des3_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1224
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1225	BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 1,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1226	- EVP_CIPH_RAND_KEY, des_ede3_init_key, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1227	- EVP_CIPHER_set_asn1_iv,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1228	- EVP_CIPHER_get_asn1_iv, des3_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1229	+ EVP_CIPH_RAND_KEY\|EVP_CIPH_FLAG_FIPS\|EVP_CIPH_FLAG_DEFAULT_ASN1,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1230	+ des_ede3_init_key, NULL, NULL, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1231	+ des3_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1232
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1233	BLOCK_CIPHER_def_cfb(des_ede3, DES_EDE_KEY, NID_des_ede3, 24, 8, 8,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1234	- EVP_CIPH_RAND_KEY, des_ede3_init_key, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1235	- EVP_CIPHER_set_asn1_iv,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1236	- EVP_CIPHER_get_asn1_iv, des3_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1237	+ EVP_CIPH_RAND_KEY\|EVP_CIPH_FLAG_FIPS\|EVP_CIPH_FLAG_DEFAULT_ASN1,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1238	+ des_ede3_init_key, NULL, NULL, NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1239	+ des3_ctrl)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1240
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1241	static int des_ede_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1242	const unsigned char *iv, int enc)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1243	{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1244	DES_cblock deskey = (DES_cblock )key;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1245	+ DES_EDE_KEY *dat = data(ctx);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1246	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1247	+ dat->stream.cbc = NULL;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1248	+#if defined(SPARC_DES_CAPABLE)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1249	+ if (SPARC_DES_CAPABLE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1250	+ int mode = ctx->cipher->flags & EVP_CIPH_MODE;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1251	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1252	+ if (mode == EVP_CIPH_CBC_MODE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1253	+ des_t4_key_expand(&deskey[0],&dat->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1254	+ des_t4_key_expand(&deskey[1],&dat->ks2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1255	+ memcpy(&dat->ks3,&dat->ks1,sizeof(dat->ks1));
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1256	+ dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1257	+ des_t4_ede3_cbc_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1258	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1259	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1260	+ }
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1261	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1262	# ifdef EVP_CHECK_DES_KEY
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1263	- if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1264	- ! !DES_set_key_checked(&deskey[1], &data(ctx)->ks2))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1265	+ if (DES_set_key_checked(&deskey[0],&dat->ks1)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1266	+ !! DES_set_key_checked(&deskey[1],&dat->ks2))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1267	return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1268	# else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1269	- DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1270	- DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1271	+ DES_set_key_unchecked(&deskey[0],&dat->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1272	+ DES_set_key_unchecked(&deskey[1],&dat->ks2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1273	# endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1274	- memcpy(&data(ctx)->ks3, &data(ctx)->ks1, sizeof(data(ctx)->ks1));
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1275	+ memcpy(&dat->ks3,&dat->ks1, sizeof(dat->ks1));
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1276	return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1277	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1278
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1279	@@ -255,6 +298,8 @@ static int des_ede3_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1280	const unsigned char *iv, int enc)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1281	{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1282	DES_cblock deskey = (DES_cblock )key;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1283	+ DES_EDE_KEY *dat = data(ctx);
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1284	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1285	# ifdef KSSL_DEBUG
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1286	{
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1287	int i;
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1288	@@ -272,15 +317,30 @@ static int des_ede3_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1289	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1290	# endif /* KSSL_DEBUG */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1291
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1292	+ dat->stream.cbc = NULL;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1293	+#if defined(SPARC_DES_CAPABLE)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1294	+ if (SPARC_DES_CAPABLE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1295	+ int mode = ctx->cipher->flags & EVP_CIPH_MODE;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1296	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1297	+ if (mode == EVP_CIPH_CBC_MODE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1298	+ des_t4_key_expand(&deskey[0],&dat->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1299	+ des_t4_key_expand(&deskey[1],&dat->ks2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1300	+ des_t4_key_expand(&deskey[2],&dat->ks3);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1301	+ dat->stream.cbc = enc ? des_t4_ede3_cbc_encrypt :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1302	+ des_t4_ede3_cbc_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1303	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1304	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1305	+ }
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1306	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1307	# ifdef EVP_CHECK_DES_KEY
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1308	- if (DES_set_key_checked(&deskey[0], &data(ctx)->ks1)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1309	- \|\| DES_set_key_checked(&deskey[1], &data(ctx)->ks2)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1310	- \|\| DES_set_key_checked(&deskey[2], &data(ctx)->ks3))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1311	+ if (DES_set_key_checked(&deskey[0],&dat->ks1)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1312	+ \|\| DES_set_key_checked(&deskey[1],&dat->ks2)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1313	+ \|\| DES_set_key_checked(&deskey[2],&dat->ks3))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1314	return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1315	# else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1316	- DES_set_key_unchecked(&deskey[0], &data(ctx)->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1317	- DES_set_key_unchecked(&deskey[1], &data(ctx)->ks2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1318	- DES_set_key_unchecked(&deskey[2], &data(ctx)->ks3);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1319	+ DES_set_key_unchecked(&deskey[0],&dat->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1320	+ DES_set_key_unchecked(&deskey[1],&dat->ks2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1321	+ DES_set_key_unchecked(&deskey[2],&dat->ks3);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1322	# endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1323	return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1324	}
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1325	Index: openssl/crypto/bn/Makefile
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1326	===================================================================
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1327	diff -ru openssl-1.0.1e/crypto/bn/Makefile openssl-1.0.1e/crypto/bn/Makefile.new
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1328	--- openssl-1.0.1e/crypto/bn/Makefile 2011-05-24 17:02:24.000000000 -0700
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1329	+++ openssl-1.0.1e/crypto/bn/Makefile 2011-07-27 10:48:17.817470000 -0700
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1330	@@ -77,6 +77,12 @@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1331	$(PERL) asm/sparcv9a-mont.pl $(CFLAGS) > $@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1332	sparcv9-mont.s: asm/sparcv9-mont.pl
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1333	$(PERL) asm/sparcv9-mont.pl $(CFLAGS) > $@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1334	+vis3-mont.s: asm/vis3-mont.pl
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1335	+ $(PERL) asm/vis3-mont.pl $(CFLAGS) > $@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1336	+sparct4-mont.S: asm/sparct4-mont.pl
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1337	+ $(PERL) asm/sparct4-mont.pl $(CFLAGS) > $@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1338	+sparcv9-gf2m.S: asm/sparcv9-gf2m.pl
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1339	+ $(PERL) asm/sparcv9-gf2m.pl $(CFLAGS) > $@
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1340
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1341	bn-mips3.o: asm/mips3.s
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1342	@if [ "$(CC)" = "gcc" ]; then \
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1343	Index: openssl/crypto/bn/bn_exp.c
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1344	===================================================================
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1345	diff -ru openssl-1.0.1e/crypto/bn/bn_exp.c openssl-1.0.1e/crypto/bn/bn_exp.c.new
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1346	--- bn_exp.c 2011/10/29 19:25:13 1.38
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1347	+++ bn_exp.c 2012/11/17 10:34:11 1.39
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1348	@@ -122,8 +122,15 @@
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1349	# ifndef alloca
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1350	# define alloca(s) __builtin_alloca((s))
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1351	# endif
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1352	+#else
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1353	+#include <alloca.h>
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1354	#endif
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1355
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1356	+#if defined(OPENSSL_BN_ASM_MONT) && defined(__sparc)
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1357	+# include "sparc_arch.h"
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1358	+extern unsigned int OPENSSL_sparcv9cap_P[];
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1359	+#endif
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1360	+
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1361	/* maximum precomputation table size for variable sliding windows */
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1362	#define TABLE_SIZE 32
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1363
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1364	@@ -464,8 +471,16 @@ int BN_mod_exp_mont(BIGNUM rr, const BIGNUM a, const BIGNUM *p,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1365	wstart = bits - 1; /* The top bit of the window */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1366	wend = 0; /* The bottom bit of the window */
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1367
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1368	+#if 1 /* by Shay Gueron's suggestion */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1369	+ j = mont->N.top; /* borrow j */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1370	+ if (bn_wexpand(r,j) == NULL) goto err;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1371	+ r->d[0] = (0-m->d[0])&BN_MASK2; /* 2^(topBN_BITS2) - m /
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1372	+ for(i=1;i<j;i++) r->d[i] = (~m->d[i])&BN_MASK2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1373	+ r->top = j;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1374	+#else
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1375	if (!BN_to_montgomery(r, BN_value_one(), mont, ctx))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1376	goto err;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1377	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1378	for (;;) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1379	if (BN_is_bit_set(p, wstart) == 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1380	if (!start) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1381	@@ -515,6 +530,17 @@ int BN_mod_exp_mont(BIGNUM rr, const BIGNUM a, const BIGNUM *p,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1382	if (wstart < 0)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1383	break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1384	}
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1385	+#if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) \|\| defined(__sparc))
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1386	+ if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3\|SPARCV9_PREFER_FPU)) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1387	+ j = mont->N.top; /* borrow j */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1388	+ val[0]->d[0] = 1; /* borrow val[0] */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1389	+ for (i=1;i<j;i++)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1390	+ val[0]->d[i] = 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1391	+ val[0]->top = j;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1392	+ if (!BN_mod_mul_montgomery(rr, r, val[0], mont, ctx))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1393	+ goto err;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1394	+ } else
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1395	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1396	if (!BN_from_montgomery(rr, r, mont, ctx))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1397	goto err;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1398	ret = 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1399	@@ -526,6 +552,26 @@ err:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1400	return (ret);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1401	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1402
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1403	+#if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) \|\| defined(__sparc))
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1404	+static BN_ULONG bn_get_bits(const BIGNUM *a, int bitpos) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1405	+ BN_ULONG ret = 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1406	+ int wordpos;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1407	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1408	+ wordpos = bitpos / BN_BITS2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1409	+ bitpos %= BN_BITS2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1410	+ if (wordpos>=0 && wordpos < a->top) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1411	+ ret = a->d[wordpos]&BN_MASK2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1412	+ if (bitpos) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1413	+ ret >>= bitpos;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1414	+ if (++wordpos < a->top)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1415	+ ret \|= a->d[wordpos]<<(BN_BITS2-bitpos);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1416	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1417	+ }
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1418	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1419	+ return ret & BN_MASK2;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1420	+}
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1421	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1422	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1423	/*
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1424	* BN_mod_exp_mont_consttime() stores the precomputed powers in a specific
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1425	* layout so that accessing any of these table values shows the same access
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1426	@@ -594,6 +640,9 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1427	int powerbufLen = 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1428	unsigned char *powerbuf = NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1429	BIGNUM tmp, am;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1430	+#if defined(OPENSSL_BN_ASM_MONT) && defined(__sparc)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1431	+ unsigned int t4=0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1432	+#endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1433
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1434	bn_check_top(a);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1435	bn_check_top(p);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1436	@@ -628,10 +677,18 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1437
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1438	/* Get the window size to use with size of p. */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1439	window = BN_window_bits_for_ctime_exponent_size(bits);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1440	+#if defined(OPENSSL_BN_ASM_MONT) && defined(__sparc)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1441	+ if (window>=5 && (top&15)==0 && top<=64 &&
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1442	+ (OPENSSL_sparcv9cap_P[1]&(CFR_MONTMUL\|CFR_MONTSQR))==
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1443	+ (CFR_MONTMUL\|CFR_MONTSQR) && (t4=OPENSSL_sparcv9cap_P[0]))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1444	+ window=5;
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1445	+ else
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1446	+#endif
da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1447	#if defined(OPENSSL_BN_ASM_MONT5)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1448	if (window == 6 && bits <= 1024)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1449	window = 5; /* ~5% improvement of 2048-bit RSA sign */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1450	#endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1451	+ (void) 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1452
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1453	/*
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1454	* Allocate a buffer large enough to hold all of the pre-computed powers
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1455	@@ -670,14 +727,14 @@ int BN_mod_exp_mont_consttime(BIGNUM rr, const BIGNUM a, const BIGNUM *p,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1456	tmp.flags = am.flags = BN_FLG_STATIC_DATA;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1457
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1458	/* prepare a^0 in Montgomery domain */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1459	-#if 1
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1460	- if (!BN_to_montgomery(&tmp, BN_value_one(), mont, ctx))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1461	- goto err;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1462	-#else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1463	+#if 1 /* by Shay Gueron's suggestion */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1464	tmp.d[0] = (0 - m->d[0]) & BN_MASK2; /* 2^(topBN_BITS2) - m /
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1465	for (i = 1; i < top; i++)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1466	tmp.d[i] = (~m->d[i]) & BN_MASK2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1467	tmp.top = top;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1468	+#else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1469	+ if (!BN_to_montgomery(&tmp,BN_value_one(),mont,ctx))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1470	+ goto err;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1471	#endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1472
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1473	/* prepare a^1 in Montgomery domain */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1474	@@ -689,6 +746,122 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1475	} else if (!BN_to_montgomery(&am, a, mont, ctx))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1476	goto err;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1477
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1478	+#if defined(OPENSSL_BN_ASM_MONT) && defined(__sparc)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1479	+ if (t4) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1480	+ typedef int (bn_pwr5_mont_f)(BN_ULONG tp,const BN_ULONG *np,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1481	+ const BN_ULONG n0,const void table,int power,int bits);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1482	+ int bn_pwr5_mont_t4_8(BN_ULONG tp,const BN_ULONG np,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1483	+ const BN_ULONG n0,const void table,int power,int bits);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1484	+ int bn_pwr5_mont_t4_16(BN_ULONG tp,const BN_ULONG np,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1485	+ const BN_ULONG n0,const void table,int power,int bits);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1486	+ int bn_pwr5_mont_t4_24(BN_ULONG tp,const BN_ULONG np,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1487	+ const BN_ULONG n0,const void table,int power,int bits);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1488	+ int bn_pwr5_mont_t4_32(BN_ULONG tp,const BN_ULONG np,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1489	+ const BN_ULONG n0,const void table,int power,int bits);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1490	+ static const bn_pwr5_mont_f pwr5_funcs[4] = {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1491	+ bn_pwr5_mont_t4_8, bn_pwr5_mont_t4_16,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1492	+ bn_pwr5_mont_t4_24, bn_pwr5_mont_t4_32 };
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1493	+ bn_pwr5_mont_f pwr5_worker = pwr5_funcs[top/16-1];
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1494	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1495	+ typedef int (bn_mul_mont_f)(BN_ULONG rp,const BN_ULONG *ap,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1496	+ const void bp,const BN_ULONG np,const BN_ULONG *n0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1497	+ int bn_mul_mont_t4_8(BN_ULONG rp,const BN_ULONG ap,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1498	+ const void bp,const BN_ULONG np,const BN_ULONG *n0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1499	+ int bn_mul_mont_t4_16(BN_ULONG rp,const BN_ULONG ap,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1500	+ const void bp,const BN_ULONG np,const BN_ULONG *n0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1501	+ int bn_mul_mont_t4_24(BN_ULONG rp,const BN_ULONG ap,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1502	+ const void bp,const BN_ULONG np,const BN_ULONG *n0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1503	+ int bn_mul_mont_t4_32(BN_ULONG rp,const BN_ULONG ap,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1504	+ const void bp,const BN_ULONG np,const BN_ULONG *n0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1505	+ static const bn_mul_mont_f mul_funcs[4] = {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1506	+ bn_mul_mont_t4_8, bn_mul_mont_t4_16,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1507	+ bn_mul_mont_t4_24, bn_mul_mont_t4_32 };
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1508	+ bn_mul_mont_f mul_worker = mul_funcs[top/16-1];
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1509	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1510	+ void bn_mul_mont_vis3(BN_ULONG rp,const BN_ULONG ap,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1511	+ const void bp,const BN_ULONG np,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1512	+ const BN_ULONG *n0,int num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1513	+ void bn_mul_mont_t4(BN_ULONG rp,const BN_ULONG ap,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1514	+ const void bp,const BN_ULONG np,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1515	+ const BN_ULONG *n0,int num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1516	+ void bn_mul_mont_gather5_t4(BN_ULONG rp,const BN_ULONG ap,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1517	+ const void table,const BN_ULONG np,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1518	+ const BN_ULONG *n0,int num,int power);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1519	+ void bn_flip_n_scatter5_t4(const BN_ULONG *inp,size_t num,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1520	+ void *table,size_t power);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1521	+ void bn_gather5_t4(BN_ULONG *out,size_t num,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1522	+ void *table,size_t power);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1523	+ void bn_flip_t4(BN_ULONG dst,BN_ULONG src,size_t num);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1524	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1525	+ BN_ULONG np=mont->N.d, n0=mont->n0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1526	+ int stride = 5(6-(top/16-1)); / multiple of 5, but less than 32 */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1527	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1528	+ /*
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1529	+ * BN_to_montgomery can contaminate words above .top
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1530	+ * [in BN_DEBUG[_DEBUG] build]...
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1531	+ */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1532	+ for (i=am.top; i<top; i++) am.d[i]=0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1533	+ for (i=tmp.top; i<top; i++) tmp.d[i]=0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1534	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1535	+ bn_flip_n_scatter5_t4(tmp.d,top,powerbuf,0);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1536	+ bn_flip_n_scatter5_t4(am.d,top,powerbuf,1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1537	+ if (!(*mul_worker)(tmp.d,am.d,am.d,np,n0) &&
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1538	+ !(*mul_worker)(tmp.d,am.d,am.d,np,n0))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1539	+ bn_mul_mont_vis3(tmp.d,am.d,am.d,np,n0,top);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1540	+ bn_flip_n_scatter5_t4(tmp.d,top,powerbuf,2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1541	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1542	+ for (i=3; i<32; i++) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1543	+ /* Calculate a^i = a^(i-1) * a */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1544	+ if (!(*mul_worker)(tmp.d,tmp.d,am.d,np,n0) &&
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1545	+ !(*mul_worker)(tmp.d,tmp.d,am.d,np,n0))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1546	+ bn_mul_mont_vis3(tmp.d,tmp.d,am.d,np,n0,top);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1547	+ bn_flip_n_scatter5_t4(tmp.d,top,powerbuf,i);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1548	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1549	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1550	+ /* switch to 64-bit domain */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1551	+ np = alloca(top*sizeof(BN_ULONG));
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1552	+ top /= 2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1553	+ bn_flip_t4(np,mont->N.d,top);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1554	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1555	+ bits--;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1556	+ for (wvalue=0, i=bits%5; i>=0; i--,bits--)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1557	+ wvalue = (wvalue<<1)+BN_is_bit_set(p,bits);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1558	+ bn_gather5_t4(tmp.d,top,powerbuf,wvalue);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1559	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1560	+ /* Scan the exponent one window at a time starting from the most
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1561	+ * significant bits.
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1562	+ */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1563	+ while (bits >= 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1564	+ if (bits < stride)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1565	+ stride = bits+1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1566	+ bits -= stride;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1567	+ wvalue = (bn_get_bits(p,bits+1));
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1568	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1569	+ if ((*pwr5_worker)(tmp.d,np,n0,powerbuf,wvalue,stride))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1570	+ continue;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1571	+ /* retry once and fall back */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1572	+ if ((*pwr5_worker)(tmp.d,np,n0,powerbuf,wvalue,stride))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1573	+ continue;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1574	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1575	+ bits += stride-5;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1576	+ wvalue >>= stride-5;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1577	+ wvalue &= 31;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1578	+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1579	+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1580	+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1581	+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1582	+ bn_mul_mont_t4(tmp.d,tmp.d,tmp.d,np,n0,top);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1583	+ bn_mul_mont_gather5_t4(tmp.d,tmp.d,powerbuf,np,n0,top,wvalue);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1584	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1585	+
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1586	+ bn_flip_t4(tmp.d,tmp.d,top);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1587	+ top *= 2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1588	+ /* back to 32-bit domain */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1589	+ tmp.top=top;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1590	+ bn_correct_top(&tmp);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1591	+ OPENSSL_cleanse(np,top*sizeof(BN_ULONG));
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1592	+ } else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1593	+#endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1594	#if defined(OPENSSL_BN_ASM_MONT5)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1595	if (window == 5 && top > 1) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1596	/*
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1597	@@ -844,6 +1017,15 @@ int BN_mod_exp_mont_consttime(BIGNUM rr, const BIGNUM a, const BIGNUM *p,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1598	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1599
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1600	/* Convert the final result from montgomery to standard format */
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1601	+#if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) \|\| defined(__sparc))
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1602	+ if (OPENSSL_sparcv9cap_P[0] & (SPARCV9_VIS3\|SPARCV9_PREFER_FPU)) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1603	+ am.d[0] = 1; /* borrow am */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1604	+ for (i = 1; i < top; i++)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1605	+ am.d[i] = 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1606	+ if (!BN_mod_mul_montgomery(rr,&tmp,&am,mont,ctx))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1607	+ goto err;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1608	+ } else
2717 da0ef75be98f 15824600 SUNBT7206152 T4 montmul should be embedded in the OpenSSL upstream src Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2681 diff changeset	1609	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1610	if (!BN_from_montgomery(rr, &tmp, mont, ctx))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1611	goto err;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1612	ret = 1;
2674 4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1613	Index: openssl/apps/speed.c
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1614	===================================================================
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1615	diff -ru openssl-1.0.1e/apps/spped.c openssl-1.0.1e/apps/speed.c
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1616	--- openssl-1.0.1e/apps/speed.c 2011-05-24 17:02:24.000000000 -0700
4801864231c8 PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: diff changeset	1617	+++ openssl-1.0.1e/apps/spped.c 2011-07-27 10:48:17.817470000 -0700
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1618	@@ -1586,8 +1586,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1619	print_message(names[D_MD5], c[D_MD5][j], lengths[j]);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1620	Time_F(START);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1621	for (count = 0, run = 1; COND(c[D_MD5][j]); count++)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1622	- EVP_Digest(&(buf[0]), (unsigned long)lengths[j], &(md5[0]),
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1623	- NULL, EVP_get_digestbyname("md5"), NULL);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1624	+ MD5(buf, lengths[j], md5);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1625	d = Time_F(STOP);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1626	print_result(D_MD5, j, count, d);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1627	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1628	@@ -1622,8 +1621,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1629	print_message(names[D_SHA1], c[D_SHA1][j], lengths[j]);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1630	Time_F(START);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1631	for (count = 0, run = 1; COND(c[D_SHA1][j]); count++)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1632	- EVP_Digest(buf, (unsigned long)lengths[j], &(sha[0]), NULL,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1633	- EVP_sha1(), NULL);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1634	+ SHA1(buf, lengths[j], sha);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1635	d = Time_F(STOP);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1636	print_result(D_SHA1, j, count, d);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1637	}
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1638	Index: openssl/crypto/aes/Makefile
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1639	===================================================================
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1640	--- Makefile Thu May 2 13:42:37 2013
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1641	+++ Makefile.orig Thu May 2 13:41:51 2013
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1642	@@ -69,6 +69,9 @@
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1643	aes-sparcv9.s: asm/aes-sparcv9.pl
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1644	$(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1645
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1646	+aest4-sparcv9.s: asm/aest4-sparcv9.pl
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1647	+ $(PERL) asm/aest4-sparcv9.pl $(CFLAGS) > $@
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1648	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1649	aes-ppc.s: asm/aes-ppc.pl
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1650	$(PERL) asm/aes-ppc.pl $(PERLASM_SCHEME) $@
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1651
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1652	Index: openssl/crypto/evp/e_aes.c
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1653	===================================================================
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1654	--- e_aes.c Mon Feb 11 07:26:04 2013
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1655	+++ e_aes.c.56 Thu May 2 14:26:35 2013
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1656	@@ -56,12 +58,11 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1657	# include <assert.h>
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1658	# include <openssl/aes.h>
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1659	# include "evp_locl.h"
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1660	-# ifndef OPENSSL_FIPS
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1661	# include "modes_lcl.h"
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1662	# include <openssl/rand.h>
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1663
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1664	typedef struct {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1665	- AES_KEY ks;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1666	+ union { double align; AES_KEY ks; } ks;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1667	block128_f block;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1668	union {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1669	cbc128_f cbc;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1670	@@ -70,7 +69,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1671	} EVP_AES_KEY;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1672
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1673	typedef struct {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1674	- AES_KEY ks; /* AES key schedule to use */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1675	+ union { double align; AES_KEY ks; } ks; /* AES key schedule to use */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1676	int key_set; /* Set if key initialised */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1677	int iv_set; /* Set if an iv is set */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1678	GCM128_CONTEXT gcm;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1679	@@ -83,7 +82,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1680	} EVP_AES_GCM_CTX;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1681
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1682	typedef struct {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1683	- AES_KEY ks1, ks2; /* AES key schedules to use */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1684	+ union { double align; AES_KEY ks; } ks1, ks2; /* AES key schedules to use */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1685	XTS128_CONTEXT xts;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1686	void (stream) (const unsigned char in,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1687	unsigned char *out, size_t length,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1688	@@ -92,7 +91,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1689	} EVP_AES_XTS_CTX;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1690
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1691	typedef struct {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1692	- AES_KEY ks; /* AES key schedule to use */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1693	+ union { double align; AES_KEY ks; } ks; /* AES key schedule to use */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1694	int key_set; /* Set if key initialised */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1695	int iv_set; /* Set if an iv is set */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1696	int tag_set; /* Set if tag is valid */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1697	@@ -155,7 +154,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1698	defined(_M_AMD64) \|\| defined(_M_X64) \|\| \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1699	defined(__INTEL__) )
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1700
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1701	-extern unsigned int OPENSSL_ia32cap_P[2];
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1702	+extern unsigned int OPENSSL_ia32cap_P[];
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1703
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1704	# ifdef VPAES_ASM
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1705	# define VPAES_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(41-32)))
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1706	@@ -297,7 +296,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1707	if (!iv && !key)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1708	return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1709	if (key) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1710	- aesni_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1711	+ aesni_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1712	CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f) aesni_encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1713	gctx->ctr = (ctr128_f) aesni_ctr32_encrypt_blocks;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1714	/*
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1715	@@ -336,17 +335,17 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1716	if (key) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1717	/* key_len is two AES keys */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1718	if (enc) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1719	- aesni_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1720	+ aesni_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1721	xctx->xts.block1 = (block128_f) aesni_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1722	xctx->stream = aesni_xts_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1723	} else {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1724	- aesni_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1725	+ aesni_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1726	xctx->xts.block1 = (block128_f) aesni_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1727	xctx->stream = aesni_xts_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1728	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1729
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1730	aesni_set_encrypt_key(key + ctx->key_len / 2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1731	- ctx->key_len * 4, &xctx->ks2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1732	+ ctx->key_len * 4, &xctx->ks2.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1733	xctx->xts.block2 = (block128_f) aesni_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1734
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1735	xctx->xts.key1 = &xctx->ks1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1736	@@ -371,7 +370,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1737	if (!iv && !key)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1738	return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1739	if (key) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1740	- aesni_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1741	+ aesni_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1742	CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1743	&cctx->ks, (block128_f) aesni_encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1744	cctx->str = enc ? (ccm128_f) aesni_ccm64_encrypt_blocks :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1745	@@ -432,6 +431,364 @@
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1746	const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1747	{ return AESNI_CAPABLE?&aesni_##keylen##_##mode:&aes_##keylen##_##mode; }
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1748
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1749	+#elif defined(AES_ASM) && (defined(__sparc) \|\| defined(__sparc__))
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1750	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1751	+#include "sparc_arch.h"
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1752	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1753	+extern unsigned int OPENSSL_sparcv9cap_P[];
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1754	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1755	+#define SPARC_AES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_AES)
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1756	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1757	+void aes_t4_set_encrypt_key (const unsigned char *key, int bits,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1758	+ AES_KEY *ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1759	+void aes_t4_set_decrypt_key (const unsigned char *key, int bits,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1760	+ AES_KEY *ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1761	+void aes_t4_encrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1762	+ const AES_KEY *key);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1763	+void aes_t4_decrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1764	+ const AES_KEY *key);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1765	+/*
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1766	+ * Key-length specific subroutines were chosen for following reason.
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1767	+ * Each SPARC T4 core can execute up to 8 threads which share core's
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1768	+ * resources. Loading as much key material to registers allows to
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1769	+ * minimize references to shared memory interface, as well as amount
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1770	+ * of instructions in inner loops [much needed on T4]. But then having
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1771	+ * non-key-length specific routines would require conditional branches
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1772	+ * either in inner loops or on subroutines' entries. Former is hardly
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1773	+ * acceptable, while latter means code size increase to size occupied
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1774	+ * by multiple key-length specfic subroutines, so why fight?
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1775	+ */
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1776	+void aes128_t4_cbc_encrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1777	+ size_t len, const AES_KEY *key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1778	+ unsigned char *ivec);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1779	+void aes128_t4_cbc_decrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1780	+ size_t len, const AES_KEY *key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1781	+ unsigned char *ivec);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1782	+void aes192_t4_cbc_encrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1783	+ size_t len, const AES_KEY *key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1784	+ unsigned char *ivec);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1785	+void aes192_t4_cbc_decrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1786	+ size_t len, const AES_KEY *key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1787	+ unsigned char *ivec);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1788	+void aes256_t4_cbc_encrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1789	+ size_t len, const AES_KEY *key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1790	+ unsigned char *ivec);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1791	+void aes256_t4_cbc_decrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1792	+ size_t len, const AES_KEY *key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1793	+ unsigned char *ivec);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1794	+void aes128_t4_ctr32_encrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1795	+ size_t blocks, const AES_KEY *key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1796	+ unsigned char *ivec);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1797	+void aes192_t4_ctr32_encrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1798	+ size_t blocks, const AES_KEY *key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1799	+ unsigned char *ivec);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1800	+void aes256_t4_ctr32_encrypt (const unsigned char in, unsigned char out,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1801	+ size_t blocks, const AES_KEY *key,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1802	+ unsigned char *ivec);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1803	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1804	+static int aes_t4_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1805	+ const unsigned char *iv, int enc)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1806	+{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1807	+ int ret, mode, bits;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1808	+ EVP_AES_KEY dat = (EVP_AES_KEY )ctx->cipher_data;
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1809	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1810	+ mode = ctx->cipher->flags & EVP_CIPH_MODE;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1811	+ bits = ctx->key_len*8;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1812	+ if ((mode == EVP_CIPH_ECB_MODE \|\| mode == EVP_CIPH_CBC_MODE) && !enc) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1813	+ ret = 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1814	+ aes_t4_set_decrypt_key(key, bits, ctx->cipher_data);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1815	+ dat->block = (block128_f)aes_t4_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1816	+ switch (bits) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1817	+ case 128:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1818	+ dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1819	+ (cbc128_f)aes128_t4_cbc_decrypt :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1820	+ NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1821	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1822	+ case 192:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1823	+ dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1824	+ (cbc128_f)aes192_t4_cbc_decrypt :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1825	+ NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1826	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1827	+ case 256:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1828	+ dat->stream.cbc = mode==EVP_CIPH_CBC_MODE ?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1829	+ (cbc128_f)aes256_t4_cbc_decrypt :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1830	+ NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1831	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1832	+ default:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1833	+ ret = -1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1834	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1835	+ } else {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1836	+ ret = 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1837	+ aes_t4_set_encrypt_key(key, bits, ctx->cipher_data);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1838	+ dat->block = (block128_f)aes_t4_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1839	+ switch (bits) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1840	+ case 128:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1841	+ if (mode==EVP_CIPH_CBC_MODE)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1842	+ dat->stream.cbc = (cbc128_f)aes128_t4_cbc_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1843	+ else if (mode==EVP_CIPH_CTR_MODE)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1844	+ dat->stream.ctr = (ctr128_f)aes128_t4_ctr32_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1845	+ else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1846	+ dat->stream.cbc = NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1847	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1848	+ case 192:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1849	+ if (mode==EVP_CIPH_CBC_MODE)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1850	+ dat->stream.cbc = (cbc128_f)aes192_t4_cbc_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1851	+ else if (mode==EVP_CIPH_CTR_MODE)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1852	+ dat->stream.ctr = (ctr128_f)aes192_t4_ctr32_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1853	+ else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1854	+ dat->stream.cbc = NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1855	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1856	+ case 256:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1857	+ if (mode==EVP_CIPH_CBC_MODE)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1858	+ dat->stream.cbc = (cbc128_f)aes256_t4_cbc_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1859	+ else if (mode==EVP_CIPH_CTR_MODE)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1860	+ dat->stream.ctr = (ctr128_f)aes256_t4_ctr32_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1861	+ else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1862	+ dat->stream.cbc = NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1863	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1864	+ default:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1865	+ ret = -1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1866	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1867	+ }
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1868	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1869	+ if (ret < 0) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1870	+ EVPerr(EVP_F_AES_T4_INIT_KEY,EVP_R_AES_KEY_SETUP_FAILED);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1871	+ return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1872	+ }
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1873	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1874	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1875	+}
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1876	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1877	+#define aes_t4_cbc_cipher aes_cbc_cipher
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1878	+static int aes_t4_cbc_cipher(EVP_CIPHER_CTX ctx,unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1879	+ const unsigned char *in, size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1880	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1881	+#define aes_t4_ecb_cipher aes_ecb_cipher
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1882	+static int aes_t4_ecb_cipher(EVP_CIPHER_CTX ctx,unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1883	+ const unsigned char *in, size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1884	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1885	+#define aes_t4_ofb_cipher aes_ofb_cipher
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1886	+static int aes_t4_ofb_cipher(EVP_CIPHER_CTX ctx,unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1887	+ const unsigned char *in,size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1888	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1889	+#define aes_t4_cfb_cipher aes_cfb_cipher
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1890	+static int aes_t4_cfb_cipher(EVP_CIPHER_CTX ctx,unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1891	+ const unsigned char *in,size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1892	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1893	+#define aes_t4_cfb8_cipher aes_cfb8_cipher
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1894	+static int aes_t4_cfb8_cipher(EVP_CIPHER_CTX ctx,unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1895	+ const unsigned char *in,size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1896	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1897	+#define aes_t4_cfb1_cipher aes_cfb1_cipher
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1898	+static int aes_t4_cfb1_cipher(EVP_CIPHER_CTX ctx,unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1899	+ const unsigned char *in,size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1900	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1901	+#define aes_t4_ctr_cipher aes_ctr_cipher
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1902	+static int aes_t4_ctr_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1903	+ const unsigned char *in, size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1904	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1905	+static int aes_t4_gcm_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1906	+ const unsigned char *iv, int enc)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1907	+{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1908	+ EVP_AES_GCM_CTX *gctx = ctx->cipher_data;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1909	+ if (!iv && !key)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1910	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1911	+ if (key) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1912	+ int bits = ctx->key_len * 8;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1913	+ aes_t4_set_encrypt_key(key, bits, &gctx->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1914	+ CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1915	+ (block128_f)aes_t4_encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1916	+ switch (bits) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1917	+ case 128:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1918	+ gctx->ctr = (ctr128_f)aes128_t4_ctr32_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1919	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1920	+ case 192:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1921	+ gctx->ctr = (ctr128_f)aes192_t4_ctr32_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1922	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1923	+ case 256:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1924	+ gctx->ctr = (ctr128_f)aes256_t4_ctr32_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1925	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1926	+ default:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1927	+ return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1928	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1929	+ /* If we have an iv can set it directly, otherwise use
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1930	+ * saved IV.
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1931	+ */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1932	+ if (iv == NULL && gctx->iv_set)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1933	+ iv = gctx->iv;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1934	+ if (iv) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1935	+ CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1936	+ gctx->iv_set = 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1937	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1938	+ gctx->key_set = 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1939	+ } else {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1940	+ /* If key set use IV, otherwise copy */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1941	+ if (gctx->key_set)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1942	+ CRYPTO_gcm128_setiv(&gctx->gcm, iv, gctx->ivlen);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1943	+ else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1944	+ memcpy(gctx->iv, iv, gctx->ivlen);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1945	+ gctx->iv_set = 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1946	+ gctx->iv_gen = 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1947	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1948	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1949	+}
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1950	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1951	+#define aes_t4_gcm_cipher aes_gcm_cipher
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1952	+static int aes_t4_gcm_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1953	+ const unsigned char *in, size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1954	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1955	+static int aes_t4_xts_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1956	+ const unsigned char *iv, int enc)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1957	+{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1958	+ EVP_AES_XTS_CTX *xctx = ctx->cipher_data;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1959	+ if (!iv && !key)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1960	+ return 1;
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1961	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1962	+ if (key) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1963	+ int bits = ctx->key_len * 4;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1964	+ /* key_len is two AES keys */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1965	+ if (enc) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1966	+ aes_t4_set_encrypt_key(key, bits, &xctx->ks1.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1967	+ xctx->xts.block1 = (block128_f)aes_t4_encrypt;
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1968	+#if 0 /* not yet */
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1969	+ switch (bits) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1970	+ case 128:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1971	+ xctx->stream = aes128_t4_xts_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1972	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1973	+ case 192:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1974	+ xctx->stream = aes192_t4_xts_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1975	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1976	+ case 256:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1977	+ xctx->stream = aes256_t4_xts_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1978	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1979	+ default:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1980	+ return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1981	+ }
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1982	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1983	+ } else {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1984	+ aes_t4_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1985	+ xctx->xts.block1 = (block128_f)aes_t4_decrypt;
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	1986	+#if 0 /* not yet */
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1987	+ switch (bits) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1988	+ case 128:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1989	+ xctx->stream = aes128_t4_xts_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1990	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1991	+ case 192:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1992	+ xctx->stream = aes192_t4_xts_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1993	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1994	+ case 256:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1995	+ xctx->stream = aes256_t4_xts_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1996	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1997	+ default:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1998	+ return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	1999	+ }
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2000	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2001	+ }
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2002	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2003	+ aes_t4_set_encrypt_key(key + ctx->key_len/2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2004	+ ctx->key_len * 4, &xctx->ks2.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2005	+ xctx->xts.block2 = (block128_f)aes_t4_encrypt;
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2006	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2007	+ xctx->xts.key1 = &xctx->ks1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2008	+ }
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2009	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2010	+ if (iv) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2011	+ xctx->xts.key2 = &xctx->ks2;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2012	+ memcpy(ctx->iv, iv, 16);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2013	+ }
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2014	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2015	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2016	+}
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2017	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2018	+#define aes_t4_xts_cipher aes_xts_cipher
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2019	+static int aes_t4_xts_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2020	+ const unsigned char *in, size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2021	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2022	+static int aes_t4_ccm_init_key(EVP_CIPHER_CTX ctx, const unsigned char key,
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2023	+ const unsigned char *iv, int enc)
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2024	+{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2025	+ EVP_AES_CCM_CTX *cctx = ctx->cipher_data;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2026	+ if (!iv && !key)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2027	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2028	+ if (key) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2029	+ int bits = ctx->key_len * 8;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2030	+ aes_t4_set_encrypt_key(key, bits, &cctx->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2031	+ CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2032	+ &cctx->ks, (block128_f)aes_t4_encrypt);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2033	+#if 0 /* not yet */
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2034	+ switch (bits) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2035	+ case 128:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2036	+ cctx->str = enc?(ccm128_f)aes128_t4_ccm64_encrypt :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2037	+ (ccm128_f)ae128_t4_ccm64_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2038	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2039	+ case 192:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2040	+ cctx->str = enc?(ccm128_f)aes192_t4_ccm64_encrypt :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2041	+ (ccm128_f)ae192_t4_ccm64_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2042	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2043	+ case 256:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2044	+ cctx->str = enc?(ccm128_f)aes256_t4_ccm64_encrypt :
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2045	+ (ccm128_f)ae256_t4_ccm64_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2046	+ break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2047	+ default:
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2048	+ return 0;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2049	+ }
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2050	+#endif
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2051	+ cctx->key_set = 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2052	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2053	+ if (iv) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2054	+ memcpy(ctx->iv, iv, 15 - cctx->L);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2055	+ cctx->iv_set = 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2056	+ }
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2057	+ return 1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2058	+}
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2059	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2060	+#define aes_t4_ccm_cipher aes_ccm_cipher
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2061	+static int aes_t4_ccm_cipher(EVP_CIPHER_CTX ctx, unsigned char out,
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2062	+ const unsigned char *in, size_t len);
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2063	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2064	+#define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2065	+static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2066	+ nid##_##keylen##_##nmode,blocksize,keylen/8,ivlen, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2067	+ flags\|EVP_CIPH_##MODE##_MODE, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2068	+ aes_t4_init_key, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2069	+ aes_t4_##mode##_cipher, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2070	+ NULL, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2071	+ sizeof(EVP_AES_KEY), \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2072	+ NULL,NULL,NULL,NULL }; \
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2073	+static const EVP_CIPHER aes_##keylen##_##mode = { \
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2074	+ nid##_##keylen##_##nmode,blocksize, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2075	+ keylen/8,ivlen, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2076	+ flags\|EVP_CIPH_##MODE##_MODE, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2077	+ aes_init_key, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2078	+ aes_##mode##_cipher, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2079	+ NULL, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2080	+ sizeof(EVP_AES_KEY), \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2081	+ NULL,NULL,NULL,NULL }; \
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2082	+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2083	+{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; }
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2084	+
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2085	+#define BLOCK_CIPHER_custom(nid,keylen,blocksize,ivlen,mode,MODE,flags) \
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2086	+static const EVP_CIPHER aes_t4_##keylen##_##mode = { \
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2087	+ nid##_##keylen##_##mode,blocksize, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2088	+ (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE?2:1)*keylen/8, ivlen, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2089	+ flags\|EVP_CIPH_##MODE##_MODE, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2090	+ aes_t4_##mode##_init_key, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2091	+ aes_t4_##mode##_cipher, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2092	+ aes_##mode##_cleanup, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2093	+ sizeof(EVP_AES_##MODE##_CTX), \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2094	+ NULL,NULL,aes_##mode##_ctrl,NULL }; \
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2095	+static const EVP_CIPHER aes_##keylen##_##mode = { \
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2096	+ nid##_##keylen##_##mode,blocksize, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2097	+ (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE?2:1)*keylen/8, ivlen, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2098	+ flags\|EVP_CIPH_##MODE##_MODE, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2099	+ aes_##mode##_init_key, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2100	+ aes_##mode##_cipher, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2101	+ aes_##mode##_cleanup, \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2102	+ sizeof(EVP_AES_##MODE##_CTX), \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2103	+ NULL,NULL,aes_##mode##_ctrl,NULL }; \
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2104	+const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2105	+{ return SPARC_AES_CAPABLE?&aes_t4_##keylen##_##mode:&aes_##keylen##_##mode; }
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2106	+
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2107	# else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2108
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2109	# define BLOCK_CIPHER_generic(nid,keylen,blocksize,ivlen,nmode,mode,MODE,flags) \
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2110	@@ -480,7 +837,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2111	&& !enc)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2112	# ifdef BSAES_CAPABLE
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2113	if (BSAES_CAPABLE && mode == EVP_CIPH_CBC_MODE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2114	- ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2115	+ ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2116	dat->block = (block128_f) AES_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2117	dat->stream.cbc = (cbc128_f) bsaes_cbc_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2118	} else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2119	@@ -487,7 +844,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2120	# endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2121	# ifdef VPAES_CAPABLE
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2122	if (VPAES_CAPABLE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2123	- ret = vpaes_set_decrypt_key(key, ctx->key_len * 8, &dat->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2124	+ ret = vpaes_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2125	dat->block = (block128_f) vpaes_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2126	dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2127	(cbc128_f) vpaes_cbc_encrypt : NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2128	@@ -494,7 +851,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2129	} else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2130	# endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2131	{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2132	- ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2133	+ ret = AES_set_decrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2134	dat->block = (block128_f) AES_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2135	dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2136	(cbc128_f) AES_cbc_encrypt : NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2137	@@ -508,7 +865,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2138	# endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2139	# ifdef VPAES_CAPABLE
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2140	if (VPAES_CAPABLE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2141	- ret = vpaes_set_encrypt_key(key, ctx->key_len * 8, &dat->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2142	+ ret = vpaes_set_encrypt_key(key, ctx->key_len * 8, &dat->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2143	dat->block = (block128_f) vpaes_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2144	dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2145	(cbc128_f) vpaes_cbc_encrypt : NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2146	@@ -515,7 +872,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2147	} else
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2148	# endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2149	{
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2150	- ret = AES_set_encrypt_key(key, ctx->key_len * 8, &dat->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2151	+ ret = AES_set_encrypt_key(key, ctx->key_len*8, &dat->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2152	dat->block = (block128_f) AES_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2153	dat->stream.cbc = mode == EVP_CIPH_CBC_MODE ?
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2154	(cbc128_f) AES_cbc_encrypt : NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2155	@@ -810,7 +1167,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2156	do {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2157	# ifdef BSAES_CAPABLE
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2158	if (BSAES_CAPABLE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2159	- AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2160	+ AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2161	CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2162	(block128_f) AES_encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2163	gctx->ctr = (ctr128_f) bsaes_ctr32_encrypt_blocks;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2164	@@ -819,7 +1176,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2165	# endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2166	# ifdef VPAES_CAPABLE
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2167	if (VPAES_CAPABLE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2168	- vpaes_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2169	+ vpaes_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2170	CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2171	(block128_f) vpaes_encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2172	gctx->ctr = NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2173	@@ -828,7 +1185,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2174	# endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2175	(void)0; /* terminate potentially open 'else' */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2176
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2177	- AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2178	+ AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2179	CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2180	(block128_f) AES_encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2181	# ifdef AES_CTR_ASM
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2182	@@ -1049,15 +1406,15 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2183	# ifdef VPAES_CAPABLE
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2184	if (VPAES_CAPABLE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2185	if (enc) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2186	- vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2187	+ vpaes_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2188	xctx->xts.block1 = (block128_f) vpaes_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2189	} else {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2190	- vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2191	+ vpaes_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2192	xctx->xts.block1 = (block128_f) vpaes_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2193	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2194
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2195	vpaes_set_encrypt_key(key + ctx->key_len / 2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2196	- ctx->key_len * 4, &xctx->ks2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2197	+ ctx->key_len * 4, &xctx->ks2.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2198	xctx->xts.block2 = (block128_f) vpaes_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2199
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2200	xctx->xts.key1 = &xctx->ks1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2201	@@ -1067,15 +1424,15 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2202	(void)0; /* terminate potentially open 'else' */
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2203
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2204	if (enc) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2205	- AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2206	+ AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2207	xctx->xts.block1 = (block128_f) AES_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2208	} else {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2209	- AES_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2210	+ AES_set_decrypt_key(key, ctx->key_len * 4, &xctx->ks1.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2211	xctx->xts.block1 = (block128_f) AES_decrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2212	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2213
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2214	AES_set_encrypt_key(key + ctx->key_len / 2,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2215	- ctx->key_len * 4, &xctx->ks2);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2216	+ ctx->key_len * 4, &xctx->ks2.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2217	xctx->xts.block2 = (block128_f) AES_encrypt;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2218
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2219	xctx->xts.key1 = &xctx->ks1;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2220	@@ -1196,7 +1553,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2221	do {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2222	# ifdef VPAES_CAPABLE
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2223	if (VPAES_CAPABLE) {
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2224	- vpaes_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2225	+ vpaes_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2226	CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2227	&cctx->ks, (block128_f) vpaes_encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2228	cctx->str = NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2229	@@ -1204,7 +1561,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2230	break;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2231	}
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2232	# endif
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2233	- AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2234	+ AES_set_encrypt_key(key, ctx->key_len * 8, &cctx->ks.ks);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2235	CRYPTO_ccm128_init(&cctx->ccm, cctx->M, cctx->L,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2236	&cctx->ks, (block128_f) AES_encrypt);
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2237	cctx->str = NULL;
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2238	@@ -1285,5 +1642,4 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2239	EVP_CIPH_FLAG_FIPS \| CUSTOM_FLAGS)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2240	BLOCK_CIPHER_custom(NID_aes, 256, 1, 12, ccm, CCM,
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2241	EVP_CIPH_FLAG_FIPS \| CUSTOM_FLAGS)
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2242	-# endif
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2243	#endif
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2244	Index: openssl/crypto/evp/evp.h
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2245	===================================================================
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2246	--- evp.h Mon Feb 11 07:26:04 2013
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2247	+++ evp.h.new Thu May 2 14:31:55 2013
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2248	@@ -1325,6 +1325,7 @@
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2249	# define EVP_F_AESNI_INIT_KEY 165
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2250	# define EVP_F_AESNI_XTS_CIPHER 176
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2251	# define EVP_F_AES_INIT_KEY 133
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2252	+# define EVP_F_AES_T4_INIT_KEY 178
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2253	# define EVP_F_AES_XTS 172
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2254	# define EVP_F_AES_XTS_CIPHER 175
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2255	# define EVP_F_ALG_MODULE_INIT 177
2681 f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2256	Index: openssl/crypto/evp/evp_err.c
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2257	===================================================================
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2258	--- evp_err.c Mon Feb 11 07:26:04 2013
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2259	+++ evp_err.c.new Thu May 2 14:33:24 2013
f7ee98f5749e PSARC 2013/034 OpenSSL 1.0.1 Misaki Miyashita <Misaki.Miyashita@Oracle.COM> parents: 2674 diff changeset	2260	@@ -73,6 +73,7 @@
4020 8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2261	{ERR_FUNC(EVP_F_AESNI_INIT_KEY), "AESNI_INIT_KEY"},
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2262	{ERR_FUNC(EVP_F_AESNI_XTS_CIPHER), "AESNI_XTS_CIPHER"},
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2263	{ERR_FUNC(EVP_F_AES_INIT_KEY), "AES_INIT_KEY"},
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2264	+ {ERR_FUNC(EVP_F_AES_T4_INIT_KEY), "AES_T4_INIT_KEY"},
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2265	{ERR_FUNC(EVP_F_AES_XTS), "AES_XTS"},
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2266	{ERR_FUNC(EVP_F_AES_XTS_CIPHER), "AES_XTS_CIPHER"},
8e3f49e23eaa 20735615 Upgrade OpenSSL version to 1.0.1m Ron Jordan <ron.jordan@oracle.com> parents: 3285 diff changeset	2267	{ERR_FUNC(EVP_F_ALG_MODULE_INIT), "ALG_MODULE_INIT"},

author	Ron Jordan <ron.jordan@oracle.com>
	Tue, 24 Mar 2015 20:05:38 -0700
branch	s11u2-sru8-backport
changeset 4020	8e3f49e23eaa
parent 3285	components/openssl/openssl-1.0.1/patches/37_openssl-t4-inline.patch@78460de60ed1
permissions	-rw-r--r--