author | Rich Burridge <rich.burridge@oracle.com> |
Fri, 09 Jan 2015 13:28:02 -0800 | |
branch | s11u2-sru |
changeset 3606 | 9b5dd01a7206 |
child 4164 | 78ce887dcfd6 |
permissions | -rw-r--r-- |
3606
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Disable SSLv3 as a default SSL/TLS version in erlang per the email thread at: |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
http://erlang.org/pipermail/erlang-questions/2014-October/081394.html |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
|
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
This change is already known upstream. |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- otp_src_R15B03/lib/ssl/src/ssl_internal.hrl.orig 2014-12-17 17:17:44.775898708 -0800 |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ otp_src_R15B03/lib/ssl/src/ssl_internal.hrl 2014-12-18 04:46:24.785282064 -0800 |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -69,7 +69,7 @@ |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
-define(TRUE, 0). |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
-define(FALSE, 1). |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
|
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
--define(DEFAULT_SUPPORTED_VERSIONS, [tlsv1, sslv3]). %% Add 'tlsv1.1' in R16 |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+-define(DEFAULT_SUPPORTED_VERSIONS, [tlsv1]). %% Add 'tlsv1.1' in R16 |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
-define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]). |
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
|
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
-record(ssl_options, { |