author | Misaki Miyashita <Misaki.Miyashita@Oracle.COM> |
Fri, 20 Mar 2015 15:31:27 -0700 | |
changeset 4002 | 95b8f35fcdd5 |
parent 1884 | d1a47da60382 |
permissions | -rw-r--r-- |
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"; |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
16 |
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
|
17 |
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
|
18 |
my $mips32_asm=":bn-mips.o::aes_cbc.o aes-mips.o:::sha1-mips.o sha256-mips.o::::::::"; |
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__) |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
32 |
@@ -235,10 +239,10 @@ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
33 |
.global _sparcv9_vis1_probe |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
34 |
.align 8 |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
35 |
_sparcv9_vis1_probe: |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
36 |
+ .word 0x81b00d80 !fxor %f0,%f0,%f0 |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
37 |
add %sp,BIAS+2,%o1 |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
38 |
- .word 0xc19a5a40 !ldda [%o1]ASI_FP16_P,%f0 |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
39 |
retl |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
40 |
- .word 0x81b00d80 !fxor %f0,%f0,%f0 |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
41 |
+ .word 0xc19a5a40 !ldda [%o1]ASI_FP16_P,%f0 |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
42 |
.type _sparcv9_vis1_probe,#function |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
43 |
.size _sparcv9_vis1_probe,.-_sparcv9_vis1_probe |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
44 |
|
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
45 |
@@ -251,7 +255,12 @@ |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
46 |
! 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
|
47 |
! 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
|
48 |
! 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
|
49 |
+! SPARC T4 65(*) |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
50 |
! |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
51 |
+! (*) 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
|
52 |
+! 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
|
53 |
+! 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
|
54 |
+! |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
55 |
! 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
|
56 |
! |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
57 |
! It would be possible to detect specifically US-T1 by instrumenting |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
58 |
@@ -260,6 +269,8 @@ |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
59 |
.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
|
60 |
.align 8 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
61 |
_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
|
62 |
+ .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
|
63 |
+ .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
|
64 |
.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
|
65 |
.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
|
66 |
.word 0x85b08d82 !fxor %f2,%f2,%f2 |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
67 |
@@ -314,6 +325,30 @@ |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
68 |
.type _sparcv9_fmadd_probe,#function |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
69 |
.size _sparcv9_fmadd_probe,.-_sparcv9_fmadd_probe |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
70 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
71 |
+.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
|
72 |
+.align 8 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
73 |
+_sparcv9_rdcfr: |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
74 |
+ retl |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
75 |
+ .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
|
76 |
+.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
|
77 |
+.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
|
78 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
79 |
+.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
|
80 |
+.align 8 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
81 |
+_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
|
82 |
+ retl |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
83 |
+ .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
|
84 |
+.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
|
85 |
+.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
|
86 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
87 |
+.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
|
88 |
+.align 8 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
89 |
+_sparcv9_random: |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
90 |
+ retl |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
91 |
+ .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
|
92 |
+.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
|
93 |
+.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
|
94 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
95 |
.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
|
96 |
.align 32 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
97 |
OPENSSL_cleanse: |
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
|
98 |
@@ -398,6 +433,102 @@ |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
99 |
.size OPENSSL_cleanse,.-OPENSSL_cleanse |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
100 |
|
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
|
101 |
#ifndef _BOOT |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
102 |
+.global _sparcv9_vis1_instrument_bus |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
103 |
+.align 8 |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
104 |
+_sparcv9_vis1_instrument_bus: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
105 |
+ mov %o1,%o3 ! save cnt |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
106 |
+ .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
|
107 |
+ mov %o4,%o5 ! lasttick = tick |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
108 |
+ set 0,%g4 ! diff |
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 |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
118 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
119 |
+.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
|
120 |
+ 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
|
121 |
+ mov %o4,%o5 ! lasttick=tick |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
122 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
123 |
+ andn %o0,63,%g1 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
124 |
+ .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
|
125 |
+ .word 0x8143e040 !membar #Sync |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
126 |
+ .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
|
127 |
+ .word 0x8143e040 !membar #Sync |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
128 |
+ ld [%o0],%o4 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
129 |
+ add %o4,%g4,%g4 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
130 |
+ .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
|
131 |
+ subcc %o1,1,%o1 ! --$cnt |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
132 |
+ bnz .Loop |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
133 |
+ add %o0,4,%o0 ! ++$out |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
134 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
135 |
+ retl |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
136 |
+ mov %o3,%o0 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
137 |
+.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
|
138 |
+.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
|
139 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
140 |
+.global _sparcv9_vis1_instrument_bus2 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
141 |
+.align 8 |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
142 |
+_sparcv9_vis1_instrument_bus2: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
143 |
+ mov %o1,%o3 ! save cnt |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
144 |
+ 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
|
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 |
+ mov %o4,%o5 ! lasttick = tick |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
148 |
+ set 0,%g4 ! diff |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
149 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
150 |
+ andn %o0,63,%g1 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
151 |
+ .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
|
152 |
+ .word 0x8143e040 !membar #Sync |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
153 |
+ .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
|
154 |
+ .word 0x8143e040 !membar #Sync |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
155 |
+ ld [%o0],%o4 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
156 |
+ add %o4,%g4,%g4 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
157 |
+ .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
|
158 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
159 |
+ .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
|
160 |
+ 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
|
161 |
+ mov %o4,%o5 ! lasttick=tick |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
162 |
+ mov %g4,%g5 ! lastdiff=diff |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
163 |
+.Loop2: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
164 |
+ andn %o0,63,%g1 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
165 |
+ .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
|
166 |
+ .word 0x8143e040 !membar #Sync |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
167 |
+ .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
|
168 |
+ .word 0x8143e040 !membar #Sync |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
169 |
+ ld [%o0],%o4 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
170 |
+ add %o4,%g4,%g4 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
171 |
+ .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
|
172 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
173 |
+ subcc %o2,1,%o2 ! --max |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
174 |
+ bz .Ldone2 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
175 |
+ nop |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
176 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
177 |
+ .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
|
178 |
+ 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
|
179 |
+ mov %o4,%o5 ! lasttick=tick |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
180 |
+ cmp %g4,%g5 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
181 |
+ mov %g4,%g5 ! lastdiff=diff |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
182 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
183 |
+ .word 0x83408000 !rd %ccr,%g1 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
184 |
+ 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
|
185 |
+ 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
|
186 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
187 |
+ 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
|
188 |
+ bnz .Loop2 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
189 |
+ 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
|
190 |
+ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
191 |
+.Ldone2: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
192 |
+ srl %o1,2,%o1 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
193 |
+ retl |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
194 |
+ sub %o3,%o1,%o0 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
195 |
+.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
|
196 |
+.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
|
197 |
+ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
198 |
.section ".init",#alloc,#execinstr |
1752
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1641
diff
changeset
|
199 |
call solaris_locking_setup |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
200 |
nop |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
201 |
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
|
202 |
=================================================================== |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
203 |
diff -ru openssl-1.0.1e/crypto/sparcv9cap.c openssl-1.0.1e/crypto/sparcv9cap.c |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
204 |
--- openssl-1.0.1e/crypto/sparcv9cap.c 2011-05-24 17:02:24.000000000 -0700 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
205 |
+++ openssl-1.0.1e/crypto/sparcv9cap.c 2011-07-27 10:48:17.817470000 -0700 |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
206 |
@@ -4,34 +4,58 @@ |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
207 |
#include <setjmp.h> |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
208 |
#include <signal.h> |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
209 |
#include <sys/time.h> |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
210 |
+#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
|
211 |
#include <openssl/bn.h> |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
212 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
213 |
-#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
|
214 |
-#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
|
215 |
-#define SPARCV9_VIS1 (1<<2) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
216 |
-#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
|
217 |
-#define SPARCV9_FMADD (1<<4) /* reserved for SPARC64 V */ |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
218 |
+#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
|
219 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
220 |
+#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
|
221 |
+__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
|
222 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
223 |
#ifndef _BOOT |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
224 |
-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
|
225 |
+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
|
226 |
#else |
c7701e5ea3fc
16700305 wanboot MMU Miss trap only in secure standalone phase build 17+
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1267
diff
changeset
|
227 |
-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
|
228 |
+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
|
229 |
#endif |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
230 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
231 |
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
|
232 |
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
|
233 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
234 |
+ 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
|
235 |
+ 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
|
236 |
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
|
237 |
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
|
238 |
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
|
239 |
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
|
240 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
241 |
- if (num >= 8 && !(num & 1) && |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
242 |
- (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
|
243 |
- (SPARCV9_PREFER_FPU | SPARCV9_VIS1)) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
244 |
- 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
|
245 |
- else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
246 |
- 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
|
247 |
+ if (!(num&1) && num>=6) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
248 |
+ 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
|
249 |
+ (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
|
250 |
+ (CFR_MONTMUL|CFR_MONTSQR)) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
251 |
+ { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
252 |
+ typedef int (*bn_mul_mont_f)(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
253 |
+ int bn_mul_mont_t4_8(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
254 |
+ int bn_mul_mont_t4_16(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
255 |
+ int bn_mul_mont_t4_24(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
256 |
+ int bn_mul_mont_t4_32(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_ULONG *np,const BN_ULONG *n0); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
257 |
+ 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
|
258 |
+ 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
|
259 |
+ 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
|
260 |
+ 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
|
261 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
262 |
+ 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
|
263 |
+ /* retry once and fall back */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
264 |
+ 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
|
265 |
+ 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
|
266 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
267 |
+ 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
|
268 |
+ 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
|
269 |
+ else if (num>=8 && |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
270 |
+ (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
|
271 |
+ (SPARCV9_PREFER_FPU|SPARCV9_VIS1)) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
272 |
+ 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
|
273 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
274 |
+ 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
|
275 |
} |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
276 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
277 |
unsigned long _sparcv9_rdtick(void); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
278 |
@@ -39,11 +63,18 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
279 |
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
|
280 |
void _sparcv9_vis2_probe(void); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
281 |
void _sparcv9_fmadd_probe(void); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
282 |
+unsigned long _sparcv9_rdcfr(void); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
283 |
+void _sparcv9_vis3_probe(void); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
284 |
+unsigned long _sparcv9_random(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
|
285 |
+#ifndef _BOOT |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
286 |
+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
|
287 |
+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
|
288 |
+#endif |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
289 |
|
1294
c7701e5ea3fc
16700305 wanboot MMU Miss trap only in secure standalone phase build 17+
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1267
diff
changeset
|
290 |
#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
|
291 |
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
|
292 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
293 |
- 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
|
294 |
+ 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
|
295 |
#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
|
296 |
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
|
297 |
#else |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
298 |
@@ -52,6 +83,24 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
299 |
else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
300 |
return _sparcv9_rdtick(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
301 |
} |
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
|
302 |
+ |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
303 |
+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
|
304 |
+{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
305 |
+ 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
|
306 |
+ SPARCV9_BLK) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
307 |
+ 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
|
308 |
+ else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
309 |
+ return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
310 |
+} |
1294
c7701e5ea3fc
16700305 wanboot MMU Miss trap only in secure standalone phase build 17+
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1267
diff
changeset
|
311 |
+ |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
312 |
+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
|
313 |
+{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
314 |
+ 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
|
315 |
+ SPARCV9_BLK) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
316 |
+ 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
|
317 |
+ else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
318 |
+ return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
319 |
+} |
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
|
320 |
#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
|
321 |
|
1294
c7701e5ea3fc
16700305 wanboot MMU Miss trap only in secure standalone phase build 17+
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1267
diff
changeset
|
322 |
#if defined(_BOOT) |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
323 |
@@ -61,7 +110,7 @@ |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
324 |
*/ |
1294
c7701e5ea3fc
16700305 wanboot MMU Miss trap only in secure standalone phase build 17+
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1267
diff
changeset
|
325 |
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
|
326 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
327 |
- OPENSSL_sparcv9cap_P = SPARCV9_VIS1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
328 |
+ 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
|
329 |
} |
1294
c7701e5ea3fc
16700305 wanboot MMU Miss trap only in secure standalone phase build 17+
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1267
diff
changeset
|
330 |
|
c7701e5ea3fc
16700305 wanboot MMU Miss trap only in secure standalone phase build 17+
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1267
diff
changeset
|
331 |
#elif 0 && defined(__sun) && defined(__SVR4) |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
332 |
@@ -90,11 +139,11 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
333 |
if (!strcmp(name, "SUNW,UltraSPARC") || |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
334 |
/* covers II,III,IV */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
335 |
!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
|
336 |
- 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
|
337 |
+ 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
|
338 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
339 |
/* %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
|
340 |
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
|
341 |
- 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
|
342 |
+ 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
|
343 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
344 |
return DI_WALK_TERMINATE; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
345 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
346 |
@@ -100,7 +149,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
347 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
348 |
/* 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
|
349 |
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
|
350 |
- 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
|
351 |
+ 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
|
352 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
353 |
return DI_WALK_TERMINATE; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
354 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
355 |
@@ -119,7 +168,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
356 |
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
|
357 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
358 |
if ((e = getenv("OPENSSL_sparcv9cap"))) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
359 |
- 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
|
360 |
+ 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
|
361 |
return; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
362 |
} |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
363 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
364 |
@@ -126,15 +175,15 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
365 |
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
|
366 |
if (strcmp(si, "sun4v")) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
367 |
/* 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
|
368 |
- 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
|
369 |
+ 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
|
370 |
} |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
371 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
372 |
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
|
373 |
if (strstr(si, "+vis")) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
374 |
- OPENSSL_sparcv9cap_P |= SPARCV9_VIS1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
375 |
+ 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
|
376 |
if (strstr(si, "+vis2")) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
377 |
- OPENSSL_sparcv9cap_P |= SPARCV9_VIS2; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
378 |
- 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
|
379 |
+ 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
|
380 |
+ 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
|
381 |
return; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
382 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
383 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
384 |
@@ -204,12 +253,14 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
385 |
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
|
386 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
387 |
if ((e = getenv("OPENSSL_sparcv9cap"))) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
388 |
- 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
|
389 |
+ 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
|
390 |
+ if ((e = strchr(e, ':'))) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
391 |
+ 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
|
392 |
return; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
393 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
394 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
395 |
/* Initial value, fits UltraSPARC-I&II... */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
396 |
- OPENSSL_sparcv9cap_P = SPARCV9_PREFER_FPU | SPARCV9_TICK_PRIVILEGED; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
397 |
+ OPENSSL_sparcv9cap_P[0] = SPARCV9_PREFER_FPU | SPARCV9_TICK_PRIVILEGED; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
398 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
399 |
sigfillset(&all_masked); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
400 |
sigdelset(&all_masked, SIGILL); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
401 |
@@ -232,18 +283,18 @@ |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
402 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
403 |
if (sigsetjmp(common_jmp, 1) == 0) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
404 |
_sparcv9_rdtick(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
405 |
- 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
|
406 |
+ 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
|
407 |
} |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
408 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
409 |
if (sigsetjmp(common_jmp, 1) == 0) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
410 |
_sparcv9_vis1_probe(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
411 |
- OPENSSL_sparcv9cap_P |= SPARCV9_VIS1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
412 |
+ 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
|
413 |
/* detect UltraSPARC-Tx, see sparccpud.S for details... */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
414 |
if (_sparcv9_vis1_instrument() >= 12) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
415 |
- OPENSSL_sparcv9cap_P &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
416 |
+ OPENSSL_sparcv9cap_P[0] &= ~(SPARCV9_VIS1 | SPARCV9_PREFER_FPU); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
417 |
else { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
418 |
_sparcv9_vis2_probe(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
419 |
- OPENSSL_sparcv9cap_P |= SPARCV9_VIS2; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
420 |
+ 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
|
421 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
422 |
} |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
423 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
424 |
@@ -249,13 +300,50 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
425 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
426 |
if (sigsetjmp(common_jmp, 1) == 0) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
427 |
_sparcv9_fmadd_probe(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
428 |
- OPENSSL_sparcv9cap_P |= SPARCV9_FMADD; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
429 |
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_FMADD; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
430 |
} |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
431 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
432 |
+ /* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
433 |
+ * 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
|
434 |
+ * 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
|
435 |
+ */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
436 |
+ if (sigsetjmp(common_jmp,1) == 0) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
437 |
+ _sparcv9_vis3_probe(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
438 |
+ 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
|
439 |
+ } |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
440 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
441 |
+ if (sigsetjmp(common_jmp,1) == 0) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
442 |
+ (void)_sparcv9_random(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
443 |
+ OPENSSL_sparcv9cap_P[0] |= SPARCV9_RANDOM; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
444 |
+ } |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
445 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
446 |
+ /* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
447 |
+ * In wait for better solution _sparcv9_rdcfr is masked by |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
448 |
+ * VIS3 flag, because it goes to uninterruptable endless |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
449 |
+ * loop on UltraSPARC II running Solaris. Things might be |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
450 |
+ * different on Linux... |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
451 |
+ */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
452 |
+ 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
|
453 |
+ sigsetjmp(common_jmp, 1) == 0) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
454 |
+ OPENSSL_sparcv9cap_P[1] = (unsigned int)_sparcv9_rdcfr(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
455 |
+ } |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
456 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
457 |
sigaction(SIGBUS, &bus_oact, NULL); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
458 |
sigaction(SIGILL, &ill_oact, NULL); |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
459 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
460 |
sigprocmask(SIG_SETMASK, &oset, NULL); |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
461 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
462 |
+ if (sizeof(size_t) == 8) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
463 |
+ 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
|
464 |
+#ifdef __linux |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
465 |
+ else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
466 |
+ { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
467 |
+ int ret = syscall(340); |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
468 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
469 |
+ if (ret >= 0 && ret & 1) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
470 |
+ 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
|
471 |
+ } |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
472 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
473 |
} |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
474 |
|
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
475 |
#endif |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
476 |
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
|
477 |
=================================================================== |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
478 |
diff -ru openssl-1.0.1e/crypto/md5/Makefile openssl-1.0.1e/crypto/md5/Makefile |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
479 |
--- 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
|
480 |
+++ 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
|
481 |
@@ -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
|
482 |
$(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
|
483 |
$(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
|
484 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
485 |
+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
|
486 |
+ $(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
|
487 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
488 |
files: |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
489 |
$(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
|
490 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
491 |
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
|
492 |
=================================================================== |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
493 |
diff -ru openssl-1.0.1e/crypto/md5/md5_locl.h openssl-1.0.1e/crypto/md5/md5_locl.h |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
494 |
--- openssl-1.0.1e/crypto/md5/md5_locl.h 2011-05-24 17:02:24.000000000 -0700 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
495 |
+++ openssl-1.0.1e/crypto/md5/md5_locl.h 2011-07-27 10:48:17.817470000 -0700 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
496 |
@@ -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
|
497 |
# 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
|
498 |
# 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
|
499 |
# 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
|
500 |
+# 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
|
501 |
+# 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
|
502 |
# endif |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
503 |
#endif |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
504 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
505 |
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
|
506 |
=================================================================== |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
507 |
diff -ru openssl-1.0.1e/crypto/sha/Makefile openssl-1.0.1e/crypto/sha/Makefile |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
508 |
--- openssl-1.0.1e/crypto/sha/Makefile 2011-05-24 17:02:24.000000000 -0700 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
509 |
+++ openssl-1.0.1e/crypto/sha/Makefile 2011-07-27 10:48:17.817470000 -0700 |
1641
2fc479afcf70
18024740 problem in UTILITY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1401
diff
changeset
|
510 |
@@ -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
|
511 |
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
|
512 |
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
|
513 |
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
|
514 |
-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
|
515 |
-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
|
516 |
-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
|
517 |
+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
|
518 |
+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
|
519 |
+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
|
520 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
521 |
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
|
522 |
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
|
523 |
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
|
524 |
=================================================================== |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
525 |
diff -ru openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
526 |
--- openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl 2011-05-24 17:02:24.000000000 -0700 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
527 |
+++ openssl-1.0.1e/crypto/sha/asm/sha1-sparcv9.pl 2011-07-27 10:48:17.817470000 -0700 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
528 |
@@ -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
|
529 |
# 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
|
530 |
# 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
|
531 |
# 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
|
532 |
+# |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
533 |
+# 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
|
534 |
# ==================================================================== |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
535 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
536 |
# 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
|
537 |
@@ -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
|
538 |
# 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
|
539 |
# 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
|
540 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
541 |
+# 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
|
542 |
+# 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
|
543 |
+# 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
|
544 |
+# socket. |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
545 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
546 |
$bits=32; |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
547 |
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
|
548 |
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
|
549 |
@@ -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
|
550 |
.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
|
551 |
___ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
552 |
$code.=<<___; |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
553 |
+#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
|
554 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
555 |
.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
|
556 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
557 |
+#ifdef __PIC__ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
558 |
+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
|
559 |
+#endif |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
560 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
561 |
.align 32 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
562 |
.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
|
563 |
sha1_block_data_order: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
564 |
+ 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
|
565 |
+ 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
|
566 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
567 |
+ andcc %g1, CFR_SHA1, %g0 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
568 |
+ be .Lsoftware |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
569 |
+ nop |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
570 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
571 |
+ 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
|
572 |
+ ld [%o0 + 0x04], %f1 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
573 |
+ ld [%o0 + 0x08], %f2 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
574 |
+ andcc %o1, 0x7, %g0 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
575 |
+ ld [%o0 + 0x0c], %f3 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
576 |
+ bne,pn %icc, .Lhwunaligned |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
577 |
+ 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
|
578 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
579 |
+.Lhw_loop: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
580 |
+ ldd [%o1 + 0x00], %f8 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
581 |
+ ldd [%o1 + 0x08], %f10 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
582 |
+ ldd [%o1 + 0x10], %f12 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
583 |
+ ldd [%o1 + 0x18], %f14 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
584 |
+ ldd [%o1 + 0x20], %f16 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
585 |
+ ldd [%o1 + 0x28], %f18 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
586 |
+ ldd [%o1 + 0x30], %f20 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
587 |
+ 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
|
588 |
+ ldd [%o1 + 0x38], %f22 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
589 |
+ 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
|
590 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
591 |
+ .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
|
592 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
593 |
+ 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
|
594 |
+ nop |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
595 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
596 |
+.Lhwfinish: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
597 |
+ 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
|
598 |
+ st %f1, [%o0 + 0x04] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
599 |
+ st %f2, [%o0 + 0x08] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
600 |
+ st %f3, [%o0 + 0x0c] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
601 |
+ retl |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
602 |
+ 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
|
603 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
604 |
+.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
|
605 |
+.Lhwunaligned: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
606 |
+ 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
|
607 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
608 |
+ 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
|
609 |
+.Lhwunaligned_loop: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
610 |
+ ldd [%o1 + 0x08], %f12 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
611 |
+ ldd [%o1 + 0x10], %f14 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
612 |
+ ldd [%o1 + 0x18], %f16 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
613 |
+ ldd [%o1 + 0x20], %f18 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
614 |
+ ldd [%o1 + 0x28], %f20 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
615 |
+ ldd [%o1 + 0x30], %f22 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
616 |
+ ldd [%o1 + 0x38], %f24 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
617 |
+ 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
|
618 |
+ ldd [%o1 + 0x40], %f26 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
619 |
+ 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
|
620 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
621 |
+ faligndata %f10, %f12, %f8 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
622 |
+ faligndata %f12, %f14, %f10 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
623 |
+ faligndata %f14, %f16, %f12 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
624 |
+ faligndata %f16, %f18, %f14 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
625 |
+ faligndata %f18, %f20, %f16 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
626 |
+ faligndata %f20, %f22, %f18 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
627 |
+ faligndata %f22, %f24, %f20 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
628 |
+ 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
|
629 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
630 |
+ .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
|
631 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
632 |
+ 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
|
633 |
+ 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
|
634 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
635 |
+ ba .Lhwfinish |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
636 |
+ nop |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
637 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
638 |
+.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
|
639 |
+.Lsoftware: |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
640 |
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
|
641 |
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
|
642 |
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
|
643 |
@@ -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
|
644 |
.align 4 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
645 |
___ |
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 |
-$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
|
648 |
-print $code; |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
649 |
+# 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
|
650 |
+# 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
|
651 |
+# 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
|
652 |
+# 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
|
653 |
+# 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
|
654 |
+sub unvis { |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
655 |
+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
|
656 |
+my $ref,$opf; |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
657 |
+my %visopf = ( "faligndata" => 0x048, |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
658 |
+ "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
|
659 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
660 |
+ $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
|
661 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
662 |
+ if ($opf=$visopf{$mnemonic}) { |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
663 |
+ foreach ($rs1,$rs2,$rd) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
664 |
+ 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
|
665 |
+ $_=$1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
666 |
+ if ($1>=32) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
667 |
+ return $ref if ($1&1); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
668 |
+ # 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
|
669 |
+ $_=($1|$1>>5)&31; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
670 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
671 |
+ } |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
672 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
673 |
+ 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
|
674 |
+ 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
|
675 |
+ $ref; |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
676 |
+ } else { |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
677 |
+ 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
|
678 |
+ } |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
679 |
+} |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
680 |
+sub unalignaddr { |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
681 |
+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
|
682 |
+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
|
683 |
+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
|
684 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
685 |
+ foreach ($rs1,$rs2,$rd) { |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
686 |
+ 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
|
687 |
+ 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
|
688 |
+ } |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
689 |
+ 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
|
690 |
+ 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
|
691 |
+ $ref; |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
692 |
+} |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
693 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
694 |
+foreach (split("\n",$code)) { |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
695 |
+ 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
|
696 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
697 |
+ s/\b(f[^\s]*)\s+(%f[0-9]{1,2}),\s*(%f[0-9]{1,2}),\s*(%f[0-9]{1,2})/ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
698 |
+ &unvis($1,$2,$3,$4) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
699 |
+ /ge; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
700 |
+ 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
|
701 |
+ &unalignaddr($1,$2,$3,$4) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
702 |
+ /ge; |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
703 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
704 |
+ 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
|
705 |
+} |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
706 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
707 |
close STDOUT; |
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 |
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
|
710 |
=================================================================== |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
711 |
diff -ru openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
712 |
--- openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl 2011-05-24 17:02:24.000000000 -0700 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
713 |
+++ openssl-1.0.1e/crypto/sha/asm/sha512-sparcv9.pl 2011-07-27 10:48:17.817470000 -0700 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
714 |
@@ -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
|
715 |
# 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
|
716 |
# 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
|
717 |
# 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
|
718 |
+# |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
719 |
+# 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
|
720 |
# ==================================================================== |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
721 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
722 |
# 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
|
723 |
@@ -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
|
724 |
# 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
|
725 |
# 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
|
726 |
# 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
|
727 |
+# |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
728 |
+# 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
|
729 |
+# 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
|
730 |
+# 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
|
731 |
+# ~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
|
732 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
733 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
734 |
$bits=32; |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
735 |
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
|
736 |
@@ -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
|
737 |
.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
|
738 |
___ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
739 |
$code.=<<___; |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
740 |
+#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
|
741 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
742 |
.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
|
743 |
|
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
744 |
.align 64 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
745 |
@@ -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
|
746 |
} |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
747 |
$code.=<<___; |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
748 |
.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
|
749 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
750 |
+#ifdef __PIC__ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
751 |
+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
|
752 |
+#endif |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
753 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
754 |
.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
|
755 |
+.align 32 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
756 |
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
|
757 |
+ 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
|
758 |
+ 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
|
759 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
760 |
+ 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
|
761 |
+ be .Lsoftware |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
762 |
+ nop |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
763 |
+___ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
764 |
+$code.=<<___ if ($SZ==8); # SHA512 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
765 |
+ 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
|
766 |
+ ldd [%o0 + 0x08], %f2 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
767 |
+ ldd [%o0 + 0x10], %f4 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
768 |
+ ldd [%o0 + 0x18], %f6 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
769 |
+ ldd [%o0 + 0x20], %f8 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
770 |
+ ldd [%o0 + 0x28], %f10 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
771 |
+ andcc %o1, 0x7, %g0 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
772 |
+ ldd [%o0 + 0x30], %f12 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
773 |
+ bne,pn %icc, .Lhwunaligned |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
774 |
+ 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
|
775 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
776 |
+.Lhwaligned_loop: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
777 |
+ ldd [%o1 + 0x00], %f16 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
778 |
+ ldd [%o1 + 0x08], %f18 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
779 |
+ ldd [%o1 + 0x10], %f20 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
780 |
+ ldd [%o1 + 0x18], %f22 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
781 |
+ ldd [%o1 + 0x20], %f24 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
782 |
+ ldd [%o1 + 0x28], %f26 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
783 |
+ ldd [%o1 + 0x30], %f28 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
784 |
+ ldd [%o1 + 0x38], %f30 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
785 |
+ ldd [%o1 + 0x40], %f32 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
786 |
+ ldd [%o1 + 0x48], %f34 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
787 |
+ ldd [%o1 + 0x50], %f36 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
788 |
+ ldd [%o1 + 0x58], %f38 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
789 |
+ ldd [%o1 + 0x60], %f40 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
790 |
+ ldd [%o1 + 0x68], %f42 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
791 |
+ ldd [%o1 + 0x70], %f44 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
792 |
+ 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
|
793 |
+ ldd [%o1 + 0x78], %f46 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
794 |
+ 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
|
795 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
796 |
+ .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
|
797 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
798 |
+ 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
|
799 |
+ nop |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
800 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
801 |
+.Lhwfinish: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
802 |
+ 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
|
803 |
+ std %f2, [%o0 + 0x08] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
804 |
+ std %f4, [%o0 + 0x10] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
805 |
+ std %f6, [%o0 + 0x18] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
806 |
+ std %f8, [%o0 + 0x20] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
807 |
+ std %f10, [%o0 + 0x28] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
808 |
+ std %f12, [%o0 + 0x30] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
809 |
+ retl |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
810 |
+ 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
|
811 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
812 |
+.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
|
813 |
+.Lhwunaligned: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
814 |
+ 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
|
815 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
816 |
+ 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
|
817 |
+.Lhwunaligned_loop: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
818 |
+ ldd [%o1 + 0x08], %f20 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
819 |
+ ldd [%o1 + 0x10], %f22 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
820 |
+ ldd [%o1 + 0x18], %f24 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
821 |
+ ldd [%o1 + 0x20], %f26 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
822 |
+ ldd [%o1 + 0x28], %f28 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
823 |
+ ldd [%o1 + 0x30], %f30 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
824 |
+ ldd [%o1 + 0x38], %f32 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
825 |
+ ldd [%o1 + 0x40], %f34 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
826 |
+ ldd [%o1 + 0x48], %f36 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
827 |
+ ldd [%o1 + 0x50], %f38 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
828 |
+ ldd [%o1 + 0x58], %f40 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
829 |
+ ldd [%o1 + 0x60], %f42 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
830 |
+ ldd [%o1 + 0x68], %f44 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
831 |
+ ldd [%o1 + 0x70], %f46 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
832 |
+ ldd [%o1 + 0x78], %f48 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
833 |
+ 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
|
834 |
+ ldd [%o1 + 0x80], %f50 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
835 |
+ 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
|
836 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
837 |
+ faligndata %f18, %f20, %f16 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
838 |
+ faligndata %f20, %f22, %f18 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
839 |
+ faligndata %f22, %f24, %f20 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
840 |
+ faligndata %f24, %f26, %f22 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
841 |
+ faligndata %f26, %f28, %f24 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
842 |
+ faligndata %f28, %f30, %f26 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
843 |
+ faligndata %f30, %f32, %f28 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
844 |
+ faligndata %f32, %f34, %f30 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
845 |
+ faligndata %f34, %f36, %f32 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
846 |
+ faligndata %f36, %f38, %f34 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
847 |
+ faligndata %f38, %f40, %f36 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
848 |
+ faligndata %f40, %f42, %f38 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
849 |
+ faligndata %f42, %f44, %f40 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
850 |
+ faligndata %f44, %f46, %f42 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
851 |
+ faligndata %f46, %f48, %f44 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
852 |
+ 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
|
853 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
854 |
+ .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
|
855 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
856 |
+ 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
|
857 |
+ 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
|
858 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
859 |
+ ba .Lhwfinish |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
860 |
+ nop |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
861 |
+___ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
862 |
+$code.=<<___ if ($SZ==4); # SHA256 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
863 |
+ ld [%o0 + 0x00], %f0 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
864 |
+ ld [%o0 + 0x04], %f1 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
865 |
+ ld [%o0 + 0x08], %f2 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
866 |
+ ld [%o0 + 0x0c], %f3 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
867 |
+ ld [%o0 + 0x10], %f4 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
868 |
+ ld [%o0 + 0x14], %f5 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
869 |
+ andcc %o1, 0x7, %g0 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
870 |
+ ld [%o0 + 0x18], %f6 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
871 |
+ bne,pn %icc, .Lhwunaligned |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
872 |
+ 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
|
873 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
874 |
+.Lhwloop: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
875 |
+ ldd [%o1 + 0x00], %f8 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
876 |
+ ldd [%o1 + 0x08], %f10 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
877 |
+ ldd [%o1 + 0x10], %f12 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
878 |
+ ldd [%o1 + 0x18], %f14 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
879 |
+ ldd [%o1 + 0x20], %f16 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
880 |
+ ldd [%o1 + 0x28], %f18 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
881 |
+ ldd [%o1 + 0x30], %f20 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
882 |
+ 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
|
883 |
+ ldd [%o1 + 0x38], %f22 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
884 |
+ 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
|
885 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
886 |
+ .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
|
887 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
888 |
+ 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
|
889 |
+ nop |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
890 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
891 |
+.Lhwfinish: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
892 |
+ 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
|
893 |
+ st %f1, [%o0 + 0x04] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
894 |
+ st %f2, [%o0 + 0x08] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
895 |
+ st %f3, [%o0 + 0x0c] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
896 |
+ st %f4, [%o0 + 0x10] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
897 |
+ st %f5, [%o0 + 0x14] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
898 |
+ st %f6, [%o0 + 0x18] |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
899 |
+ retl |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
900 |
+ 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
|
901 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
902 |
+.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
|
903 |
+.Lhwunaligned: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
904 |
+ 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
|
905 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
906 |
+ 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
|
907 |
+.Lhwunaligned_loop: |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
908 |
+ ldd [%o1 + 0x08], %f12 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
909 |
+ ldd [%o1 + 0x10], %f14 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
910 |
+ ldd [%o1 + 0x18], %f16 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
911 |
+ ldd [%o1 + 0x20], %f18 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
912 |
+ ldd [%o1 + 0x28], %f20 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
913 |
+ ldd [%o1 + 0x30], %f22 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
914 |
+ ldd [%o1 + 0x38], %f24 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
915 |
+ 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
|
916 |
+ ldd [%o1 + 0x40], %f26 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
917 |
+ 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
|
918 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
919 |
+ faligndata %f10, %f12, %f8 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
920 |
+ faligndata %f12, %f14, %f10 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
921 |
+ faligndata %f14, %f16, %f12 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
922 |
+ faligndata %f16, %f18, %f14 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
923 |
+ faligndata %f18, %f20, %f16 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
924 |
+ faligndata %f20, %f22, %f18 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
925 |
+ faligndata %f22, %f24, %f20 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
926 |
+ 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
|
927 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
928 |
+ .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
|
929 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
930 |
+ 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
|
931 |
+ 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
|
932 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
933 |
+ ba .Lhwfinish |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
934 |
+ nop |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
935 |
+___ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
936 |
+$code.=<<___; |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
937 |
+.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
|
938 |
+.Lsoftware: |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
939 |
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
|
940 |
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
|
941 |
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
|
942 |
@@ -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
|
943 |
.align 4 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
944 |
___ |
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 |
-$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
|
947 |
-print $code; |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
948 |
+# 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
|
949 |
+# 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
|
950 |
+# 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
|
951 |
+# 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
|
952 |
+# 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
|
953 |
+sub unvis { |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
954 |
+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
|
955 |
+my $ref,$opf; |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
956 |
+my %visopf = ( "faligndata" => 0x048, |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
957 |
+ "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
|
958 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
959 |
+ $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
|
960 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
961 |
+ if ($opf=$visopf{$mnemonic}) { |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
962 |
+ foreach ($rs1,$rs2,$rd) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
963 |
+ 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
|
964 |
+ $_=$1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
965 |
+ if ($1>=32) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
966 |
+ return $ref if ($1&1); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
967 |
+ # 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
|
968 |
+ $_=($1|$1>>5)&31; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
969 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
970 |
+ } |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
971 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
972 |
+ 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
|
973 |
+ 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
|
974 |
+ $ref; |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
975 |
+ } else { |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
976 |
+ 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
|
977 |
+ } |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
978 |
+} |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
979 |
+sub unalignaddr { |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
980 |
+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
|
981 |
+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
|
982 |
+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
|
983 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
984 |
+ foreach ($rs1,$rs2,$rd) { |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
985 |
+ 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
|
986 |
+ 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
|
987 |
+ } |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
988 |
+ 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
|
989 |
+ 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
|
990 |
+ $ref; |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
991 |
+} |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
992 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
993 |
+foreach (split("\n",$code)) { |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
994 |
+ 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
|
995 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
996 |
+ s/\b(f[^\s]*)\s+(%f[0-9]{1,2}),\s*(%f[0-9]{1,2}),\s*(%f[0-9]{1,2})/ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
997 |
+ &unvis($1,$2,$3,$4) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
998 |
+ /ge; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
999 |
+ 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
|
1000 |
+ &unalignaddr($1,$2,$3,$4) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1001 |
+ /ge; |
1267
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
1002 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1003 |
+ 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
|
1004 |
+} |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
1005 |
+ |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
1006 |
close STDOUT; |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1007 |
Index: crypto/des/Makefile |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1008 |
=================================================================== |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1009 |
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
|
1010 |
--- a/crypto/des/Makefile |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1011 |
+++ b/crypto/des/Makefile |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1012 |
@@ -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
|
1013 |
|
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1014 |
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
|
1015 |
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
|
1016 |
+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
|
1017 |
+ $(PERL) asm/dest4-sparcv9.pl $(CFLAGS) > $@ |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1018 |
|
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1019 |
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
|
1020 |
$(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
|
1021 |
Index: crypto/evp/e_des.c |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1022 |
=================================================================== |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1023 |
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
|
1024 |
--- a/crypto/evp/e_des.c |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1025 |
+++ b/crypto/evp/e_des.c |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1026 |
@@ -65,6 +65,30 @@ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1027 |
# include <openssl/des.h> |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1028 |
# include <openssl/rand.h> |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1029 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1030 |
+typedef struct { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1031 |
+ 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
|
1032 |
+ union { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1033 |
+ 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
|
1034 |
+ } stream; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1035 |
+} EVP_DES_KEY; |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1036 |
+ |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1037 |
+#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
|
1038 |
+/* ---------^^^ 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
|
1039 |
+ * 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
|
1040 |
+ */ |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1041 |
+#include "sparc_arch.h" |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1042 |
+ |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1043 |
+extern unsigned int OPENSSL_sparcv9cap_P[]; |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1044 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1045 |
+#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
|
1046 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1047 |
+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
|
1048 |
+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
|
1049 |
+ 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
|
1050 |
+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
|
1051 |
+ 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
|
1052 |
+#endif |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1053 |
+ |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1054 |
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
|
1055 |
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
|
1056 |
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
|
1057 |
@@ -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
|
1058 |
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
|
1059 |
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
|
1060 |
{ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1061 |
+ 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
|
1062 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1063 |
+ if (dat->stream.cbc) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1064 |
+ (*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
|
1065 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1066 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1067 |
while (inl >= EVP_MAXCHUNK) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1068 |
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
|
1069 |
(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
|
1070 |
@@ -179,16 +209,16 @@ |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1071 |
return 1; |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1072 |
} |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1073 |
|
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1074 |
-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
|
1075 |
+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
|
1076 |
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
|
1077 |
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
|
1078 |
|
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1079 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1080 |
-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
|
1081 |
+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
|
1082 |
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
|
1083 |
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
|
1084 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1085 |
-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
|
1086 |
+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
|
1087 |
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
|
1088 |
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
|
1089 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1090 |
@@ -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
|
1091 |
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
|
1092 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1093 |
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
|
1094 |
+ 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
|
1095 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1096 |
+ dat->stream.cbc = NULL; |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1097 |
+#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
|
1098 |
+ if (SPARC_DES_CAPABLE) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1099 |
+ 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
|
1100 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1101 |
+ 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
|
1102 |
+ 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
|
1103 |
+ 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
|
1104 |
+ des_t4_cbc_decrypt; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1105 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1106 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1107 |
+ } |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1108 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1109 |
# ifdef EVP_CHECK_DES_KEY |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1110 |
- 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
|
1111 |
+ 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
|
1112 |
return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1113 |
# else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1114 |
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
|
1115 |
Index: crypto/evp/e_des3.c |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1116 |
=================================================================== |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1117 |
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
|
1118 |
--- a/crypto/evp/e_des3.c |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1119 |
+++ 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
|
1120 |
@@ -65,6 +65,32 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1121 |
# include <openssl/des.h> |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1122 |
# include <openssl/rand.h> |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1123 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1124 |
+typedef struct { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1125 |
+ 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
|
1126 |
+ union { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1127 |
+ 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
|
1128 |
+ } stream; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1129 |
+} DES_EDE_KEY; |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1130 |
+#define ks1 ks.ks[0] |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1131 |
+#define ks2 ks.ks[1] |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1132 |
+#define ks3 ks.ks[2] |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1133 |
+ |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1134 |
+#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
|
1135 |
+/* ---------^^^ 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
|
1136 |
+ * assembler support was in general requested... */ |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1137 |
+#include "sparc_arch.h" |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1138 |
+ |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1139 |
+extern unsigned int OPENSSL_sparcv9cap_P[]; |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1140 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1141 |
+#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
|
1142 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1143 |
+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
|
1144 |
+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
|
1145 |
+ 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
|
1146 |
+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
|
1147 |
+ 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
|
1148 |
+#endif |
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1149 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1150 |
# ifndef OPENSSL_FIPS |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1151 |
|
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1152 |
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
|
1153 |
@@ -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
|
1154 |
|
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1155 |
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
|
1156 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1157 |
-typedef struct { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1158 |
- 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
|
1159 |
- 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
|
1160 |
- 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
|
1161 |
-} DES_EDE_KEY; |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1162 |
- |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1163 |
# 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
|
1164 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1165 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1166 |
@@ -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
|
1167 |
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
|
1168 |
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
|
1169 |
{ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1170 |
+ 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
|
1171 |
# ifdef KSSL_DEBUG |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1172 |
{ |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1173 |
int i; |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1174 |
@@ -134,11 +155,15 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1175 |
fprintf(stderr, "\n"); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1176 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1177 |
# endif /* KSSL_DEBUG */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1178 |
+ if (dat->stream.cbc) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1179 |
+ (*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
|
1180 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1181 |
+ } |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1182 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1183 |
while (inl >= EVP_MAXCHUNK) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1184 |
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
|
1185 |
- &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
|
1186 |
- &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
|
1187 |
- ctx->encrypt); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1188 |
+ &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
|
1189 |
+ (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
|
1190 |
inl -= EVP_MAXCHUNK; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1191 |
in += EVP_MAXCHUNK; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1192 |
out += EVP_MAXCHUNK; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1193 |
@@ -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
|
1194 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1195 |
if (inl) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1196 |
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
|
1197 |
- &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
|
1198 |
- &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
|
1199 |
- ctx->encrypt); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1200 |
+ &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
|
1201 |
+ (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
|
1202 |
return 1; |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1203 |
} |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1204 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1205 |
@@ -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
|
1206 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1207 |
|
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1208 |
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
|
1209 |
- 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
|
1210 |
- 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
|
1211 |
+ 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
|
1212 |
+ 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
|
1213 |
+ des3_ctrl) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1214 |
# 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
|
1215 |
# 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
|
1216 |
# 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
|
1217 |
# 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
|
1218 |
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
|
1219 |
- 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
|
1220 |
- 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
|
1221 |
+ 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
|
1222 |
+ 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
|
1223 |
+ des3_ctrl) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1224 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1225 |
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
|
1226 |
- 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
|
1227 |
- EVP_CIPHER_set_asn1_iv, |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1228 |
- 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
|
1229 |
+ 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
|
1230 |
+ 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
|
1231 |
+ des3_ctrl) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1232 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1233 |
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
|
1234 |
- 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
|
1235 |
- EVP_CIPHER_set_asn1_iv, |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1236 |
- 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
|
1237 |
+ 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
|
1238 |
+ 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
|
1239 |
+ des3_ctrl) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1240 |
|
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1241 |
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
|
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 |
+ dat->stream.cbc = NULL; |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1248 |
+#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
|
1249 |
+ if (SPARC_DES_CAPABLE) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1250 |
+ 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
|
1251 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1252 |
+ 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
|
1253 |
+ 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
|
1254 |
+ 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
|
1255 |
+ 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
|
1256 |
+ 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
|
1257 |
+ des_t4_ede3_cbc_decrypt; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1258 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1259 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1260 |
+ } |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1261 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1262 |
# ifdef EVP_CHECK_DES_KEY |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1263 |
- 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
|
1264 |
- ! !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
|
1265 |
+ 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
|
1266 |
+ !! 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
|
1267 |
return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1268 |
# else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1269 |
- 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
|
1270 |
- 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
|
1271 |
+ 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
|
1272 |
+ 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
|
1273 |
# endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1274 |
- 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
|
1275 |
+ 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
|
1276 |
return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1277 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1278 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1279 |
@@ -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
|
1280 |
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
|
1281 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1282 |
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
|
1283 |
+ 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
|
1284 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1285 |
# ifdef KSSL_DEBUG |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1286 |
{ |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1287 |
int i; |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1288 |
@@ -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
|
1289 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1290 |
# endif /* KSSL_DEBUG */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1291 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1292 |
+ dat->stream.cbc = NULL; |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1293 |
+#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
|
1294 |
+ if (SPARC_DES_CAPABLE) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1295 |
+ 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
|
1296 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1297 |
+ 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
|
1298 |
+ 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
|
1299 |
+ 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
|
1300 |
+ 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
|
1301 |
+ 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
|
1302 |
+ des_t4_ede3_cbc_decrypt; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1303 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1304 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1305 |
+ } |
1373
2fd83bee8884
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1341
diff
changeset
|
1306 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1307 |
# ifdef EVP_CHECK_DES_KEY |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1308 |
- 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
|
1309 |
- || 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
|
1310 |
- || 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
|
1311 |
+ 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
|
1312 |
+ || 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
|
1313 |
+ || 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
|
1314 |
return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1315 |
# else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1316 |
- 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
|
1317 |
- 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
|
1318 |
- 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
|
1319 |
+ 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
|
1320 |
+ 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
|
1321 |
+ 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
|
1322 |
# endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1323 |
return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1324 |
} |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1325 |
Index: openssl/crypto/bn/Makefile |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1326 |
=================================================================== |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1327 |
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
|
1328 |
--- 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
|
1329 |
+++ 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
|
1330 |
@@ -77,6 +77,12 @@ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1331 |
$(PERL) asm/sparcv9a-mont.pl $(CFLAGS) > $@ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1332 |
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
|
1333 |
$(PERL) asm/sparcv9-mont.pl $(CFLAGS) > $@ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1334 |
+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
|
1335 |
+ $(PERL) asm/vis3-mont.pl $(CFLAGS) > $@ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1336 |
+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
|
1337 |
+ $(PERL) asm/sparct4-mont.pl $(CFLAGS) > $@ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1338 |
+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
|
1339 |
+ $(PERL) asm/sparcv9-gf2m.pl $(CFLAGS) > $@ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1340 |
|
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1341 |
bn-mips3.o: asm/mips3.s |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1342 |
@if [ "$(CC)" = "gcc" ]; then \ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1343 |
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
|
1344 |
=================================================================== |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1345 |
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
|
1346 |
--- 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
|
1347 |
+++ 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
|
1348 |
@@ -122,8 +122,15 @@ |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1349 |
# ifndef alloca |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1350 |
# define alloca(s) __builtin_alloca((s)) |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1351 |
# endif |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1352 |
+#else |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1353 |
+#include <alloca.h> |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1354 |
#endif |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1355 |
|
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1356 |
+#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
|
1357 |
+# include "sparc_arch.h" |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1358 |
+extern unsigned int OPENSSL_sparcv9cap_P[]; |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1359 |
+#endif |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1360 |
+ |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1361 |
/* 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
|
1362 |
#define TABLE_SIZE 32 |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1363 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1364 |
@@ -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
|
1365 |
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
|
1366 |
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
|
1367 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1368 |
+#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
|
1369 |
+ 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
|
1370 |
+ 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
|
1371 |
+ 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
|
1372 |
+ 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
|
1373 |
+ r->top = j; |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1374 |
+#else |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1375 |
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
|
1376 |
goto err; |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1377 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1378 |
for (;;) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1379 |
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
|
1380 |
if (!start) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1381 |
@@ -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
|
1382 |
if (wstart < 0) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1383 |
break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1384 |
} |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1385 |
+#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
|
1386 |
+ 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
|
1387 |
+ 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
|
1388 |
+ 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
|
1389 |
+ 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
|
1390 |
+ val[0]->d[i] = 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1391 |
+ val[0]->top = j; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1392 |
+ 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
|
1393 |
+ goto err; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1394 |
+ } else |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1395 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1396 |
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
|
1397 |
goto err; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1398 |
ret = 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1399 |
@@ -526,6 +552,26 @@ err: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1400 |
return (ret); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1401 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1402 |
|
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1403 |
+#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
|
1404 |
+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
|
1405 |
+ BN_ULONG ret = 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1406 |
+ int wordpos; |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1407 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1408 |
+ wordpos = bitpos / BN_BITS2; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1409 |
+ bitpos %= BN_BITS2; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1410 |
+ 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
|
1411 |
+ 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
|
1412 |
+ if (bitpos) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1413 |
+ ret >>= bitpos; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1414 |
+ if (++wordpos < a->top) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1415 |
+ 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
|
1416 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1417 |
+ } |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1418 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1419 |
+ return ret & BN_MASK2; |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1420 |
+} |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1421 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1422 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1423 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1424 |
* 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
|
1425 |
* 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
|
1426 |
@@ -594,6 +640,9 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1427 |
int powerbufLen = 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1428 |
unsigned char *powerbuf = NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1429 |
BIGNUM tmp, am; |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1430 |
+#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
|
1431 |
+ unsigned int t4=0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1432 |
+#endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1433 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1434 |
bn_check_top(a); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1435 |
bn_check_top(p); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1436 |
@@ -628,10 +677,18 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1437 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1438 |
/* 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
|
1439 |
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
|
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 (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
|
1442 |
+ (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
|
1443 |
+ (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
|
1444 |
+ window=5; |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1445 |
+ else |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1446 |
+#endif |
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1447 |
#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
|
1448 |
if (window == 6 && bits <= 1024) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1449 |
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
|
1450 |
#endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1451 |
+ (void) 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1452 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1453 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1454 |
* 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
|
1455 |
@@ -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
|
1456 |
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
|
1457 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1458 |
/* 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
|
1459 |
-#if 1 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1460 |
- 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
|
1461 |
- goto err; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1462 |
-#else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1463 |
+#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
|
1464 |
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
|
1465 |
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
|
1466 |
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
|
1467 |
tmp.top = top; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1468 |
+#else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1469 |
+ 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
|
1470 |
+ goto err; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1471 |
#endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1472 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1473 |
/* 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
|
1474 |
@@ -689,6 +746,122 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1475 |
} 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
|
1476 |
goto err; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1477 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1478 |
+#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
|
1479 |
+ if (t4) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1480 |
+ 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
|
1481 |
+ 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
|
1482 |
+ 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
|
1483 |
+ 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
|
1484 |
+ 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
|
1485 |
+ 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
|
1486 |
+ 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
|
1487 |
+ 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
|
1488 |
+ 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
|
1489 |
+ 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
|
1490 |
+ 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
|
1491 |
+ 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
|
1492 |
+ 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
|
1493 |
+ 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
|
1494 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1495 |
+ 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
|
1496 |
+ 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
|
1497 |
+ 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
|
1498 |
+ 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
|
1499 |
+ 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
|
1500 |
+ 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
|
1501 |
+ 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
|
1502 |
+ 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
|
1503 |
+ 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
|
1504 |
+ 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
|
1505 |
+ 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
|
1506 |
+ 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
|
1507 |
+ 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
|
1508 |
+ 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
|
1509 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1510 |
+ 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
|
1511 |
+ 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
|
1512 |
+ 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
|
1513 |
+ 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
|
1514 |
+ 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
|
1515 |
+ 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
|
1516 |
+ 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
|
1517 |
+ 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
|
1518 |
+ 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
|
1519 |
+ 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
|
1520 |
+ void *table,size_t power); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1521 |
+ 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
|
1522 |
+ void *table,size_t power); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1523 |
+ 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
|
1524 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1525 |
+ 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
|
1526 |
+ 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
|
1527 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1528 |
+ /* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1529 |
+ * 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
|
1530 |
+ * [in BN_DEBUG[_DEBUG] build]... |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1531 |
+ */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1532 |
+ 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
|
1533 |
+ 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
|
1534 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1535 |
+ 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
|
1536 |
+ 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
|
1537 |
+ 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
|
1538 |
+ !(*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
|
1539 |
+ 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
|
1540 |
+ 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
|
1541 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1542 |
+ 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
|
1543 |
+ /* 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
|
1544 |
+ 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
|
1545 |
+ !(*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
|
1546 |
+ 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
|
1547 |
+ 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
|
1548 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1549 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1550 |
+ /* switch to 64-bit domain */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1551 |
+ 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
|
1552 |
+ top /= 2; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1553 |
+ 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
|
1554 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1555 |
+ bits--; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1556 |
+ 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
|
1557 |
+ 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
|
1558 |
+ 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
|
1559 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1560 |
+ /* 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
|
1561 |
+ * significant bits. |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1562 |
+ */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1563 |
+ while (bits >= 0) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1564 |
+ if (bits < stride) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1565 |
+ stride = bits+1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1566 |
+ bits -= stride; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1567 |
+ 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
|
1568 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1569 |
+ 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
|
1570 |
+ continue; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1571 |
+ /* retry once and fall back */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1572 |
+ 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
|
1573 |
+ continue; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1574 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1575 |
+ bits += stride-5; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1576 |
+ wvalue >>= stride-5; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1577 |
+ wvalue &= 31; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1578 |
+ 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
|
1579 |
+ 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
|
1580 |
+ 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
|
1581 |
+ 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
|
1582 |
+ 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
|
1583 |
+ 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
|
1584 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1585 |
+ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1586 |
+ 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
|
1587 |
+ top *= 2; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1588 |
+ /* back to 32-bit domain */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1589 |
+ tmp.top=top; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1590 |
+ bn_correct_top(&tmp); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1591 |
+ 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
|
1592 |
+ } else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1593 |
+#endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1594 |
#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
|
1595 |
if (window == 5 && top > 1) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1596 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1597 |
@@ -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
|
1598 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1599 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1600 |
/* 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
|
1601 |
+#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
|
1602 |
+ 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
|
1603 |
+ 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
|
1604 |
+ 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
|
1605 |
+ am.d[i] = 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1606 |
+ 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
|
1607 |
+ goto err; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1608 |
+ } else |
1382
3515c1afdfc8
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1373
diff
changeset
|
1609 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1610 |
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
|
1611 |
goto err; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1612 |
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
|
1613 |
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
|
1614 |
=================================================================== |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
1615 |
diff -ru openssl-1.0.1e/apps/spped.c openssl-1.0.1e/apps/speed.c |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
1616 |
--- openssl-1.0.1e/apps/speed.c 2011-05-24 17:02:24.000000000 -0700 |
3d7359ef8168
15824599 SUNBT7206151 T4 hash should be embedded in the OpenSSL upstream src
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
diff
changeset
|
1617 |
+++ openssl-1.0.1e/apps/spped.c 2011-07-27 10:48:17.817470000 -0700 |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1618 |
@@ -1586,8 +1586,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1619 |
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
|
1620 |
Time_F(START); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1621 |
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
|
1622 |
- 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
|
1623 |
- 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
|
1624 |
+ MD5(buf, lengths[j], md5); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1625 |
d = Time_F(STOP); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1626 |
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
|
1627 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1628 |
@@ -1622,8 +1621,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1629 |
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
|
1630 |
Time_F(START); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1631 |
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
|
1632 |
- 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
|
1633 |
- EVP_sha1(), NULL); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1634 |
+ SHA1(buf, lengths[j], sha); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1635 |
d = Time_F(STOP); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1636 |
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
|
1637 |
} |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1638 |
Index: openssl/crypto/aes/Makefile |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1639 |
=================================================================== |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1640 |
--- 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
|
1641 |
+++ 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
|
1642 |
@@ -69,6 +69,9 @@ |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1643 |
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
|
1644 |
$(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1645 |
|
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1646 |
+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
|
1647 |
+ $(PERL) asm/aest4-sparcv9.pl $(CFLAGS) > $@ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1648 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1649 |
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
|
1650 |
$(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
|
1651 |
|
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1652 |
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
|
1653 |
=================================================================== |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1654 |
--- 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
|
1655 |
+++ 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
|
1656 |
@@ -56,12 +58,11 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1657 |
# include <assert.h> |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1658 |
# include <openssl/aes.h> |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1659 |
# include "evp_locl.h" |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1660 |
-# ifndef OPENSSL_FIPS |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1661 |
# include "modes_lcl.h" |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1662 |
# include <openssl/rand.h> |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1663 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1664 |
typedef struct { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1665 |
- AES_KEY ks; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1666 |
+ 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
|
1667 |
block128_f block; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1668 |
union { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1669 |
cbc128_f cbc; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1670 |
@@ -70,7 +69,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1671 |
} EVP_AES_KEY; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1672 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1673 |
typedef struct { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1674 |
- 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
|
1675 |
+ 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
|
1676 |
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
|
1677 |
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
|
1678 |
GCM128_CONTEXT gcm; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1679 |
@@ -83,7 +82,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1680 |
} EVP_AES_GCM_CTX; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1681 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1682 |
typedef struct { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1683 |
- 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
|
1684 |
+ 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
|
1685 |
XTS128_CONTEXT xts; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1686 |
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
|
1687 |
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
|
1688 |
@@ -92,7 +91,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1689 |
} EVP_AES_XTS_CTX; |
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 |
typedef struct { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1692 |
- 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
|
1693 |
+ 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
|
1694 |
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
|
1695 |
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
|
1696 |
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
|
1697 |
@@ -155,7 +154,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1698 |
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
|
1699 |
defined(__INTEL__) ) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1700 |
|
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1701 |
-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
|
1702 |
+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
|
1703 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1704 |
# ifdef VPAES_ASM |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1705 |
# 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
|
1706 |
@@ -297,7 +296,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1707 |
if (!iv && !key) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1708 |
return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1709 |
if (key) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1710 |
- 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
|
1711 |
+ 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
|
1712 |
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
|
1713 |
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
|
1714 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1715 |
@@ -336,17 +335,17 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1716 |
if (key) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1717 |
/* 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
|
1718 |
if (enc) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1719 |
- 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
|
1720 |
+ 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
|
1721 |
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
|
1722 |
xctx->stream = aesni_xts_encrypt; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1723 |
} else { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1724 |
- 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
|
1725 |
+ 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
|
1726 |
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
|
1727 |
xctx->stream = aesni_xts_decrypt; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1728 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1729 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1730 |
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
|
1731 |
- 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
|
1732 |
+ 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
|
1733 |
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
|
1734 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1735 |
xctx->xts.key1 = &xctx->ks1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1736 |
@@ -371,7 +370,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1737 |
if (!iv && !key) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1738 |
return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1739 |
if (key) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1740 |
- 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
|
1741 |
+ 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
|
1742 |
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
|
1743 |
&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
|
1744 |
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
|
1745 |
@@ -432,6 +431,364 @@ |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1746 |
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
|
1747 |
{ 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
|
1748 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1749 |
+#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
|
1750 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1751 |
+#include "sparc_arch.h" |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1752 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1753 |
+extern unsigned int OPENSSL_sparcv9cap_P[]; |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1754 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1755 |
+#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
|
1756 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1757 |
+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
|
1758 |
+ AES_KEY *ks); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1759 |
+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
|
1760 |
+ AES_KEY *ks); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1761 |
+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
|
1762 |
+ const AES_KEY *key); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1763 |
+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
|
1764 |
+ const AES_KEY *key); |
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 |
+ * 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
|
1767 |
+ * 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
|
1768 |
+ * 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
|
1769 |
+ * 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
|
1770 |
+ * 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
|
1771 |
+ * 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
|
1772 |
+ * 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
|
1773 |
+ * 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
|
1774 |
+ * 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
|
1775 |
+ */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1776 |
+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
|
1777 |
+ 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
|
1778 |
+ unsigned char *ivec); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1779 |
+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
|
1780 |
+ 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
|
1781 |
+ unsigned char *ivec); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1782 |
+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
|
1783 |
+ 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
|
1784 |
+ unsigned char *ivec); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1785 |
+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
|
1786 |
+ 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
|
1787 |
+ unsigned char *ivec); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1788 |
+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
|
1789 |
+ 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
|
1790 |
+ unsigned char *ivec); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1791 |
+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
|
1792 |
+ 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
|
1793 |
+ unsigned char *ivec); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1794 |
+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
|
1795 |
+ 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
|
1796 |
+ unsigned char *ivec); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1797 |
+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
|
1798 |
+ 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
|
1799 |
+ unsigned char *ivec); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1800 |
+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
|
1801 |
+ 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
|
1802 |
+ unsigned char *ivec); |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1803 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1804 |
+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
|
1805 |
+ 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
|
1806 |
+{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1807 |
+ int ret, mode, bits; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1808 |
+ 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
|
1809 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1810 |
+ 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
|
1811 |
+ bits = ctx->key_len*8; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1812 |
+ 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
|
1813 |
+ ret = 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1814 |
+ 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
|
1815 |
+ 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
|
1816 |
+ switch (bits) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1817 |
+ case 128: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1818 |
+ 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
|
1819 |
+ (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
|
1820 |
+ NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1821 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1822 |
+ case 192: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1823 |
+ 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
|
1824 |
+ (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
|
1825 |
+ NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1826 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1827 |
+ case 256: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1828 |
+ 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
|
1829 |
+ (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
|
1830 |
+ NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1831 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1832 |
+ default: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1833 |
+ ret = -1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1834 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1835 |
+ } else { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1836 |
+ ret = 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1837 |
+ 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
|
1838 |
+ 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
|
1839 |
+ switch (bits) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1840 |
+ case 128: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1841 |
+ 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
|
1842 |
+ 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
|
1843 |
+ 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
|
1844 |
+ 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
|
1845 |
+ else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1846 |
+ dat->stream.cbc = NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1847 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1848 |
+ case 192: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1849 |
+ 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
|
1850 |
+ 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
|
1851 |
+ 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
|
1852 |
+ 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
|
1853 |
+ else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1854 |
+ dat->stream.cbc = NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1855 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1856 |
+ case 256: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1857 |
+ 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
|
1858 |
+ 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
|
1859 |
+ 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
|
1860 |
+ 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
|
1861 |
+ else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1862 |
+ dat->stream.cbc = NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1863 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1864 |
+ default: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1865 |
+ ret = -1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1866 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1867 |
+ } |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1868 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1869 |
+ if (ret < 0) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1870 |
+ 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
|
1871 |
+ return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1872 |
+ } |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1873 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1874 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1875 |
+} |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1876 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1877 |
+#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
|
1878 |
+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
|
1879 |
+ 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
|
1880 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1881 |
+#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
|
1882 |
+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
|
1883 |
+ 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
|
1884 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1885 |
+#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
|
1886 |
+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
|
1887 |
+ 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
|
1888 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1889 |
+#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
|
1890 |
+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
|
1891 |
+ 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
|
1892 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1893 |
+#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
|
1894 |
+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
|
1895 |
+ 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
|
1896 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1897 |
+#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
|
1898 |
+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
|
1899 |
+ 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
|
1900 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1901 |
+#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
|
1902 |
+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
|
1903 |
+ 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
|
1904 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1905 |
+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
|
1906 |
+ 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
|
1907 |
+{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1908 |
+ 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
|
1909 |
+ if (!iv && !key) |
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 |
+ if (key) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1912 |
+ 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
|
1913 |
+ 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
|
1914 |
+ 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
|
1915 |
+ (block128_f)aes_t4_encrypt); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1916 |
+ switch (bits) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1917 |
+ case 128: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1918 |
+ 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
|
1919 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1920 |
+ case 192: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1921 |
+ 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
|
1922 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1923 |
+ case 256: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1924 |
+ 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
|
1925 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1926 |
+ default: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1927 |
+ return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1928 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1929 |
+ /* 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
|
1930 |
+ * saved IV. |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1931 |
+ */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1932 |
+ 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
|
1933 |
+ iv = gctx->iv; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1934 |
+ if (iv) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1935 |
+ 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
|
1936 |
+ gctx->iv_set = 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1937 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1938 |
+ gctx->key_set = 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1939 |
+ } else { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1940 |
+ /* 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
|
1941 |
+ if (gctx->key_set) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1942 |
+ 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
|
1943 |
+ else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1944 |
+ 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
|
1945 |
+ gctx->iv_set = 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1946 |
+ gctx->iv_gen = 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1947 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1948 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1949 |
+} |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1950 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1951 |
+#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
|
1952 |
+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
|
1953 |
+ 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
|
1954 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1955 |
+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
|
1956 |
+ 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
|
1957 |
+{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1958 |
+ 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
|
1959 |
+ if (!iv && !key) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1960 |
+ return 1; |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1961 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1962 |
+ if (key) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1963 |
+ 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
|
1964 |
+ /* 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
|
1965 |
+ if (enc) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1966 |
+ 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
|
1967 |
+ 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
|
1968 |
+#if 0 /* not yet */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1969 |
+ switch (bits) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1970 |
+ case 128: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1971 |
+ 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
|
1972 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1973 |
+ case 192: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1974 |
+ 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
|
1975 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1976 |
+ case 256: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1977 |
+ 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
|
1978 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1979 |
+ default: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1980 |
+ return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1981 |
+ } |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
1982 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1983 |
+ } else { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1984 |
+ 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
|
1985 |
+ 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
|
1986 |
+#if 0 /* not yet */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1987 |
+ switch (bits) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1988 |
+ case 128: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1989 |
+ 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
|
1990 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1991 |
+ case 192: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1992 |
+ 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
|
1993 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1994 |
+ case 256: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1995 |
+ 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
|
1996 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1997 |
+ default: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1998 |
+ return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
1999 |
+ } |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2000 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2001 |
+ } |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2002 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2003 |
+ 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
|
2004 |
+ 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
|
2005 |
+ 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
|
2006 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2007 |
+ xctx->xts.key1 = &xctx->ks1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2008 |
+ } |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2009 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2010 |
+ if (iv) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2011 |
+ xctx->xts.key2 = &xctx->ks2; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2012 |
+ memcpy(ctx->iv, iv, 16); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2013 |
+ } |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2014 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2015 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2016 |
+} |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2017 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2018 |
+#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
|
2019 |
+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
|
2020 |
+ 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
|
2021 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2022 |
+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
|
2023 |
+ 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
|
2024 |
+{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2025 |
+ 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
|
2026 |
+ if (!iv && !key) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2027 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2028 |
+ if (key) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2029 |
+ 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
|
2030 |
+ 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
|
2031 |
+ 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
|
2032 |
+ &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
|
2033 |
+#if 0 /* not yet */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2034 |
+ switch (bits) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2035 |
+ case 128: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2036 |
+ 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
|
2037 |
+ (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
|
2038 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2039 |
+ case 192: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2040 |
+ 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
|
2041 |
+ (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
|
2042 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2043 |
+ case 256: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2044 |
+ 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
|
2045 |
+ (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
|
2046 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2047 |
+ default: |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2048 |
+ return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2049 |
+ } |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2050 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2051 |
+ cctx->key_set = 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2052 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2053 |
+ if (iv) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2054 |
+ 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
|
2055 |
+ cctx->iv_set = 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2056 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2057 |
+ return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2058 |
+} |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2059 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2060 |
+#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
|
2061 |
+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
|
2062 |
+ 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
|
2063 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2064 |
+#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
|
2065 |
+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
|
2066 |
+ 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
|
2067 |
+ flags|EVP_CIPH_##MODE##_MODE, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2068 |
+ aes_t4_init_key, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2069 |
+ aes_t4_##mode##_cipher, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2070 |
+ NULL, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2071 |
+ sizeof(EVP_AES_KEY), \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2072 |
+ NULL,NULL,NULL,NULL }; \ |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2073 |
+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
|
2074 |
+ nid##_##keylen##_##nmode,blocksize, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2075 |
+ keylen/8,ivlen, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2076 |
+ flags|EVP_CIPH_##MODE##_MODE, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2077 |
+ aes_init_key, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2078 |
+ aes_##mode##_cipher, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2079 |
+ NULL, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2080 |
+ sizeof(EVP_AES_KEY), \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2081 |
+ NULL,NULL,NULL,NULL }; \ |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2082 |
+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
|
2083 |
+{ 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
|
2084 |
+ |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2085 |
+#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
|
2086 |
+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
|
2087 |
+ nid##_##keylen##_##mode,blocksize, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2088 |
+ (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
|
2089 |
+ flags|EVP_CIPH_##MODE##_MODE, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2090 |
+ aes_t4_##mode##_init_key, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2091 |
+ aes_t4_##mode##_cipher, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2092 |
+ aes_##mode##_cleanup, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2093 |
+ sizeof(EVP_AES_##MODE##_CTX), \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2094 |
+ 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
|
2095 |
+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
|
2096 |
+ nid##_##keylen##_##mode,blocksize, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2097 |
+ (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
|
2098 |
+ flags|EVP_CIPH_##MODE##_MODE, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2099 |
+ aes_##mode##_init_key, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2100 |
+ aes_##mode##_cipher, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2101 |
+ aes_##mode##_cleanup, \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2102 |
+ sizeof(EVP_AES_##MODE##_CTX), \ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2103 |
+ 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
|
2104 |
+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
|
2105 |
+{ 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
|
2106 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2107 |
# else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2108 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2109 |
# 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
|
2110 |
@@ -480,7 +837,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2111 |
&& !enc) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2112 |
# ifdef BSAES_CAPABLE |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2113 |
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
|
2114 |
- 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
|
2115 |
+ 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
|
2116 |
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
|
2117 |
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
|
2118 |
} else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2119 |
@@ -487,7 +844,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2120 |
# endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2121 |
# ifdef VPAES_CAPABLE |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2122 |
if (VPAES_CAPABLE) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2123 |
- 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
|
2124 |
+ 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
|
2125 |
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
|
2126 |
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
|
2127 |
(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
|
2128 |
@@ -494,7 +851,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2129 |
} else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2130 |
# endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2131 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2132 |
- 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
|
2133 |
+ 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
|
2134 |
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
|
2135 |
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
|
2136 |
(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
|
2137 |
@@ -508,7 +865,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2138 |
# endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2139 |
# ifdef VPAES_CAPABLE |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2140 |
if (VPAES_CAPABLE) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2141 |
- 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
|
2142 |
+ 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
|
2143 |
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
|
2144 |
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
|
2145 |
(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
|
2146 |
@@ -515,7 +872,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2147 |
} else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2148 |
# endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2149 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2150 |
- 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
|
2151 |
+ 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
|
2152 |
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
|
2153 |
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
|
2154 |
(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
|
2155 |
@@ -810,7 +1167,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2156 |
do { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2157 |
# ifdef BSAES_CAPABLE |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2158 |
if (BSAES_CAPABLE) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2159 |
- 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
|
2160 |
+ 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
|
2161 |
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
|
2162 |
(block128_f) AES_encrypt); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2163 |
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
|
2164 |
@@ -819,7 +1176,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2165 |
# endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2166 |
# ifdef VPAES_CAPABLE |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2167 |
if (VPAES_CAPABLE) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2168 |
- 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
|
2169 |
+ 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
|
2170 |
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
|
2171 |
(block128_f) vpaes_encrypt); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2172 |
gctx->ctr = NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2173 |
@@ -828,7 +1185,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2174 |
# endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2175 |
(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
|
2176 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2177 |
- 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
|
2178 |
+ 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
|
2179 |
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
|
2180 |
(block128_f) AES_encrypt); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2181 |
# ifdef AES_CTR_ASM |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2182 |
@@ -1049,15 +1406,15 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2183 |
# ifdef VPAES_CAPABLE |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2184 |
if (VPAES_CAPABLE) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2185 |
if (enc) { |
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 * 4, &xctx->ks1); |
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 * 4, &xctx->ks1.ks); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2188 |
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
|
2189 |
} else { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2190 |
- 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
|
2191 |
+ 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
|
2192 |
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
|
2193 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2194 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2195 |
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
|
2196 |
- 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
|
2197 |
+ 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
|
2198 |
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
|
2199 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2200 |
xctx->xts.key1 = &xctx->ks1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2201 |
@@ -1067,15 +1424,15 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2202 |
(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
|
2203 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2204 |
if (enc) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2205 |
- 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
|
2206 |
+ 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
|
2207 |
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
|
2208 |
} else { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2209 |
- 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
|
2210 |
+ 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
|
2211 |
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
|
2212 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2213 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2214 |
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
|
2215 |
- 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
|
2216 |
+ 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
|
2217 |
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
|
2218 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2219 |
xctx->xts.key1 = &xctx->ks1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2220 |
@@ -1196,7 +1553,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2221 |
do { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2222 |
# ifdef VPAES_CAPABLE |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2223 |
if (VPAES_CAPABLE) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2224 |
- 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
|
2225 |
+ 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
|
2226 |
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
|
2227 |
&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
|
2228 |
cctx->str = NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2229 |
@@ -1204,7 +1561,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2230 |
break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2231 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2232 |
# endif |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2233 |
- 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
|
2234 |
+ 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
|
2235 |
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
|
2236 |
&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
|
2237 |
cctx->str = NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2238 |
@@ -1285,5 +1642,4 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2239 |
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
|
2240 |
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
|
2241 |
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
|
2242 |
-# endif |
1341
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2243 |
#endif |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2244 |
Index: openssl/crypto/evp/evp.h |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2245 |
=================================================================== |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2246 |
--- 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
|
2247 |
+++ 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
|
2248 |
@@ -1325,6 +1325,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2249 |
# 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
|
2250 |
# 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
|
2251 |
# 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
|
2252 |
+# 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
|
2253 |
# 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
|
2254 |
# 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
|
2255 |
# 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
|
2256 |
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
|
2257 |
=================================================================== |
af3d6ef22d65
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1294
diff
changeset
|
2258 |
--- 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
|
2259 |
+++ 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
|
2260 |
@@ -73,6 +73,7 @@ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1884
diff
changeset
|
2261 |
{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
|
2262 |
{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
|
2263 |
{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
|
2264 |
+ {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
|
2265 |
{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
|
2266 |
{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
|
2267 |
{ERR_FUNC(EVP_F_ALG_MODULE_INIT), "ALG_MODULE_INIT"}, |