File 2055-orber-Disable-SSL-verify-hostname-check-in... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2055-orber-Disable-SSL-verify-hostname-check-in-the-tests.patch of Package erlang (Revision 9ab000d813aa84398fa43a878ac8fe52)

Currently displaying revision 9ab000d813aa84398fa43a878ac8fe52 , Show latest

From 1350610326a0dc00343371bfe34ebee679813dc0 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Tue, 9 May 2017 10:51:29 +0200
Subject: [PATCH 1/2] [orber] Disable SSL verify hostname check in the tests

---
 lib/orber/test/orber_test_lib.erl | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/lib/orber/test/orber_test_lib.erl b/lib/orber/test/orber_test_lib.erl
index 95ab26cd3..4a247ce49 100644
--- a/lib/orber/test/orber_test_lib.erl
+++ b/lib/orber/test/orber_test_lib.erl
@@ -356,11 +356,17 @@ get_options(ssl, Role, Level) ->
 
 get_options(ssl, Role, 2, Options) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
-    [{depth, 2},
-     {verify, 2},
-     {keyfile, filename:join([Dir, Role, "key.pem"])},
-     {cacertfile, filename:join([Dir, Role, "cacerts.pem"])},
-     {certfile, filename:join([Dir, Role, "cert.pem"])} |Options];
+    Options1 = [{depth, 2},
+                {verify, 2},
+                {keyfile, filename:join([Dir, Role, "key.pem"])},
+                {cacertfile, filename:join([Dir, Role, "cacerts.pem"])},
+                {certfile, filename:join([Dir, Role, "cert.pem"])} |Options],
+    case Role of
+        client ->
+            [{server_name_indication, disable} |Options1];
+        server ->
+            Options1
+    end;
 get_options(iiop_ssl, _Role, 2, Options) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
     [{ssl_server_options, [{depth, 2},
@@ -369,10 +375,11 @@ get_options(iiop_ssl, _Role, 2, Options) ->
 			{cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
 			{keyfile, filename:join([Dir, "server", "key.pem"])}]},
      {ssl_client_options, [{depth, 2},
-			{verify, 2},
-			{certfile, filename:join([Dir, "client", "cert.pem"])},
-			{cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
-			{keyfile, filename:join([Dir, "client", "key.pem"])}]},
+                           {verify, 2},
+                           {server_name_indication, disable},
+                           {certfile, filename:join([Dir, "client", "cert.pem"])},
+                           {cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
+                           {keyfile, filename:join([Dir, "client", "key.pem"])}]},
      {secure, ssl} |Options];
 get_options(iiop_ssl, _Role, 1, Options) ->
     Dir = filename:join([code:lib_dir(ssl), "examples", "certs", "etc"]),
@@ -382,10 +389,11 @@ get_options(iiop_ssl, _Role, 1, Options) ->
 			{cacertfile, filename:join([Dir, "server", "cacerts.pem"])},
 			{keyfile, filename:join([Dir, "server", "key.pem"])}]},
      {ssl_client_options, [{depth, 1},
-			{verify, 0},
-			{certfile, filename:join([Dir, "client", "cert.pem"])},
-			{cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
-			{keyfile, filename:join([Dir, "client", "key.pem"])}]},
+                           {verify, 0},
+                           {server_name_indication, disable},
+                           {certfile, filename:join([Dir, "client", "cert.pem"])},
+                           {cacertfile, filename:join([Dir, "client", "cacerts.pem"])},
+                           {keyfile, filename:join([Dir, "client", "key.pem"])}]},
      {secure, ssl} |Options].
 
 create_paths() ->
-- 
2.13.0

Places

File 2055-orber-Disable-SSL-verify-hostname-check-in-the-tests.patch of Package erlang (Revision 9ab000d813aa84398fa43a878ac8fe52)

Places