author | Misaki Miyashita <Misaki.Miyashita@Oracle.COM> |
Fri, 23 Sep 2016 12:03:45 -0700 | |
changeset 6964 | c3b11711b2b9 |
parent 6860 | fbbec9b86c26 |
permissions | -rw-r--r-- |
1752
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
1 |
# |
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
2 |
# This patch file makes the changes neccessary to build wanboot-openssl.o |
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
3 |
# binary. This is Solaris-specific: not suitable for upstream. |
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
4 |
# |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
5 |
--- openssl-1.0.0g/Makefile.org 2010-01-27 08:06:58.000000000 -0800 |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
6 |
+++ openssl-1.0.0g-1/Makefile.org 2012-03-26 03:04:08.440194448 -0700 |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
7 |
@@ -139,7 +139,13 @@ |
1158
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
8 |
|
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
9 |
BASEADDR= |
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
10 |
|
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
11 |
+# For wanboot, we only need crypto and ssl. |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
12 |
+# 'apps' are not patched to work in stand-alone environment anyway. |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
13 |
+ifeq ($(PLATFORM), solaris64-sparcv9-cc-sunw-wanboot) |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
14 |
+DIRS= crypto ssl |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
15 |
+else |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
16 |
DIRS= crypto ssl engines apps test tools |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
17 |
+endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
18 |
ENGDIRS= ccgost |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
19 |
SHLIBDIRS= crypto ssl |
1158
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
20 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
21 |
--- openssl-1.0.0g/Makefile 2012-01-18 05:42:28.000000000 -0800 |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
22 |
+++ openssl-1.0.0g-1/Makefile 2012-03-26 03:03:59.170540344 -0700 |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
23 |
@@ -138,7 +138,13 @@ |
1158
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
24 |
|
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
25 |
BASEADDR=0xFB00000 |
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
26 |
|
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
27 |
+# For wanboot, we only need crypto and ssl. |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
28 |
+# 'apps' are not patched to work in stand-alone environment anyway. |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
29 |
+ifeq ($(PLATFORM), solaris64-sparcv9-cc-sunw-wanboot) |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
30 |
+DIRS= crypto ssl |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
31 |
+else |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
32 |
DIRS= crypto ssl engines apps test tools |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
33 |
+endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
34 |
ENGDIRS= ccgost |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
35 |
SHLIBDIRS= crypto ssl |
1158
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
36 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
37 |
--- openssl-1.0.0e/crypto/cryptlib.c 2011-06-22 08:39:00.000000000 -0700 |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
38 |
+++ openssl-1.0.0e/crypto/cryptlib.c 2011-12-12 06:17:45.422476900 -0800 |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
39 |
@@ -421,11 +421,13 @@ |
1752
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
40 |
static void solaris_locking_callback(int mode, int type, const char *file, |
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
41 |
int line) |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
42 |
{ |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
43 |
+#ifndef _BOOT |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
44 |
if (mode & CRYPTO_LOCK) { |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
45 |
(void) pthread_mutex_lock(&solaris_openssl_locks[type]); |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
46 |
} else { |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
47 |
(void) pthread_mutex_unlock(&solaris_openssl_locks[type]); |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
48 |
} |
1752
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
49 |
+#endif |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
50 |
} |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
51 |
|
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
52 |
/* |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
53 |
@@ -434,6 +436,7 @@ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
54 |
static struct CRYPTO_dynlock_value * |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
55 |
solaris_dynlock_create(const char *file, int line) |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
56 |
{ |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
57 |
+#ifndef _BOOT |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
58 |
int ret; |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
59 |
pthread_mutex_t *dynlock; |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
60 |
|
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
61 |
@@ -446,6 +449,9 @@ |
6619
57ad7bed64ee
24377801 solaris_dynlock_create() should check for a ret val of 0 from pthread_mutex_init
akshat.harit@oracle.com <akshat.harit@oracle.com>
parents:
6247
diff
changeset
|
62 |
OPENSSL_assert(ret == 0); |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
63 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
64 |
return ((struct CRYPTO_dynlock_value *)dynlock); |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
65 |
+#else |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
66 |
+ return (NULL); |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
67 |
+#endif |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
68 |
} |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
69 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
70 |
static void |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
71 |
@@ -452,6 +458,7 @@ |
4616
eeaf5255cb21
21416447 Upgrade OpenSSL version to 1.0.1p
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4370
diff
changeset
|
72 |
solaris_dynlock_lock(int mode, struct CRYPTO_dynlock_value *dynlock, |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
73 |
const char *file, int line) |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
74 |
{ |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
75 |
+#ifndef _BOOT |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
76 |
int ret; |
4616
eeaf5255cb21
21416447 Upgrade OpenSSL version to 1.0.1p
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4370
diff
changeset
|
77 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
78 |
if (mode & CRYPTO_LOCK) { |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
79 |
@@ -461,6 +468,7 @@ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
80 |
} |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
81 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
82 |
OPENSSL_assert(ret == 0); |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
83 |
+#endif |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
84 |
} |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
85 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
86 |
static void |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
87 |
@@ -467,23 +475,28 @@ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
88 |
solaris_dynlock_destroy(struct CRYPTO_dynlock_value *dynlock, |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
89 |
const char *file, int line) |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
90 |
{ |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
91 |
+#ifndef _BOOT |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
92 |
int ret; |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
93 |
ret = pthread_mutex_destroy((pthread_mutex_t *)dynlock); |
6619
57ad7bed64ee
24377801 solaris_dynlock_create() should check for a ret val of 0 from pthread_mutex_init
akshat.harit@oracle.com <akshat.harit@oracle.com>
parents:
6247
diff
changeset
|
94 |
OPENSSL_assert(ret == 0); |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
95 |
+#endif |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
96 |
} |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
97 |
|
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
98 |
|
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
99 |
static void solaris_fork_prep(void) |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
100 |
{ |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
101 |
+#ifndef _BOOT |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
102 |
int i; |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
103 |
|
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
104 |
for (i = 0; i < CRYPTO_NUM_LOCKS; i++) { |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
105 |
(void) pthread_mutex_lock(&solaris_openssl_locks[i]); |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
106 |
} |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
107 |
+#endif |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
108 |
} |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
109 |
|
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
110 |
static void solaris_fork_post(void) |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
111 |
{ |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
112 |
+#ifndef _BOOT |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
113 |
int i; |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
114 |
|
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
115 |
for (i = CRYPTO_NUM_LOCKS - 1; i >= 0; i--) { |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
116 |
@@ -494,6 +507,7 @@ |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
117 |
OPENSSL_assert(dynlock_lock_callback == solaris_dynlock_lock); |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
118 |
OPENSSL_assert(dynlock_destroy_callback == solaris_dynlock_destroy); |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
119 |
OPENSSL_assert(locking_callback == solaris_locking_callback); |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
120 |
+#endif |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
121 |
} |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
122 |
|
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
123 |
/* |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
124 |
@@ -517,6 +531,12 @@ |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
125 |
locking_callback = solaris_locking_callback; |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
126 |
} |
1752
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
127 |
|
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
128 |
+ /* |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
129 |
+ * pthread_* can't be used in wanboot. |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
130 |
+ * wanboot needs not be thread-safe and mutexes and locking callback |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
131 |
+ * function will not be setup for wanboot. |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
132 |
+ */ |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
133 |
+#ifndef _BOOT |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
134 |
/* allocate and initialize locks needed by OpenSSL */ |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
135 |
solaris_openssl_locks = |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
136 |
OPENSSL_malloc(sizeof (pthread_mutex_t) * CRYPTO_NUM_LOCKS); |
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
137 |
@@ -530,6 +550,7 @@ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
138 |
} |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
139 |
|
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
140 |
(void) pthread_atfork(solaris_fork_prep, solaris_fork_post, solaris_fork_post); |
1752
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
141 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
142 |
} |
1752
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
143 |
|
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
144 |
|
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
145 |
@@ -1104,6 +1120,12 @@ |
5171
4e8b3c0ea78c
22307393 Upgrade OpenSSL version to 1.0.2e
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4822
diff
changeset
|
146 |
MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONERROR); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
147 |
} |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
148 |
#else |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
149 |
+/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
150 |
+ * Solaris libsa.a used for WAN boot doesn't provide for vfprintf(). Since |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
151 |
+ * OPENSSL_showfatal() is not used anywhere else then here we can safely use |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
152 |
+ * the code from 0.9.7d version. |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
153 |
+ */ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
154 |
+#ifndef _BOOT |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
155 |
void OPENSSL_showfatal(const char *fmta, ...) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
156 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
157 |
va_list ap; |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
158 |
@@ -1112,6 +1134,7 @@ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
159 |
vfprintf(stderr, fmta, ap); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
160 |
va_end(ap); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
161 |
} |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
162 |
+#endif /* _BOOT */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
163 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
164 |
int OPENSSL_isservice(void) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
165 |
{ |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
166 |
@@ -1121,9 +1144,15 @@ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
167 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
168 |
void OpenSSLDie(const char *file, int line, const char *assertion) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
169 |
{ |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
170 |
+#ifndef _BOOT |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
171 |
OPENSSL_showfatal |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
172 |
("%s(%d): OpenSSL internal error, assertion failed: %s\n", file, line, |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
173 |
assertion); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
174 |
+#else |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
175 |
+ fprintf(stderr, |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
176 |
+ "%s(%d): OpenSSL internal error, assertion failed: %s\n", |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
177 |
+ file,line,assertion); |
6860
fbbec9b86c26
20358335 memory leak in libcrypto
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6619
diff
changeset
|
178 |
+#endif |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
179 |
#if !defined(_WIN32) || defined(__CYGWIN__) |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
180 |
abort(); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
181 |
#else |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
182 |
--- openssl-1.0.0e/crypto/err/err_all.c 2009-08-09 07:58:05.000000000 -0700 |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
183 |
+++ openssl-1.0.0e_patched/crypto/err/err_all.c 2011-12-13 05:22:01.205351400 -0800 |
1158
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
184 |
@@ -148,7 +148,9 @@ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
185 |
ERR_load_X509V3_strings(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
186 |
ERR_load_PKCS12_strings(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
187 |
ERR_load_RAND_strings(); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
188 |
+#ifndef _BOOT |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
189 |
ERR_load_DSO_strings(); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
190 |
+#endif /* _BOOT */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
191 |
ERR_load_TS_strings(); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
192 |
# ifndef OPENSSL_NO_ENGINE |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
193 |
ERR_load_ENGINE_strings(); |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
194 |
--- openssl-1.0.0e/crypto/evp/evp_key.c 2010-03-27 12:27:50.000000000 -0700 |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
195 |
+++ openssl-1.0.0e_patched/crypto/evp/evp_key.c 2011-12-13 05:19:32.956908600 -0800 |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
196 |
@@ -83,7 +83,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
197 |
else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
198 |
return (prompt_string); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
199 |
} |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
200 |
- |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
201 |
+#ifndef _BOOT |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
202 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
203 |
* For historical reasons, the standard function for reading passwords is in |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
204 |
* the DES library -- if someone ever wants to disable DES, this function |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
205 |
@@ -115,6 +115,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
206 |
OPENSSL_cleanse(buff, BUFSIZ); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
207 |
return ret; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
208 |
} |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
209 |
+#endif /* !_BOOT */ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
210 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
211 |
int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
212 |
const unsigned char *salt, const unsigned char *data, |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
213 |
--- openssl-1.0.0e/crypto/rand/rand_unix.c 2009-04-06 07:31:36.000000000 -0700 |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
214 |
+++ openssl-1.0.0e_patched/crypto/rand/rand_unix.c 2011-12-19 07:28:39.988944800 -0800 |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
215 |
@@ -122,7 +122,11 @@ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
216 |
# include <sys/time.h> |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
217 |
# include <sys/times.h> |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
218 |
# include <sys/stat.h> |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
219 |
+#ifdef _BOOT |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
220 |
+# include <sys/fcntl.h> |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
221 |
+#else |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
222 |
# include <fcntl.h> |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
223 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
224 |
# include <unistd.h> |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
225 |
# include <time.h> |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
226 |
# if defined(OPENSSL_SYS_LINUX) /* should actually be available virtually |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
227 |
@@ -259,6 +263,11 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
228 |
const char **egdsocket = NULL; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
229 |
# endif |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
230 |
|
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
231 |
+#ifdef _BOOT |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
232 |
+/* open() is provided by standalone libsa not visible from here */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
233 |
+extern int open(const char *, int); |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
234 |
+#endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
235 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
236 |
# ifdef DEVRANDOM |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
237 |
memset(randomstats, 0, sizeof(randomstats)); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
238 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
239 |
@@ -307,11 +316,15 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
240 |
do { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
241 |
int try_read = 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
242 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
243 |
-# if defined(OPENSSL_SYS_BEOS_R5) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
244 |
+# if defined(OPENSSL_SYS_BEOS_R5) || defined(_BOOT) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
245 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
246 |
* select() is broken in BeOS R5, so we simply try to read |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
247 |
* something and snooze if we couldn't |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
248 |
*/ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
249 |
+ /* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
250 |
+ * select() is not available when linking stand-alone |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
251 |
+ * library for wanboot |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
252 |
+ */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
253 |
try_read = 1; |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
254 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
255 |
# elif defined(OPENSSL_SYS_LINUX) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
256 |
@@ -365,6 +378,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
257 |
} else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
258 |
r = -1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
259 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
260 |
+#ifndef _BOOT |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
261 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
262 |
* Some Unixen will update t in select(), some won't. For |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
263 |
* those who won't, or if we didn't use select() in the first |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
264 |
@@ -377,13 +391,17 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
265 |
while ((r > 0 || |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
266 |
(errno == EINTR || errno == EAGAIN)) && usec != 0 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
267 |
&& n < ENTROPY_NEEDED); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
268 |
+#else /* _BOOT */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
269 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
270 |
+ while (r > 0 && n < ENTROPY_NEEDED); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
271 |
+#endif /* _BOOT */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
272 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
273 |
close(fd); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
274 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
275 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
276 |
# endif /* defined(DEVRANDOM) */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
277 |
|
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
278 |
-# ifdef DEVRANDOM_EGD |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
279 |
+# if defined(DEVRANDOM_EGD) && !defined(_BOOT) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
280 |
/* |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
281 |
* Use an EGD socket to read entropy from an EGD or PRNGD entropy |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
282 |
* collecting daemon. |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
283 |
@@ -407,6 +424,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
284 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
285 |
# endif |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
286 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
287 |
+#ifndef _BOOT |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
288 |
/* put in some default random data, we need more than just this */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
289 |
l = curr_pid; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
290 |
RAND_add(&l, sizeof(l), 0.0); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
291 |
@@ -415,6 +433,7 @@ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
292 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
293 |
l = time(NULL); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
294 |
RAND_add(&l, sizeof(l), 0.0); |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
295 |
+#endif /* !_BOOT */ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
296 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
297 |
# if defined(OPENSSL_SYS_BEOS) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
298 |
{ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
299 |
--- openssl-1.0.0e/crypto/rand/randfile.c 2011-03-19 02:44:37.000000000 -0700 |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
300 |
+++ openssl-1.0.0e_patched/crypto/rand/randfile.c 2011-12-13 05:26:51.884824200 -0800 |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
301 |
@@ -191,6 +193,7 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
302 |
return (ret); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
303 |
} |
2041
3426b4846b15
19385782 Upgrade OpenSSL version to 1.0.1i
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1752
diff
changeset
|
304 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
305 |
+#ifndef _BOOT |
2041
3426b4846b15
19385782 Upgrade OpenSSL version to 1.0.1i
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1752
diff
changeset
|
306 |
int RAND_write_file(const char *file) |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
307 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
308 |
unsigned char buf[BUFSIZE]; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
309 |
@@ -335,3 +338,5 @@ |
2041
3426b4846b15
19385782 Upgrade OpenSSL version to 1.0.1i
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1752
diff
changeset
|
310 |
#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
311 |
return (buf); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
312 |
} |
2041
3426b4846b15
19385782 Upgrade OpenSSL version to 1.0.1i
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1752
diff
changeset
|
313 |
+ |
3426b4846b15
19385782 Upgrade OpenSSL version to 1.0.1i
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1752
diff
changeset
|
314 |
+#endif /* _BOOT */ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
315 |
--- openssl-1.0.0e/crypto/x509v3/v3_utl.c 2009-07-27 14:08:53.000000000 -0700 |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
316 |
+++ openssl-1.0.0e_patched/crypto/x509v3/v3_utl.c 2011-12-13 05:10:08.844191400 -0800 |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
317 |
@@ -1146,9 +1146,50 @@ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
318 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
319 |
} |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
320 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
321 |
+#if defined(_BOOT) |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
322 |
+/* This function was copied from bio/b_sock.c */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
323 |
+static int get_ip(const char *str, unsigned char ip[4]) |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
324 |
+{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
325 |
+ unsigned int tmp[4]; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
326 |
+ int num = 0, c, ok = 0; |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
327 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
328 |
+ tmp[0]=tmp[1]=tmp[2]=tmp[3]=0; |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
329 |
+ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
330 |
+ for (;;) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
331 |
+ c = *(str++); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
332 |
+ if ((c >= '0') && (c <= '9')) { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
333 |
+ ok = 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
334 |
+ tmp[num] = tmp[num]*10+c-'0'; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
335 |
+ if (tmp[num] > 255) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
336 |
+ return(0); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
337 |
+ } else if (c == '.') { |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
338 |
+ if (!ok) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
339 |
+ return (-1); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
340 |
+ if (num == 3) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
341 |
+ return (0); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
342 |
+ num++; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
343 |
+ ok = 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
344 |
+ } else if (c == '\0' && (num == 3) && ok) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
345 |
+ break; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
346 |
+ else |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
347 |
+ return(0); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
348 |
+ } |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
349 |
+ ip[0]=tmp[0]; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
350 |
+ ip[1]=tmp[1]; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
351 |
+ ip[2]=tmp[2]; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
352 |
+ ip[3]=tmp[3]; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
353 |
+ return(1); |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
354 |
+} |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
355 |
+#endif /* _BOOT */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
356 |
+ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
357 |
static int ipv4_from_asc(unsigned char *v4, const char *in) |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
358 |
{ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
359 |
int a0, a1, a2, a3; |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
360 |
+ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
361 |
+#if defined(_BOOT) |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
362 |
+ if (get_ip(in, v4) != 1) |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
363 |
+ return 0; |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
364 |
+#else /* _BOOT */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
365 |
if (sscanf(in, "%d.%d.%d.%d", &a0, &a1, &a2, &a3) != 4) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
366 |
return 0; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
367 |
if ((a0 < 0) || (a0 > 255) || (a1 < 0) || (a1 > 255) |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
368 |
@@ -1158,6 +1199,7 @@ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
369 |
v4[1] = a1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
370 |
v4[2] = a2; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
371 |
v4[3] = a3; |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
372 |
+#endif /* _BOOT */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
373 |
return 1; |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
374 |
} |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
375 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
376 |
--- openssl-1.0.0e/e_os.h 2011-12-19 04:17:51.631087400 -0800 |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
377 |
+++ openssl-1.0.0e_patched/e_os.h 2011-12-19 04:15:15.776668900 -0800 |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
378 |
@@ -213,10 +213,19 @@ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
379 |
# define get_last_socket_error() errno |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
380 |
# define clear_socket_error() errno=0 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
381 |
# define ioctlsocket(a,b,c) ioctl(a,b,c) |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
382 |
+#ifdef _BOOT |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
383 |
+#include <netinet/in.h> |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
384 |
+extern int socket_read(int, void *, size_t, int); |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
385 |
+extern int socket_close(int); |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
386 |
+# define closesocket(s) socket_close(s) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
387 |
+# define readsocket(s,b,n) socket_read((s),(b),(n), 200) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
388 |
+# define writesocket(s,b,n) send((s),(b),(n), 0) |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
389 |
+#else /* !_BOOT */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
390 |
# define closesocket(s) close(s) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
391 |
# define readsocket(s,b,n) read((s),(b),(n)) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
392 |
# define writesocket(s,b,n) write((s),(b),(n)) |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
393 |
# endif |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
394 |
+#endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
395 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
396 |
# ifdef WIN16 /* never the case */ |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
397 |
# define MS_CALLBACK _far _loadds |
4370
7043c27399f1
19375978 Common code between openssl-1.0.1 and openssl-1.0.1-fips-140 should be shared
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4366
diff
changeset
|
398 |
--- openssl-1.0.0e/crypto/sparcv9cap.c 2010-09-05 12:48:01.000000000 -0700 |
7043c27399f1
19375978 Common code between openssl-1.0.1 and openssl-1.0.1-fips-140 should be shared
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4366
diff
changeset
|
399 |
+++ openssl-1.0.0e_patched/crypto/sparcv9cap.c 2011-12-23 05:24:02.011607700 -0800 |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
400 |
@@ -12,7 +12,11 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
401 |
#if defined(__GNUC__) && defined(__linux) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
402 |
__attribute__ ((visibility("hidden"))) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
403 |
#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
404 |
+#ifndef _BOOT |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
405 |
unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_TICK_PRIVILEGED, 0 }; |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
406 |
+#else |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
407 |
+unsigned int OPENSSL_sparcv9cap_P[2] = { SPARCV9_VIS1, 0 }; |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
408 |
+#endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
409 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
410 |
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:
2156
diff
changeset
|
411 |
const BN_ULONG *np, const BN_ULONG *n0, int num) |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
412 |
@@ -74,6 +78,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
413 |
size_t _sparcv9_vis1_instrument_bus(unsigned int *, size_t); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
414 |
size_t _sparcv9_vis1_instrument_bus2(unsigned int *, size_t, size_t); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
415 |
|
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
416 |
+#ifndef _BOOT |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
417 |
unsigned long OPENSSL_rdtsc(void) |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
418 |
{ |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
419 |
if (OPENSSL_sparcv9cap_P[0] & SPARCV9_TICK_PRIVILEGED) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
420 |
@@ -103,9 +108,20 @@ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
421 |
else |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
422 |
return 0; |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
423 |
} |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
424 |
+#endif |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
425 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
426 |
-#if 0 && defined(__sun) && defined(__SVR4) |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
427 |
+#if defined(_BOOT) |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
428 |
/* |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
429 |
+ * Hardcoding sparc capabilities for wanboot. |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
430 |
+ * Older CPUs are EOLed anyway. |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
431 |
+ */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
432 |
+void OPENSSL_cpuid_setup(void) |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
433 |
+{ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
434 |
+ OPENSSL_sparcv9cap_P[0] = SPARCV9_VIS1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
435 |
+} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
436 |
+ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
437 |
+#elif 0 && defined(__sun) && defined(__SVR4) |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
438 |
+/* |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
439 |
* This code path is disabled, because of incompatibility of libdevinfo.so.1 |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
440 |
* and libmalloc.so.1 (see below for details) |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
441 |
*/ |
4370
7043c27399f1
19375978 Common code between openssl-1.0.1 and openssl-1.0.1-fips-140 should be shared
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4366
diff
changeset
|
442 |
--- openssl-1.0.0e/crypto/sparccpuid.S 2010-09-05 12:48:01.000000000 -0700 |
7043c27399f1
19375978 Common code between openssl-1.0.1 and openssl-1.0.1-fips-140 should be shared
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4366
diff
changeset
|
443 |
+++ openssl-1.0.0e_patched/crypto/sparccpuid.S 2012-02-13 07:42:58.259478325 -0800 |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
444 |
@@ -400,6 +400,7 @@ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
445 |
.type OPENSSL_cleanse,#function |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
446 |
.size OPENSSL_cleanse,.-OPENSSL_cleanse |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
447 |
|
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
448 |
+#ifndef _BOOT |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
449 |
.global _sparcv9_vis1_instrument_bus |
6964
c3b11711b2b9
24703781 Upgrade OpenSSL version to 1.0.2i
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
6860
diff
changeset
|
450 |
.weak _sparcv9_vis1_instrument_bus |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
451 |
.align 8 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
452 |
@@ -501,3 +502,7 @@ |
1752
84e093c079e2
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1680
diff
changeset
|
453 |
nop |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
454 |
call OPENSSL_cpuid_setup |
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
455 |
nop |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
456 |
+#else |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
457 |
+ nop |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
458 |
+ nop |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
459 |
+#endif |
1158
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
460 |
--- openssl-1.0.1c/crypto/Makefile Thu Aug 2 12:56:38 2012 |
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
461 |
+++ openssl-1.0.1c/crypto/Makefile.new Thu Aug 2 12:59:43 2012 |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
462 |
@@ -36,9 +36,9 @@ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
463 |
LIB= $(TOP)/libcrypto.a |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
464 |
SHARED_LIB= libcrypto$(SHLIB_EXT) |
1158
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
465 |
LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \ |
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
466 |
- ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c |
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
467 |
+ ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c wanboot-stubs.c |
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
468 |
LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \ |
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
469 |
- uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o $(CPUID_OBJ) |
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
470 |
+ uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o wanboot-stubs.o $(CPUID_OBJ) |
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
471 |
|
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
472 |
SRC= $(LIBSRC) |
1158
227137d9fbce
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
473 |
|
1680
49cf3ba424f0
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1158
diff
changeset
|
474 |
--- openssl-1.0.1f/ssl/s3_clnt.c Thu Jan 30 02:53:33 2014 |
49cf3ba424f0
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1158
diff
changeset
|
475 |
+++ openssl-1.0.1f/ssl/s3_clnt.c.new Thu Jan 30 02:57:51 2014 |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
476 |
@@ -698,6 +698,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
477 |
if (!ssl_get_new_session(s, 0)) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
478 |
goto err; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
479 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
480 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
481 |
if (s->method->version == DTLS_ANY_VERSION) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
482 |
/* Determine which DTLS version to use */ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
483 |
int options = s->options; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
484 |
@@ -730,6 +731,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
485 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
486 |
s->client_version = s->version; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
487 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
488 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
489 |
/* else use the pre-loaded session */ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
490 |
|
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
491 |
p = s->s3->client_random; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
492 |
@@ -750,8 +750,12 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
493 |
} else |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
494 |
i = 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
495 |
|
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
496 |
+#ifndef _BOOT |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
497 |
if (i && ssl_fill_hello_random(s, 0, p, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
498 |
sizeof(s->s3->client_random)) <= 0) |
1680
49cf3ba424f0
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1158
diff
changeset
|
499 |
+#else |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
500 |
+ if (i && RAND_pseudo_bytes(p, sizeof(s->s3->client_random)) <= 0) |
1680
49cf3ba424f0
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1158
diff
changeset
|
501 |
+#endif |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
502 |
goto err; |
1680
49cf3ba424f0
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
1158
diff
changeset
|
503 |
|
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
504 |
/* Do the message type and length last */ |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
505 |
@@ -938,6 +942,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
506 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
507 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
508 |
d = p = (unsigned char *)s->init_msg; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
509 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
510 |
if (s->method->version == DTLS_ANY_VERSION) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
511 |
/* Work out correct protocol version to use */ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
512 |
int hversion = (p[0] << 8) | p[1]; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
513 |
@@ -960,6 +965,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
514 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
515 |
s->session->ssl_version = s->version = s->method->version; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
516 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
517 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
518 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
519 |
if ((p[0] != (s->version >> 8)) || (p[1] != (s->version & 0xff))) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
520 |
SSLerr(SSL_F_SSL3_GET_SERVER_HELLO, SSL_R_WRONG_SSL_VERSION); |
2156
47340bc31385
19823263 Upgrade OpenSSL to 1.0.1j
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2041
diff
changeset
|
521 |
--- openssl-1.0.1f/ssl/s3_lib.c Wed Oct 15 11:18:30 2014 |
47340bc31385
19823263 Upgrade OpenSSL to 1.0.1j
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2041
diff
changeset
|
522 |
+++ openssl-1.0.1f/ssl/s3_lib.c.new Wed Oct 15 11:20:07 2014 |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
523 |
@@ -3574,7 +3574,11 @@ |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
524 |
* Apparently we're using a version-flexible SSL_METHOD (not at its |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
525 |
* highest protocol version). |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
526 |
*/ |
4366
8e8f535e48a5
PSARC/2015/043 Further OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4002
diff
changeset
|
527 |
+#ifndef _BOOT |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
528 |
if (s->ctx->method->version == SSLv23_method()->version) { |
2156
47340bc31385
19823263 Upgrade OpenSSL to 1.0.1j
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2041
diff
changeset
|
529 |
+#else |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
530 |
+ if (s->ctx->method->version == TLS1_2_VERSION) { |
2156
47340bc31385
19823263 Upgrade OpenSSL to 1.0.1j
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2041
diff
changeset
|
531 |
+#endif |
47340bc31385
19823263 Upgrade OpenSSL to 1.0.1j
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2041
diff
changeset
|
532 |
#if TLS_MAX_VERSION != TLS1_2_VERSION |
4002
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
533 |
# error Code needs update for SSLv23_method() support beyond TLS1_2_VERSION. |
95b8f35fcdd5
20735615 Upgrade OpenSSL version to 1.0.1m
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2156
diff
changeset
|
534 |
#endif |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
535 |
--- openssl-1.0.2d/ssl/ssl_algs.c.orig Fri Aug 7 08:54:56 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
536 |
+++ openssl-1.0.2d/ssl/ssl_algs.c Fri Aug 7 08:14:38 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
537 |
@@ -96,8 +96,10 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
538 |
EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
539 |
# endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
540 |
# if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA256) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
541 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
542 |
EVP_add_cipher(EVP_aes_128_cbc_hmac_sha256()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
543 |
EVP_add_cipher(EVP_aes_256_cbc_hmac_sha256()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
544 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
545 |
# endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
546 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
547 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
548 |
--- openssl-1.0.2d/ssl/ssl_cert.c.orig Fri Aug 7 08:57:29 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
549 |
+++ openssl-1.0.2d/ssl/ssl_cert.c Fri Aug 7 08:14:37 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
550 |
@@ -384,11 +384,13 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
551 |
ret->ciphers_raw = NULL; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
552 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
553 |
#ifndef OPENSSL_NO_TLSEXT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
554 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
555 |
if (!custom_exts_copy(&ret->cli_ext, &cert->cli_ext)) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
556 |
goto err; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
557 |
if (!custom_exts_copy(&ret->srv_ext, &cert->srv_ext)) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
558 |
goto err; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
559 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
560 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
561 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
562 |
return (ret); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
563 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
564 |
@@ -409,9 +411,11 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
565 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
566 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
567 |
#ifndef OPENSSL_NO_TLSEXT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
568 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
569 |
custom_exts_free(&ret->cli_ext); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
570 |
custom_exts_free(&ret->srv_ext); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
571 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
572 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
573 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
574 |
ssl_cert_clear_certs(ret); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
575 |
|
6247
af889a8e1145
23599994 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
5914
diff
changeset
|
576 |
@@ -502,11 +506,13 @@ |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
577 |
if (c->ciphers_raw) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
578 |
OPENSSL_free(c->ciphers_raw); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
579 |
#ifndef OPENSSL_NO_TLSEXT |
6247
af889a8e1145
23599994 problem in LIBRARY/OPENSSL
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
5914
diff
changeset
|
580 |
+#ifndef _BOOT |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
581 |
custom_exts_free(&c->cli_ext); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
582 |
custom_exts_free(&c->srv_ext); |
5914
b2220d33b0b8
23207138 Upgrade OpenSSL version to 1.0.2h
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
5171
diff
changeset
|
583 |
if (c->alpn_proposed) |
b2220d33b0b8
23207138 Upgrade OpenSSL version to 1.0.2h
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
5171
diff
changeset
|
584 |
OPENSSL_free(c->alpn_proposed); |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
585 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
586 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
587 |
OPENSSL_free(c); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
588 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
589 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
590 |
--- openssl-1.0.2d/ssl/ssl_conf.c.orig Fri Aug 7 08:57:43 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
591 |
+++ openssl-1.0.2d/ssl/ssl_conf.c Fri Aug 7 08:14:38 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
592 |
@@ -386,6 +386,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
593 |
return rv > 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
594 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
595 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
596 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
597 |
static int cmd_ServerInfoFile(SSL_CONF_CTX *cctx, const char *value) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
598 |
{ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
599 |
int rv = 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
600 |
@@ -398,6 +399,8 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
601 |
return rv > 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
602 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
603 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
604 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
605 |
+ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
606 |
#ifndef OPENSSL_NO_DH |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
607 |
static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
608 |
{ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
609 |
@@ -456,7 +459,9 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
610 |
SSL_CONF_CMD_STRING(Options, NULL), |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
611 |
SSL_CONF_CMD(Certificate, "cert", SSL_CONF_TYPE_FILE), |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
612 |
SSL_CONF_CMD(PrivateKey, "key", SSL_CONF_TYPE_FILE), |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
613 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
614 |
SSL_CONF_CMD(ServerInfoFile, NULL, SSL_CONF_TYPE_FILE), |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
615 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
616 |
#ifndef OPENSSL_NO_DH |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
617 |
SSL_CONF_CMD(DHParameters, "dhparam", SSL_CONF_TYPE_FILE) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
618 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
619 |
--- openssl-1.0.2d/ssl/ssl_rsa.c.orig Fri Aug 7 08:58:26 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
620 |
+++ openssl-1.0.2d/ssl/ssl_rsa.c Fri Aug 7 08:14:38 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
621 |
@@ -788,6 +788,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
622 |
return 0; /* Error */ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
623 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
624 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
625 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
626 |
static int serverinfo_srv_parse_cb(SSL *s, unsigned int ext_type, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
627 |
const unsigned char *in, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
628 |
size_t inlen, int *al, void *arg) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
629 |
@@ -1005,4 +1006,5 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
630 |
return ret; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
631 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
632 |
# endif /* OPENSSL_NO_STDIO */ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
633 |
+#endif /*!_BOOT*/ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
634 |
#endif /* OPENSSL_NO_TLSEXT */ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
635 |
--- openssl-1.0.2d/ssl/t1_lib.c.orig Fri Aug 7 08:59:39 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
636 |
+++ openssl-1.0.2d/ssl/t1_lib.c Fri Aug 7 09:01:32 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
637 |
@@ -1559,10 +1559,12 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
638 |
ret += el; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
639 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
640 |
# endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
641 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
642 |
custom_ext_init(&s->cert->cli_ext); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
643 |
/* Add custom TLS Extensions to ClientHello */ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
644 |
if (!custom_ext_add(s, 0, &ret, limit, al)) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
645 |
return NULL; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
646 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
647 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
648 |
/* |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
649 |
* Add padding to workaround bugs in F5 terminators. See |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
650 |
@@ -1798,8 +1800,10 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
651 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
652 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
653 |
# endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
654 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
655 |
if (!custom_ext_add(s, 1, &ret, limit, al)) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
656 |
return NULL; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
657 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
658 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
659 |
if (s->s3->alpn_selected) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
660 |
const unsigned char *selected = s->s3->alpn_selected; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
661 |
@@ -2428,6 +2432,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
662 |
return 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
663 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
664 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
665 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
666 |
/* |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
667 |
* Parse any custom extensions found. "data" is the start of the extension data |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
668 |
* and "limit" is the end of the record. TODO: add strict syntax checking. |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
669 |
@@ -2464,6 +2469,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
670 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
671 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
672 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
673 |
+#endif /*!_BOOT*/ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
674 |
|
5171
4e8b3c0ea78c
22307393 Upgrade OpenSSL version to 1.0.2e
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4822
diff
changeset
|
675 |
int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, |
4e8b3c0ea78c
22307393 Upgrade OpenSSL version to 1.0.2e
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4822
diff
changeset
|
676 |
unsigned char *limit) |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
677 |
@@ -2486,11 +2492,13 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
678 |
return 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
679 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
680 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
681 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
682 |
custom_ext_init(&s->cert->srv_ext); |
5171
4e8b3c0ea78c
22307393 Upgrade OpenSSL version to 1.0.2e
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4822
diff
changeset
|
683 |
if (ssl_scan_clienthello_custom_tlsext(s, ptmp, limit, &al) <= 0) { |
4822
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
684 |
ssl3_send_alert(s, SSL3_AL_FATAL, al); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
685 |
return 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
686 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
687 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
688 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
689 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
690 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
691 |
@@ -2762,6 +2770,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
692 |
return 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
693 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
694 |
# endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
695 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
696 |
/* |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
697 |
* If this extension type was not otherwise handled, but matches a |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
698 |
* custom_cli_ext_record, then send it to the c callback |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
699 |
@@ -2768,6 +2777,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
700 |
*/ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
701 |
else if (custom_ext_parse(s, 0, type, data, size, al) <= 0) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
702 |
return 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
703 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
704 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
705 |
data += size; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
706 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
707 |
--- openssl-1.0.2d/crypto/x509/x_all.c.orig Fri Aug 7 09:28:54 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
708 |
+++ openssl-1.0.2d/crypto/x509/x_all.c Fri Aug 7 08:14:33 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
709 |
@@ -106,11 +106,13 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
710 |
x->sig_alg, x->signature, x->cert_info, ctx); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
711 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
712 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
713 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
714 |
int X509_http_nbio(OCSP_REQ_CTX *rctx, X509 **pcert) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
715 |
{ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
716 |
return OCSP_REQ_CTX_nbio_d2i(rctx, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
717 |
(ASN1_VALUE **)pcert, ASN1_ITEM_rptr(X509)); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
718 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
719 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
720 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
721 |
int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
722 |
{ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
723 |
@@ -140,6 +142,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
724 |
x->crl, ctx); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
725 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
726 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
727 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
728 |
int X509_CRL_http_nbio(OCSP_REQ_CTX *rctx, X509_CRL **pcrl) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
729 |
{ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
730 |
return OCSP_REQ_CTX_nbio_d2i(rctx, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
731 |
@@ -146,6 +149,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
732 |
(ASN1_VALUE **)pcrl, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
733 |
ASN1_ITEM_rptr(X509_CRL)); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
734 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
735 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
736 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
737 |
int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
738 |
{ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
739 |
--- openssl-1.0.2d/crypto/dh/dh_ameth.c.orig Fri Aug 7 10:19:49 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
740 |
+++ openssl-1.0.2d/crypto/dh/dh_ameth.c Fri Aug 7 08:14:35 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
741 |
@@ -557,6 +557,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
742 |
return do_dh_print(bp, x, 4, NULL, 0); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
743 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
744 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
745 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
746 |
#ifndef OPENSSL_NO_CMS |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
747 |
static int dh_cms_decrypt(CMS_RecipientInfo *ri); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
748 |
static int dh_cms_encrypt(CMS_RecipientInfo *ri); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
749 |
@@ -583,6 +584,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
750 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
751 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
752 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
753 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
754 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
755 |
const EVP_PKEY_ASN1_METHOD dh_asn1_meth = { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
756 |
EVP_PKEY_DH, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
757 |
@@ -645,9 +647,14 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
758 |
0, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
759 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
760 |
int_dh_free, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
761 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
762 |
dh_pkey_ctrl |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
763 |
+#else |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
764 |
+ 0 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
765 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
766 |
}; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
767 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
768 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
769 |
#ifndef OPENSSL_NO_CMS |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
770 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
771 |
static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
772 |
@@ -955,3 +962,5 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
773 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
774 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
775 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
776 |
+ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
777 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
778 |
--- openssl-1.0.2d/crypto/dh/dh_pmeth.c.orig Fri Aug 7 10:16:52 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
779 |
+++ openssl-1.0.2d/crypto/dh/dh_pmeth.c Fri Aug 7 08:14:34 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
780 |
@@ -194,11 +194,13 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
781 |
dctx->use_dsa = p1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
782 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
783 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
784 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
785 |
case EVP_PKEY_CTRL_DH_RFC5114: |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
786 |
if (p1 < 1 || p1 > 3) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
787 |
return -2; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
788 |
dctx->rfc5114_param = p1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
789 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
790 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
791 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
792 |
case EVP_PKEY_CTRL_PEER_KEY: |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
793 |
/* Default behaviour is OK */ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
794 |
@@ -207,7 +209,11 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
795 |
case EVP_PKEY_CTRL_DH_KDF_TYPE: |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
796 |
if (p1 == -2) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
797 |
return dctx->kdf_type; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
798 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
799 |
if (p1 != EVP_PKEY_DH_KDF_NONE && p1 != EVP_PKEY_DH_KDF_X9_42) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
800 |
+#else |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
801 |
+ if (p1 != EVP_PKEY_DH_KDF_NONE) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
802 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
803 |
return -2; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
804 |
dctx->kdf_type = p1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
805 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
806 |
@@ -268,6 +274,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
807 |
len = atoi(value); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
808 |
return EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
809 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
810 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
811 |
if (!strcmp(type, "dh_rfc5114")) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
812 |
DH_PKEY_CTX *dctx = ctx->data; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
813 |
int len; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
814 |
@@ -277,6 +284,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
815 |
dctx->rfc5114_param = len; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
816 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
817 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
818 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
819 |
if (!strcmp(type, "dh_paramgen_generator")) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
820 |
int len; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
821 |
len = atoi(value); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
822 |
@@ -355,6 +363,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
823 |
DH_PKEY_CTX *dctx = ctx->data; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
824 |
BN_GENCB *pcb, cb; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
825 |
int ret; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
826 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
827 |
if (dctx->rfc5114_param) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
828 |
switch (dctx->rfc5114_param) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
829 |
case 1: |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
830 |
@@ -375,6 +384,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
831 |
EVP_PKEY_assign(pkey, EVP_PKEY_DHX, dh); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
832 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
833 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
834 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
835 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
836 |
if (ctx->pkey_gencb) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
837 |
pcb = &cb; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
838 |
@@ -448,6 +458,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
839 |
return ret; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
840 |
*keylen = ret; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
841 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
842 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
843 |
} else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
844 |
unsigned char *Z = NULL; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
845 |
size_t Zlen = 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
846 |
@@ -478,6 +489,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
847 |
OPENSSL_free(Z); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
848 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
849 |
return ret; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
850 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
851 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
852 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
853 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
854 |
--- openssl-1.0.2d/crypto/evp/e_des3.c.orig Fri Aug 7 10:22:12 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
855 |
+++ openssl-1.0.2d/crypto/evp/e_des3.c Fri Aug 7 10:23:16 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
856 |
@@ -381,6 +381,8 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
857 |
return &des_ede3_ecb; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
858 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
859 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
860 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
861 |
+ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
862 |
# ifndef OPENSSL_NO_SHA |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
863 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
864 |
# include <openssl/sha.h> |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
865 |
@@ -491,4 +493,6 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
866 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
867 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
868 |
# endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
869 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
870 |
+ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
871 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
872 |
--- openssl-1.0.2d/crypto/evp/c_allc.c.orig Fri Aug 7 10:21:48 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
873 |
+++ openssl-1.0.2d/crypto/evp/c_allc.c Fri Aug 7 08:14:31 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
874 |
@@ -93,8 +93,10 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
875 |
EVP_add_cipher(EVP_des_ecb()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
876 |
EVP_add_cipher(EVP_des_ede()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
877 |
EVP_add_cipher(EVP_des_ede3()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
878 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
879 |
EVP_add_cipher(EVP_des_ede3_wrap()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
880 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
881 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
882 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
883 |
#ifndef OPENSSL_NO_RC4 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
884 |
EVP_add_cipher(EVP_rc4()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
885 |
@@ -207,8 +209,10 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
886 |
EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
887 |
# endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
888 |
# if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA256) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
889 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
890 |
EVP_add_cipher(EVP_aes_128_cbc_hmac_sha256()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
891 |
EVP_add_cipher(EVP_aes_256_cbc_hmac_sha256()); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
892 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
893 |
# endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
894 |
#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
895 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
896 |
--- openssl-1.0.2d/crypto/cms/cms_env.c.orig Fri Aug 7 10:25:00 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
897 |
+++ openssl-1.0.2d/crypto/cms/cms_env.c Fri Aug 7 10:25:37 2015 |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
898 |
@@ -106,6 +106,7 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
899 |
int i; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
900 |
if (ri->type == CMS_RECIPINFO_TRANS) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
901 |
pkey = ri->d.ktri->pkey; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
902 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
903 |
else if (ri->type == CMS_RECIPINFO_AGREE) { |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
904 |
EVP_PKEY_CTX *pctx = ri->d.kari->pctx; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
905 |
if (!pctx) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
906 |
@@ -114,6 +115,9 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
907 |
if (!pkey) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
908 |
return 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
909 |
} else |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
910 |
+#else |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
911 |
+ else |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
912 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
913 |
return 0; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
914 |
if (!pkey->ameth || !pkey->ameth->pkey_ctrl) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
915 |
return 1; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
916 |
@@ -148,8 +152,10 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
917 |
{ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
918 |
if (ri->type == CMS_RECIPINFO_TRANS) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
919 |
return ri->d.ktri->pctx; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
920 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
921 |
else if (ri->type == CMS_RECIPINFO_AGREE) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
922 |
return ri->d.kari->pctx; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
923 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
924 |
return NULL; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
925 |
} |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
926 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
927 |
@@ -255,10 +261,12 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
928 |
goto err; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
929 |
break; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
930 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
931 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
932 |
case CMS_RECIPINFO_AGREE: |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
933 |
if (!cms_RecipientInfo_kari_init(ri, recip, pk, flags)) |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
934 |
goto err; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
935 |
break; |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
936 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
937 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
938 |
default: |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
939 |
CMSerr(CMS_F_CMS_ADD1_RECIPIENT_CERT, |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
940 |
@@ -827,8 +835,10 @@ |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
941 |
case CMS_RECIPINFO_TRANS: |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
942 |
return cms_RecipientInfo_ktri_encrypt(cms, ri); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
943 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
944 |
+#ifndef _BOOT |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
945 |
case CMS_RECIPINFO_AGREE: |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
946 |
return cms_RecipientInfo_kari_encrypt(cms, ri); |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
947 |
+#endif |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
948 |
|
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
949 |
case CMS_RECIPINFO_KEK: |
1fb8a14c6702
PSARC/2015/353 OpenSSL 1.0.2
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
4616
diff
changeset
|
950 |
return cms_RecipientInfo_kekri_encrypt(cms, ri); |