author | Ron Jordan <ron.jordan@oracle.com> |
Tue, 24 Mar 2015 20:05:38 -0700 | |
branch | s11u2-sru |
changeset 4016 | 7f9e1e7611b8 |
parent 3402 | 110b254c69b8 |
child 4366 | 8e8f535e48a5 |
permissions | -rw-r--r-- |
3017
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
1 |
# |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
2 |
# This patch file makes the changes neccessary to build wanboot-openssl.o |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
3 |
# binary. This is Solaris-specific: not suitable for upstream. |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
4 |
# |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
5 |
--- openssl-1.0.0g/Makefile.org 2010-01-27 08:06:58.000000000 -0800 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
6 |
+++ openssl-1.0.0g-1/Makefile.org 2012-03-26 03:04:08.440194448 -0700 |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
7 |
@@ -138,7 +138,13 @@ |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
8 |
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
9 |
BASEADDR= |
b92e6df5eaf0
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 |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
20 |
|
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
21 |
--- openssl-1.0.0g/Makefile 2012-01-18 05:42:28.000000000 -0800 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
22 |
+++ openssl-1.0.0g-1/Makefile 2012-03-26 03:03:59.170540344 -0700 |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
23 |
@@ -137,7 +137,13 @@ |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
24 |
|
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
25 |
BASEADDR=0xFB00000 |
b92e6df5eaf0
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 |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
36 |
|
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
37 |
--- openssl-1.0.0e/crypto/cryptlib.c 2011-06-22 08:39:00.000000000 -0700 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
38 |
+++ openssl-1.0.0e_patched/crypto/cryptlib.c 2011-12-12 06:17:45.422476900 -0800 |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
39 |
@@ -412,6 +412,7 @@ |
3017
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
40 |
static void solaris_locking_callback(int mode, int type, const char *file, |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
41 |
int line) |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
42 |
{ |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
43 |
+#ifndef _BOOT |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
44 |
if (mode & CRYPTO_LOCK) |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
45 |
{ |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
46 |
pthread_mutex_lock(&solaris_openssl_locks[type]); |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
47 |
@@ -420,6 +421,7 @@ |
3017
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
48 |
{ |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
49 |
pthread_mutex_unlock(&solaris_openssl_locks[type]); |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
50 |
} |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
51 |
+#endif |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
52 |
} |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
53 |
|
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
54 |
|
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
55 |
@@ -453,6 +455,12 @@ |
3017
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
56 |
} |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
57 |
|
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
58 |
/* |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
59 |
+ * pthread_* can't be used in wanboot. |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
60 |
+ * wanboot needs not be thread-safe and mutexes and locking callback |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
61 |
+ * function will not be setup for wanboot. |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
62 |
+ */ |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
63 |
+#ifndef _BOOT |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
64 |
+ /* |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
65 |
* Set atfork handler so that child can setup its own mutexes and |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
66 |
* locking callbacks when it is forked |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
67 |
*/ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
68 |
@@ -475,7 +483,7 @@ |
3017
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
69 |
pthread_mutex_init(&solaris_openssl_locks[i], NULL); |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
70 |
} |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
71 |
locking_callback = solaris_locking_callback; |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
72 |
- |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
73 |
+#endif |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
74 |
} |
3017
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
75 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
76 |
void CRYPTO_set_locking_callback(void (*func) (int mode, int type, |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
77 |
@@ -1021,6 +1029,12 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
78 |
MessageBox(NULL, buf, _T("OpenSSL: FATAL"), MB_OK | MB_ICONSTOP); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
79 |
} |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
80 |
#else |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
81 |
+/* |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
82 |
+ * Solaris libsa.a used for WAN boot doesn't provide for vfprintf(). Since |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
83 |
+ * OPENSSL_showfatal() is not used anywhere else then here we can safely use |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
84 |
+ * the code from 0.9.7d version. |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
85 |
+ */ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
86 |
+#ifndef _BOOT |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
87 |
void OPENSSL_showfatal(const char *fmta, ...) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
88 |
{ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
89 |
va_list ap; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
90 |
@@ -1029,6 +1043,7 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
91 |
vfprintf(stderr, fmta, ap); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
92 |
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
|
93 |
} |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
94 |
+#endif /* _BOOT */ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
95 |
|
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
96 |
int OPENSSL_isservice(void) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
97 |
{ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
98 |
@@ -1038,9 +1053,15 @@ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
99 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
100 |
void OpenSSLDie(const char *file, int line, const char *assertion) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
101 |
{ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
102 |
+#ifndef _BOOT |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
103 |
OPENSSL_showfatal |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
104 |
("%s(%d): OpenSSL internal error, assertion failed: %s\n", file, line, |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
105 |
assertion); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
106 |
+#else |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
107 |
+ fprintf(stderr, |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
108 |
+ "%s(%d): OpenSSL internal error, assertion failed: %s\n", |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
109 |
+ file,line,assertion); |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
110 |
+#endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
111 |
#if !defined(_WIN32) || defined(__CYGWIN__) |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
112 |
abort(); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
113 |
#else |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
114 |
--- openssl-1.0.0e/crypto/err/err_all.c 2009-08-09 07:58:05.000000000 -0700 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
115 |
+++ openssl-1.0.0e_patched/crypto/err/err_all.c 2011-12-13 05:22:01.205351400 -0800 |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
116 |
@@ -148,7 +148,9 @@ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
117 |
ERR_load_X509V3_strings(); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
118 |
ERR_load_PKCS12_strings(); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
119 |
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
|
120 |
+#ifndef _BOOT |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
121 |
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
|
122 |
+#endif /* _BOOT */ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
123 |
ERR_load_TS_strings(); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
124 |
# ifndef OPENSSL_NO_ENGINE |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
125 |
ERR_load_ENGINE_strings(); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
126 |
--- openssl-1.0.0e/crypto/evp/evp_key.c 2010-03-27 12:27:50.000000000 -0700 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
127 |
+++ openssl-1.0.0e_patched/crypto/evp/evp_key.c 2011-12-13 05:19:32.956908600 -0800 |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
128 |
@@ -83,7 +83,7 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
129 |
else |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
130 |
return (prompt_string); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
131 |
} |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
132 |
- |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
133 |
+#ifndef _BOOT |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
134 |
/* |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
135 |
* For historical reasons, the standard function for reading passwords is in |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
136 |
* the DES library -- if someone ever wants to disable DES, this function |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
137 |
@@ -115,6 +115,7 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
138 |
OPENSSL_cleanse(buff, BUFSIZ); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
139 |
return ret; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
140 |
} |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
141 |
+#endif /* !_BOOT */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
142 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
143 |
int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
144 |
const unsigned char *salt, const unsigned char *data, |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
145 |
--- openssl-1.0.0e/crypto/rand/rand_unix.c 2009-04-06 07:31:36.000000000 -0700 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
146 |
+++ openssl-1.0.0e_patched/crypto/rand/rand_unix.c 2011-12-19 07:28:39.988944800 -0800 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
147 |
@@ -122,7 +122,11 @@ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
148 |
# include <sys/time.h> |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
149 |
# include <sys/times.h> |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
150 |
# include <sys/stat.h> |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
151 |
+#ifdef _BOOT |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
152 |
+# 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
|
153 |
+#else |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
154 |
# 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
|
155 |
+#endif |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
156 |
# include <unistd.h> |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
157 |
# include <time.h> |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
158 |
# if defined(OPENSSL_SYS_LINUX) /* should actually be available virtually |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
159 |
@@ -259,6 +263,11 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
160 |
const char **egdsocket = NULL; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
161 |
# endif |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
162 |
|
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
163 |
+#ifdef _BOOT |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
164 |
+/* 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
|
165 |
+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
|
166 |
+#endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
167 |
+ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
168 |
# ifdef DEVRANDOM |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
169 |
memset(randomstats, 0, sizeof(randomstats)); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
170 |
/* |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
171 |
@@ -307,11 +316,15 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
172 |
do { |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
173 |
int try_read = 0; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
174 |
|
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
175 |
-# if defined(OPENSSL_SYS_BEOS_R5) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
176 |
+# if defined(OPENSSL_SYS_BEOS_R5) || defined(_BOOT) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
177 |
/* |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
178 |
* select() is broken in BeOS R5, so we simply try to read |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
179 |
* something and snooze if we couldn't |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
180 |
*/ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
181 |
+ /* |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
182 |
+ * select() is not available when linking stand-alone |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
183 |
+ * library for wanboot |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
184 |
+ */ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
185 |
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
|
186 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
187 |
# elif defined(OPENSSL_SYS_LINUX) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
188 |
@@ -365,6 +378,7 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
189 |
} else |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
190 |
r = -1; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
191 |
|
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
192 |
+#ifndef _BOOT |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
193 |
/* |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
194 |
* Some Unixen will update t in select(), some won't. For |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
195 |
* those who won't, or if we didn't use select() in the first |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
196 |
@@ -377,13 +391,17 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
197 |
while ((r > 0 || |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
198 |
(errno == EINTR || errno == EAGAIN)) && usec != 0 |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
199 |
&& n < ENTROPY_NEEDED); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
200 |
+#else /* _BOOT */ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
201 |
+ } |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
202 |
+ while (r > 0 && n < ENTROPY_NEEDED); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
203 |
+#endif /* _BOOT */ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
204 |
|
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
205 |
close(fd); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
206 |
} |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
207 |
} |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
208 |
# endif /* defined(DEVRANDOM) */ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
209 |
|
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
210 |
-# ifdef DEVRANDOM_EGD |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
211 |
+# if defined(DEVRANDOM_EGD) && !defined(_BOOT) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
212 |
/* |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
213 |
* Use an EGD socket to read entropy from an EGD or PRNGD entropy |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
214 |
* collecting daemon. |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
215 |
@@ -407,6 +424,7 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
216 |
} |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
217 |
# endif |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
218 |
|
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
219 |
+#ifndef _BOOT |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
220 |
/* put in some default random data, we need more than just this */ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
221 |
l = curr_pid; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
222 |
RAND_add(&l, sizeof(l), 0.0); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
223 |
@@ -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
|
224 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
225 |
l = time(NULL); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
226 |
RAND_add(&l, sizeof(l), 0.0); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
227 |
+#endif /* !_BOOT */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
228 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
229 |
# if defined(OPENSSL_SYS_BEOS) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
230 |
{ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
231 |
--- openssl-1.0.0e/crypto/rand/randfile.c 2011-03-19 02:44:37.000000000 -0700 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
232 |
+++ openssl-1.0.0e_patched/crypto/rand/randfile.c 2011-12-13 05:26:51.884824200 -0800 |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
233 |
@@ -57,9 +57,11 @@ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
234 |
*/ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
235 |
|
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
236 |
/* We need to define this to get macros like S_IFBLK and S_IFCHR */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
237 |
+#ifndef _BOOT |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
238 |
#if !defined(OPENSSL_SYS_VXWORKS) |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
239 |
# define _XOPEN_SOURCE 500 |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
240 |
#endif |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
241 |
+#endif /* _BOOT */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
242 |
|
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
243 |
#include <errno.h> |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
244 |
#include <stdio.h> |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
245 |
@@ -191,6 +193,7 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
246 |
return (ret); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
247 |
} |
3272
e797eda2f68f
19385782 Upgrade OpenSSL version to 1.0.1i
Ronald Jordan <ron.jordan@oracle.com>
parents:
3017
diff
changeset
|
248 |
|
e797eda2f68f
19385782 Upgrade OpenSSL version to 1.0.1i
Ronald Jordan <ron.jordan@oracle.com>
parents:
3017
diff
changeset
|
249 |
+#ifndef _BOOT |
e797eda2f68f
19385782 Upgrade OpenSSL version to 1.0.1i
Ronald Jordan <ron.jordan@oracle.com>
parents:
3017
diff
changeset
|
250 |
int RAND_write_file(const char *file) |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
251 |
{ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
252 |
unsigned char buf[BUFSIZE]; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
253 |
@@ -335,3 +338,5 @@ |
3272
e797eda2f68f
19385782 Upgrade OpenSSL version to 1.0.1i
Ronald Jordan <ron.jordan@oracle.com>
parents:
3017
diff
changeset
|
254 |
#endif |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
255 |
return (buf); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
256 |
} |
3272
e797eda2f68f
19385782 Upgrade OpenSSL version to 1.0.1i
Ronald Jordan <ron.jordan@oracle.com>
parents:
3017
diff
changeset
|
257 |
+ |
e797eda2f68f
19385782 Upgrade OpenSSL version to 1.0.1i
Ronald Jordan <ron.jordan@oracle.com>
parents:
3017
diff
changeset
|
258 |
+#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
|
259 |
--- openssl-1.0.0e/crypto/x509v3/v3_utl.c 2009-07-27 14:08:53.000000000 -0700 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
260 |
+++ openssl-1.0.0e_patched/crypto/x509v3/v3_utl.c 2011-12-13 05:10:08.844191400 -0800 |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
261 |
@@ -715,9 +715,50 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
262 |
} |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
263 |
} |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
264 |
|
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
265 |
+#if defined(_BOOT) |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
266 |
+/* 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
|
267 |
+static int get_ip(const char *str, unsigned char ip[4]) |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
268 |
+{ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
269 |
+ unsigned int tmp[4]; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
270 |
+ 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
|
271 |
+ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
272 |
+ 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
|
273 |
+ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
274 |
+ for (;;) { |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
275 |
+ c = *(str++); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
276 |
+ if ((c >= '0') && (c <= '9')) { |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
277 |
+ ok = 1; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
278 |
+ tmp[num] = tmp[num]*10+c-'0'; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
279 |
+ if (tmp[num] > 255) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
280 |
+ return(0); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
281 |
+ } else if (c == '.') { |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
282 |
+ if (!ok) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
283 |
+ return (-1); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
284 |
+ if (num == 3) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
285 |
+ return (0); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
286 |
+ num++; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
287 |
+ ok = 0; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
288 |
+ } else if (c == '\0' && (num == 3) && ok) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
289 |
+ break; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
290 |
+ else |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
291 |
+ return(0); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
292 |
+ } |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
293 |
+ ip[0]=tmp[0]; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
294 |
+ ip[1]=tmp[1]; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
295 |
+ ip[2]=tmp[2]; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
296 |
+ ip[3]=tmp[3]; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
297 |
+ return(1); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
298 |
+} |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
299 |
+#endif /* _BOOT */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
300 |
+ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
301 |
static int ipv4_from_asc(unsigned char *v4, const char *in) |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
302 |
{ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
303 |
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
|
304 |
+ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
305 |
+#if defined(_BOOT) |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
306 |
+ if (get_ip(in, v4) != 1) |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
307 |
+ return 0; |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
308 |
+#else /* _BOOT */ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
309 |
if (sscanf(in, "%d.%d.%d.%d", &a0, &a1, &a2, &a3) != 4) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
310 |
return 0; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
311 |
if ((a0 < 0) || (a0 > 255) || (a1 < 0) || (a1 > 255) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
312 |
@@ -727,6 +768,7 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
313 |
v4[1] = a1; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
314 |
v4[2] = a2; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
315 |
v4[3] = a3; |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
316 |
+#endif /* _BOOT */ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
317 |
return 1; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
318 |
} |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
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 |
--- openssl-1.0.0e/e_os.h 2011-12-19 04:17:51.631087400 -0800 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
321 |
+++ openssl-1.0.0e_patched/e_os.h 2011-12-19 04:15:15.776668900 -0800 |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
322 |
@@ -213,10 +213,19 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
323 |
# define get_last_socket_error() errno |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
324 |
# define clear_socket_error() errno=0 |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
325 |
# define ioctlsocket(a,b,c) ioctl(a,b,c) |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
326 |
+#ifdef _BOOT |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
327 |
+#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
|
328 |
+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
|
329 |
+extern int socket_close(int); |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
330 |
+# define closesocket(s) socket_close(s) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
331 |
+# define readsocket(s,b,n) socket_read((s),(b),(n), 200) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
332 |
+# 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
|
333 |
+#else /* !_BOOT */ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
334 |
# define closesocket(s) close(s) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
335 |
# define readsocket(s,b,n) read((s),(b),(n)) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
336 |
# define writesocket(s,b,n) write((s),(b),(n)) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
337 |
# endif |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
338 |
+#endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
339 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
340 |
# ifdef WIN16 /* never the case */ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
341 |
# define MS_CALLBACK _far _loadds |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
342 |
--- openssl-1.0.0e/crypto/sparcv9cap.c 2010-09-05 12:48:01.000000000 -0700 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
343 |
+++ openssl-1.0.0e_patched/crypto/sparcv9cap.c 2011-12-23 05:24:02.011607700 -0800 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
344 |
@@ -12,7 +12,11 @@ |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
345 |
#define SPARCV9_VIS2 (1<<3) /* reserved */ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
346 |
#define SPARCV9_FMADD (1<<4) /* reserved for SPARC64 V */ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
347 |
|
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
348 |
+#ifndef _BOOT |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
349 |
static int OPENSSL_sparcv9cap_P = SPARCV9_TICK_PRIVILEGED; |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
350 |
+#else |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
351 |
+static int OPENSSL_sparcv9cap_P = SPARCV9_VIS1; |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
352 |
+#endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
353 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
354 |
int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
355 |
const BN_ULONG *np, const BN_ULONG *n0, int num) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
356 |
@@ -36,6 +40,7 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
357 |
void _sparcv9_vis2_probe(void); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
358 |
void _sparcv9_fmadd_probe(void); |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
359 |
|
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
360 |
+#ifndef _BOOT |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
361 |
unsigned long OPENSSL_rdtsc(void) |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
362 |
{ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
363 |
if (OPENSSL_sparcv9cap_P & SPARCV9_TICK_PRIVILEGED) |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
364 |
@@ -47,8 +52,19 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
365 |
else |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
366 |
return _sparcv9_rdtick(); |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
367 |
} |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
368 |
+#endif |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
369 |
+ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
370 |
+#if defined(_BOOT) |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
371 |
+/* |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
372 |
+ * 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
|
373 |
+ * 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
|
374 |
+ */ |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
375 |
+void OPENSSL_cpuid_setup(void) |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
376 |
+ { |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
377 |
+ OPENSSL_sparcv9cap_P = SPARCV9_VIS1; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
378 |
+ } |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
379 |
|
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
380 |
-#if 0 && defined(__sun) && defined(__SVR4) |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
381 |
+#elif 0 && defined(__sun) && defined(__SVR4) |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
382 |
/* |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
383 |
* This code path is disabled, because of incompatibility of libdevinfo.so.1 |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
384 |
* and libmalloc.so.1 (see below for details) |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
385 |
--- openssl-1.0.0e/crypto/sparccpuid.S 2010-09-05 12:48:01.000000000 -0700 |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
386 |
+++ openssl-1.0.0e_patched/crypto/sparccpuid.S 2012-02-13 07:42:58.259478325 -0800 |
3017
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
387 |
@@ -397,8 +397,13 @@ |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
388 |
.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
|
389 |
.size OPENSSL_cleanse,.-OPENSSL_cleanse |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
390 |
|
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
391 |
+#ifndef _BOOT |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
392 |
.section ".init",#alloc,#execinstr |
3017
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
393 |
call solaris_locking_setup |
da8a40fb54dd
PSARC/2014/077 OpenSSL Thread and Fork Safety
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2931
diff
changeset
|
394 |
nop |
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
395 |
call OPENSSL_cpuid_setup |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
396 |
nop |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
397 |
+#else |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
398 |
+ nop |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
399 |
+ nop |
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
400 |
+#endif |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
401 |
--- openssl-1.0.1c/crypto/Makefile Thu Aug 2 12:56:38 2012 |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
402 |
+++ openssl-1.0.1c/crypto/Makefile.new Thu Aug 2 12:59:43 2012 |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
403 |
@@ -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
|
404 |
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
|
405 |
SHARED_LIB= libcrypto$(SHLIB_EXT) |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
406 |
LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \ |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
407 |
- ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
408 |
+ 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 |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
409 |
LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \ |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
410 |
- uid.o o_time.o o_str.o o_dir.o o_fips.o o_init.o fips_ers.o $(CPUID_OBJ) |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
411 |
+ 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) |
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
412 |
|
763
45da4d38492e
7156086 OpenSSL for wanboot should not be build in a separate directory
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
413 |
SRC= $(LIBSRC) |
2593
b92e6df5eaf0
PSARC 2013/034 OpenSSL 1.0.1
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
763
diff
changeset
|
414 |
|
2931
8e563e01c224
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2593
diff
changeset
|
415 |
--- openssl-1.0.1f/ssl/s3_clnt.c Thu Jan 30 02:53:33 2014 |
8e563e01c224
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2593
diff
changeset
|
416 |
+++ openssl-1.0.1f/ssl/s3_clnt.c.new Thu Jan 30 02:57:51 2014 |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
417 |
@@ -668,7 +668,11 @@ |
2931
8e563e01c224
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2593
diff
changeset
|
418 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
419 |
p = s->s3->client_random; |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
420 |
|
2931
8e563e01c224
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2593
diff
changeset
|
421 |
+#ifndef _BOOT |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
422 |
if (ssl_fill_hello_random(s, 0, p, SSL3_RANDOM_SIZE) <= 0) |
2931
8e563e01c224
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2593
diff
changeset
|
423 |
+#else |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
424 |
+ if (RAND_pseudo_bytes(p,SSL3_RANDOM_SIZE) <= 0) |
2931
8e563e01c224
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2593
diff
changeset
|
425 |
+#endif |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
426 |
goto err; |
2931
8e563e01c224
18161027 OpenSSL 1.0.1f: ON nightly fails with missing symbol in wanboot-openssl.o
Misaki Miyashita <Misaki.Miyashita@Oracle.COM>
parents:
2593
diff
changeset
|
427 |
|
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
428 |
/* Do the message type and length last */ |
3402
110b254c69b8
19823263 Upgrade OpenSSL to 1.0.1j
Ronald Jordan <ron.jordan@oracle.com>
parents:
3272
diff
changeset
|
429 |
--- openssl-1.0.1f/ssl/s3_lib.c Wed Oct 15 11:18:30 2014 |
110b254c69b8
19823263 Upgrade OpenSSL to 1.0.1j
Ronald Jordan <ron.jordan@oracle.com>
parents:
3272
diff
changeset
|
430 |
+++ openssl-1.0.1f/ssl/s3_lib.c.new Wed Oct 15 11:20:07 2014 |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
431 |
@@ -3343,7 +3343,11 @@ |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
432 |
* Apparently we're using a version-flexible SSL_METHOD (not at its |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
433 |
* highest protocol version). |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
434 |
*/ |
3402
110b254c69b8
19823263 Upgrade OpenSSL to 1.0.1j
Ronald Jordan <ron.jordan@oracle.com>
parents:
3272
diff
changeset
|
435 |
+#ifndef _BOOT |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
436 |
if (s->ctx->method->version == SSLv23_method()->version) { |
3402
110b254c69b8
19823263 Upgrade OpenSSL to 1.0.1j
Ronald Jordan <ron.jordan@oracle.com>
parents:
3272
diff
changeset
|
437 |
+#else |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
438 |
+ if (s->ctx->method->version == TLS1_2_VERSION) { |
3402
110b254c69b8
19823263 Upgrade OpenSSL to 1.0.1j
Ronald Jordan <ron.jordan@oracle.com>
parents:
3272
diff
changeset
|
439 |
+#endif |
110b254c69b8
19823263 Upgrade OpenSSL to 1.0.1j
Ronald Jordan <ron.jordan@oracle.com>
parents:
3272
diff
changeset
|
440 |
#if TLS_MAX_VERSION != TLS1_2_VERSION |
4016
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
441 |
# error Code needs update for SSLv23_method() support beyond TLS1_2_VERSION. |
7f9e1e7611b8
20735615 Upgrade OpenSSL version to 1.0.1m
Ron Jordan <ron.jordan@oracle.com>
parents:
3402
diff
changeset
|
442 |
#endif |