author | Gabriel Carrillo <gabriel.carrillo@Oracle.COM> |
Tue, 30 Jun 2015 10:45:07 -0700 | |
branch | s11u2-sru |
changeset 4571 | de7e078c69d8 |
parent 4269 | 17ea514d2fe0 |
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 |
|
4269
17ea514d2fe0
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
3606
diff
changeset
|
6 |
--- otp_src_17.5/lib/ssl/src/ssl_internal.hrl.orig 2015-04-01 17:25:29.828347756 -0700 |
17ea514d2fe0
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
3606
diff
changeset
|
7 |
+++ otp_src_17.5/lib/ssl/src/ssl_internal.hrl 2015-04-01 17:29:15.577854889 -0700 |
17ea514d2fe0
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
3606
diff
changeset
|
8 |
@@ -67,8 +67,8 @@ |
3606
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 |
|
4269
17ea514d2fe0
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
3606
diff
changeset
|
12 |
--define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]). |
17ea514d2fe0
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
3606
diff
changeset
|
13 |
--define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1, sslv3]). |
17ea514d2fe0
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
3606
diff
changeset
|
14 |
+-define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1]). |
17ea514d2fe0
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
3606
diff
changeset
|
15 |
+-define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1]). |
17ea514d2fe0
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
3606
diff
changeset
|
16 |
-define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]). |
17ea514d2fe0
20785395 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
3606
diff
changeset
|
17 |
-define(MIN_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]). |
3606
9b5dd01a7206
20231085 problem in UTILITY/ERLANG
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |