From 5c3190542792f6653b1104e65268130c96b7e0c8 Mon Sep 17 00:00:00 2001 From: jvelilla Date: Wed, 21 Jun 2017 18:34:07 -0300 Subject: [PATCH] Updated EWF http_network, websocket, httpd to use the latest EiffelNet SSL version. --- .../src/ssl/http_stream_secure_socket.e | 15 ++++++++------- .../websocket/client/src/ssl/web_socket_client.e | 4 +--- .../httpd/configuration/httpd_configuration_i.e | 9 +-------- library/server/httpd/ssl/httpd_configuration.e | 8 +------- 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/library/network/http_network/src/ssl/http_stream_secure_socket.e b/library/network/http_network/src/ssl/http_stream_secure_socket.e index bb49cd19..c14aec4f 100644 --- a/library/network/http_network/src/ssl/http_stream_secure_socket.e +++ b/library/network/http_network/src/ssl/http_stream_secure_socket.e @@ -54,12 +54,6 @@ feature -- Secure connection Helpers set_tls_protocol (v) end - set_secure_protocol_to_ssl_2_or_3 - -- Set `ssl_protocol' with `Ssl_23'. - do - set_secure_protocol ({SSL_PROTOCOL}.Ssl_23) - end - set_secure_protocol_to_tls_1_0 -- Set `ssl_protocol' with `Tls_1_0'. do @@ -176,7 +170,14 @@ feature -- Output end note - copyright: "2011-2013, Javier Velilla, Jocelyn Fiat and others" + copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" + source: "[ + Eiffel Software + 5949 Hollister Ave., Goleta, CA 93117 USA + Telephone 805-685-1006, Fax 805-685-6869 + Website http://www.eiffel.com + Customer support http://support.eiffel.com + ]" end diff --git a/library/network/websocket/client/src/ssl/web_socket_client.e b/library/network/websocket/client/src/ssl/web_socket_client.e index 12dae408..d0639a62 100644 --- a/library/network/websocket/client/src/ssl/web_socket_client.e +++ b/library/network/websocket/client/src/ssl/web_socket_client.e @@ -26,9 +26,7 @@ feature -- Factory create l_secure.make_client_by_port (a_port, a_host) Result := l_secure if attached secure_protocol as l_prot then - if l_prot.is_case_insensitive_equal ("ssl_2_3") then - l_secure.set_secure_protocol_to_ssl_2_or_3 - elseif l_prot.is_case_insensitive_equal ("tls_1_0") then + if l_prot.is_case_insensitive_equal ("tls_1_0") then l_secure.set_secure_protocol_to_tls_1_0 elseif l_prot.is_case_insensitive_equal ("tls_1_1") then l_secure.set_secure_protocol_to_tls_1_1 diff --git a/library/server/httpd/configuration/httpd_configuration_i.e b/library/server/httpd/configuration/httpd_configuration_i.e index 74503928..61e702a9 100644 --- a/library/server/httpd/configuration/httpd_configuration_i.e +++ b/library/server/httpd/configuration/httpd_configuration_i.e @@ -297,9 +297,7 @@ feature -- Element change set_secure_protocol_from_string (a_ssl_version: READABLE_STRING_GENERAL) -- Set `secure_protocol' with `a_ssl_version' do - if a_ssl_version.is_case_insensitive_equal ("ssl_2_3") then - set_secure_protocol_to_ssl_2_or_3 - elseif a_ssl_version.is_case_insensitive_equal ("tls_1_0") then + if a_ssl_version.is_case_insensitive_equal ("tls_1_0") then set_secure_protocol_to_tls_1_0 elseif a_ssl_version.is_case_insensitive_equal ("tls_1_1") then set_secure_protocol_to_tls_1_1 @@ -314,11 +312,6 @@ feature -- Element change feature -- SSL Helpers - set_secure_protocol_to_ssl_2_or_3 - -- Set `secure_protocol' with `Ssl_23'. - deferred - end - set_secure_protocol_to_tls_1_0 -- Set `secure_protocol' with `Tls_1_0'. deferred diff --git a/library/server/httpd/ssl/httpd_configuration.e b/library/server/httpd/ssl/httpd_configuration.e index 1a5d1961..e0901a1a 100644 --- a/library/server/httpd/ssl/httpd_configuration.e +++ b/library/server/httpd/ssl/httpd_configuration.e @@ -35,12 +35,6 @@ feature -- Access feature -- SSL Helpers - set_secure_protocol_to_ssl_2_or_3 - -- Set `secure_protocol' with `Ssl_23'. - do - set_secure_protocol ({SSL_PROTOCOL}.Ssl_23) - end - set_secure_protocol_to_tls_1_0 -- Set `secure_protocol' with `Tls_1_0'. do @@ -67,7 +61,7 @@ feature -- SSL Helpers note - copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Eiffel Software and others" + copyright: "2011-2017, Jocelyn Fiat, Javier Velilla, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software