Updated EWF http_network, websocket, httpd to use the latest EiffelNet SSL

version.
This commit is contained in:
jvelilla
2017-06-21 18:34:07 -03:00
parent c7ef652322
commit 5c31905427
4 changed files with 11 additions and 25 deletions

View File

@@ -54,12 +54,6 @@ feature -- Secure connection Helpers
set_tls_protocol (v) set_tls_protocol (v)
end 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_secure_protocol_to_tls_1_0
-- Set `ssl_protocol' with `Tls_1_0'. -- Set `ssl_protocol' with `Tls_1_0'.
do do
@@ -176,7 +170,14 @@ feature -- Output
end end
note 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)" 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 end

View File

@@ -26,9 +26,7 @@ feature -- Factory
create l_secure.make_client_by_port (a_port, a_host) create l_secure.make_client_by_port (a_port, a_host)
Result := l_secure Result := l_secure
if attached secure_protocol as l_prot then if attached secure_protocol as l_prot then
if l_prot.is_case_insensitive_equal ("ssl_2_3") then if l_prot.is_case_insensitive_equal ("tls_1_0") then
l_secure.set_secure_protocol_to_ssl_2_or_3
elseif l_prot.is_case_insensitive_equal ("tls_1_0") then
l_secure.set_secure_protocol_to_tls_1_0 l_secure.set_secure_protocol_to_tls_1_0
elseif l_prot.is_case_insensitive_equal ("tls_1_1") then elseif l_prot.is_case_insensitive_equal ("tls_1_1") then
l_secure.set_secure_protocol_to_tls_1_1 l_secure.set_secure_protocol_to_tls_1_1

View File

@@ -297,9 +297,7 @@ feature -- Element change
set_secure_protocol_from_string (a_ssl_version: READABLE_STRING_GENERAL) set_secure_protocol_from_string (a_ssl_version: READABLE_STRING_GENERAL)
-- Set `secure_protocol' with `a_ssl_version' -- Set `secure_protocol' with `a_ssl_version'
do do
if a_ssl_version.is_case_insensitive_equal ("ssl_2_3") then if a_ssl_version.is_case_insensitive_equal ("tls_1_0") then
set_secure_protocol_to_ssl_2_or_3
elseif a_ssl_version.is_case_insensitive_equal ("tls_1_0") then
set_secure_protocol_to_tls_1_0 set_secure_protocol_to_tls_1_0
elseif a_ssl_version.is_case_insensitive_equal ("tls_1_1") then elseif a_ssl_version.is_case_insensitive_equal ("tls_1_1") then
set_secure_protocol_to_tls_1_1 set_secure_protocol_to_tls_1_1
@@ -314,11 +312,6 @@ feature -- Element change
feature -- SSL Helpers 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_to_tls_1_0
-- Set `secure_protocol' with `Tls_1_0'. -- Set `secure_protocol' with `Tls_1_0'.
deferred deferred

View File

@@ -35,12 +35,6 @@ feature -- Access
feature -- SSL Helpers 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_to_tls_1_0
-- Set `secure_protocol' with `Tls_1_0'. -- Set `secure_protocol' with `Tls_1_0'.
do do
@@ -67,7 +61,7 @@ feature -- SSL Helpers
note 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)" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[ source: "[
Eiffel Software Eiffel Software