Skip to content

Commit 19ae308

Browse files
Shigeki OhtsuMyles Borins
Shigeki Ohtsu
authored and
Myles Borins
committed
deps: update openssl config
OPENSSL_NO_SSL2 and OPENSSL_NO_WEAK_SSL_CIPHERS are defined in opensslconf.h Fixes: nodejs/Release#85 PR-URL: #5630 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Fedor Indutny <fedor@indutny.com>
1 parent 067ce9b commit 19ae308

File tree

18 files changed

+204
-4
lines changed

18 files changed

+204
-4
lines changed

‎deps/openssl/config/archs/BSD-x86/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@ extern "C" {
3838
#ifndef OPENSSL_NO_SSL_TRACE
3939
# define OPENSSL_NO_SSL_TRACE
4040
#endif
41+
#ifndef OPENSSL_NO_SSL2
42+
# define OPENSSL_NO_SSL2
43+
#endif
4144
#ifndef OPENSSL_NO_STORE
4245
# define OPENSSL_NO_STORE
4346
#endif
4447
#ifndef OPENSSL_NO_UNIT_TEST
4548
# define OPENSSL_NO_UNIT_TEST
4649
#endif
50+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
51+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
52+
#endif
4753

4854
#endif /* OPENSSL_DOING_MAKEDEPEND */
4955

@@ -89,12 +95,18 @@ extern "C" {
8995
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9096
# define NO_SSL_TRACE
9197
# endif
98+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
99+
# define NO_SSL2
100+
# endif
92101
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
93102
# define NO_STORE
94103
# endif
95104
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
96105
# define NO_UNIT_TEST
97106
# endif
107+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
108+
# define NO_WEAK_SSL_CIPHERS
109+
# endif
98110
#endif
99111

100112

‎deps/openssl/config/archs/BSD-x86_64/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@ extern "C" {
3838
#ifndef OPENSSL_NO_SSL_TRACE
3939
# define OPENSSL_NO_SSL_TRACE
4040
#endif
41+
#ifndef OPENSSL_NO_SSL2
42+
# define OPENSSL_NO_SSL2
43+
#endif
4144
#ifndef OPENSSL_NO_STORE
4245
# define OPENSSL_NO_STORE
4346
#endif
4447
#ifndef OPENSSL_NO_UNIT_TEST
4548
# define OPENSSL_NO_UNIT_TEST
4649
#endif
50+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
51+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
52+
#endif
4753

4854
#endif /* OPENSSL_DOING_MAKEDEPEND */
4955

@@ -89,12 +95,18 @@ extern "C" {
8995
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9096
# define NO_SSL_TRACE
9197
# endif
98+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
99+
# define NO_SSL2
100+
# endif
92101
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
93102
# define NO_STORE
94103
# endif
95104
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
96105
# define NO_UNIT_TEST
97106
# endif
107+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
108+
# define NO_WEAK_SSL_CIPHERS
109+
# endif
98110
#endif
99111

100112

‎deps/openssl/config/archs/VC-WIN32/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,18 @@ extern "C" {
4141
#ifndef OPENSSL_NO_SSL_TRACE
4242
# define OPENSSL_NO_SSL_TRACE
4343
#endif
44+
#ifndef OPENSSL_NO_SSL2
45+
# define OPENSSL_NO_SSL2
46+
#endif
4447
#ifndef OPENSSL_NO_STORE
4548
# define OPENSSL_NO_STORE
4649
#endif
4750
#ifndef OPENSSL_NO_UNIT_TEST
4851
# define OPENSSL_NO_UNIT_TEST
4952
#endif
53+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
54+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
55+
#endif
5056

5157
#endif /* OPENSSL_DOING_MAKEDEPEND */
5258

@@ -89,12 +95,18 @@ extern "C" {
8995
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9096
# define NO_SSL_TRACE
9197
# endif
98+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
99+
# define NO_SSL2
100+
# endif
92101
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
93102
# define NO_STORE
94103
# endif
95104
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
96105
# define NO_UNIT_TEST
97106
# endif
107+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
108+
# define NO_WEAK_SSL_CIPHERS
109+
# endif
98110
#endif
99111

100112

‎deps/openssl/config/archs/VC-WIN64A/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,18 @@ extern "C" {
4141
#ifndef OPENSSL_NO_SSL_TRACE
4242
# define OPENSSL_NO_SSL_TRACE
4343
#endif
44+
#ifndef OPENSSL_NO_SSL2
45+
# define OPENSSL_NO_SSL2
46+
#endif
4447
#ifndef OPENSSL_NO_STORE
4548
# define OPENSSL_NO_STORE
4649
#endif
4750
#ifndef OPENSSL_NO_UNIT_TEST
4851
# define OPENSSL_NO_UNIT_TEST
4952
#endif
53+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
54+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
55+
#endif
5056

5157
#endif /* OPENSSL_DOING_MAKEDEPEND */
5258

@@ -89,12 +95,18 @@ extern "C" {
8995
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9096
# define NO_SSL_TRACE
9197
# endif
98+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
99+
# define NO_SSL2
100+
# endif
92101
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
93102
# define NO_STORE
94103
# endif
95104
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
96105
# define NO_UNIT_TEST
97106
# endif
107+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
108+
# define NO_WEAK_SSL_CIPHERS
109+
# endif
98110
#endif
99111

100112

‎deps/openssl/config/archs/aix-gcc/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,18 @@ extern "C" {
4141
#ifndef OPENSSL_NO_SSL_TRACE
4242
# define OPENSSL_NO_SSL_TRACE
4343
#endif
44+
#ifndef OPENSSL_NO_SSL2
45+
# define OPENSSL_NO_SSL2
46+
#endif
4447
#ifndef OPENSSL_NO_STORE
4548
# define OPENSSL_NO_STORE
4649
#endif
4750
#ifndef OPENSSL_NO_UNIT_TEST
4851
# define OPENSSL_NO_UNIT_TEST
4952
#endif
53+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
54+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
55+
#endif
5056

5157
#endif /* OPENSSL_DOING_MAKEDEPEND */
5258

@@ -92,12 +98,18 @@ extern "C" {
9298
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9399
# define NO_SSL_TRACE
94100
# endif
101+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
102+
# define NO_SSL2
103+
# endif
95104
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
96105
# define NO_STORE
97106
# endif
98107
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
99108
# define NO_UNIT_TEST
100109
# endif
110+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
111+
# define NO_WEAK_SSL_CIPHERS
112+
# endif
101113
#endif
102114

103115

‎deps/openssl/config/archs/aix64-gcc/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,18 @@ extern "C" {
4141
#ifndef OPENSSL_NO_SSL_TRACE
4242
# define OPENSSL_NO_SSL_TRACE
4343
#endif
44+
#ifndef OPENSSL_NO_SSL2
45+
# define OPENSSL_NO_SSL2
46+
#endif
4447
#ifndef OPENSSL_NO_STORE
4548
# define OPENSSL_NO_STORE
4649
#endif
4750
#ifndef OPENSSL_NO_UNIT_TEST
4851
# define OPENSSL_NO_UNIT_TEST
4952
#endif
53+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
54+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
55+
#endif
5056

5157
#endif /* OPENSSL_DOING_MAKEDEPEND */
5258

@@ -92,12 +98,18 @@ extern "C" {
9298
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9399
# define NO_SSL_TRACE
94100
# endif
101+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
102+
# define NO_SSL2
103+
# endif
95104
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
96105
# define NO_STORE
97106
# endif
98107
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
99108
# define NO_UNIT_TEST
100109
# endif
110+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
111+
# define NO_WEAK_SSL_CIPHERS
112+
# endif
101113
#endif
102114

103115

‎deps/openssl/config/archs/darwin-i386-cc/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,18 @@ extern "C" {
4141
#ifndef OPENSSL_NO_SSL_TRACE
4242
# define OPENSSL_NO_SSL_TRACE
4343
#endif
44+
#ifndef OPENSSL_NO_SSL2
45+
# define OPENSSL_NO_SSL2
46+
#endif
4447
#ifndef OPENSSL_NO_STORE
4548
# define OPENSSL_NO_STORE
4649
#endif
4750
#ifndef OPENSSL_NO_UNIT_TEST
4851
# define OPENSSL_NO_UNIT_TEST
4952
#endif
53+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
54+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
55+
#endif
5056

5157
#endif /* OPENSSL_DOING_MAKEDEPEND */
5258

@@ -92,12 +98,18 @@ extern "C" {
9298
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9399
# define NO_SSL_TRACE
94100
# endif
101+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
102+
# define NO_SSL2
103+
# endif
95104
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
96105
# define NO_STORE
97106
# endif
98107
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
99108
# define NO_UNIT_TEST
100109
# endif
110+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
111+
# define NO_WEAK_SSL_CIPHERS
112+
# endif
101113
#endif
102114

103115

‎deps/openssl/config/archs/darwin64-x86_64-cc/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,18 @@ extern "C" {
4141
#ifndef OPENSSL_NO_SSL_TRACE
4242
# define OPENSSL_NO_SSL_TRACE
4343
#endif
44+
#ifndef OPENSSL_NO_SSL2
45+
# define OPENSSL_NO_SSL2
46+
#endif
4447
#ifndef OPENSSL_NO_STORE
4548
# define OPENSSL_NO_STORE
4649
#endif
4750
#ifndef OPENSSL_NO_UNIT_TEST
4851
# define OPENSSL_NO_UNIT_TEST
4952
#endif
53+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
54+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
55+
#endif
5056

5157
#endif /* OPENSSL_DOING_MAKEDEPEND */
5258

@@ -92,12 +98,18 @@ extern "C" {
9298
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9399
# define NO_SSL_TRACE
94100
# endif
101+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
102+
# define NO_SSL2
103+
# endif
95104
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
96105
# define NO_STORE
97106
# endif
98107
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
99108
# define NO_UNIT_TEST
100109
# endif
110+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
111+
# define NO_WEAK_SSL_CIPHERS
112+
# endif
101113
#endif
102114

103115

‎deps/openssl/config/archs/linux-aarch64/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@ extern "C" {
3838
#ifndef OPENSSL_NO_SSL_TRACE
3939
# define OPENSSL_NO_SSL_TRACE
4040
#endif
41+
#ifndef OPENSSL_NO_SSL2
42+
# define OPENSSL_NO_SSL2
43+
#endif
4144
#ifndef OPENSSL_NO_STORE
4245
# define OPENSSL_NO_STORE
4346
#endif
4447
#ifndef OPENSSL_NO_UNIT_TEST
4548
# define OPENSSL_NO_UNIT_TEST
4649
#endif
50+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
51+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
52+
#endif
4753

4854
#endif /* OPENSSL_DOING_MAKEDEPEND */
4955

@@ -89,12 +95,18 @@ extern "C" {
8995
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9096
# define NO_SSL_TRACE
9197
# endif
98+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
99+
# define NO_SSL2
100+
# endif
92101
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
93102
# define NO_STORE
94103
# endif
95104
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
96105
# define NO_UNIT_TEST
97106
# endif
107+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
108+
# define NO_WEAK_SSL_CIPHERS
109+
# endif
98110
#endif
99111

100112

‎deps/openssl/config/archs/linux-armv4/opensslconf.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@ extern "C" {
3838
#ifndef OPENSSL_NO_SSL_TRACE
3939
# define OPENSSL_NO_SSL_TRACE
4040
#endif
41+
#ifndef OPENSSL_NO_SSL2
42+
# define OPENSSL_NO_SSL2
43+
#endif
4144
#ifndef OPENSSL_NO_STORE
4245
# define OPENSSL_NO_STORE
4346
#endif
4447
#ifndef OPENSSL_NO_UNIT_TEST
4548
# define OPENSSL_NO_UNIT_TEST
4649
#endif
50+
#ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
51+
# define OPENSSL_NO_WEAK_SSL_CIPHERS
52+
#endif
4753

4854
#endif /* OPENSSL_DOING_MAKEDEPEND */
4955

@@ -89,12 +95,18 @@ extern "C" {
8995
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
9096
# define NO_SSL_TRACE
9197
# endif
98+
# if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2)
99+
# define NO_SSL2
100+
# endif
92101
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
93102
# define NO_STORE
94103
# endif
95104
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
96105
# define NO_UNIT_TEST
97106
# endif
107+
# if defined(OPENSSL_NO_WEAK_SSL_CIPHERS) && !defined(NO_WEAK_SSL_CIPHERS)
108+
# define NO_WEAK_SSL_CIPHERS
109+
# endif
98110
#endif
99111

100112

0 commit comments

Comments
 (0)