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