From 2ed4d0316838115a6799c822dc622f8a18c68c06 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Fri, 6 Oct 2017 09:34:08 +0200 Subject: [PATCH] Renamed ciphers_settings as ciphers_setting . --- library/network/http_client/README.md | 2 +- .../http_client/src/http_client_session.e | 17 ++++++++--------- .../spec/libcurl/libcurl_http_client_request.e | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/library/network/http_client/README.md b/library/network/http_client/README.md index 6a995c8c..26d18b85 100644 --- a/library/network/http_client/README.md +++ b/library/network/http_client/README.md @@ -10,7 +10,7 @@ It provides simple routine to perform http requests, and get response. - Eiffel Net library - and optionally Eiffel NetSSL library to support `https://...` -* Note: set ciphers settings is supported only with libcurl implementation for now, net implementation +* Note: set ciphers setting is supported only with libcurl implementation for now, net implementation set all the ciphers as part of the OpenSSL initialization. This means on Windows, do not forget to copy the libcurl.dll (and related) either in the same directory of the executable, or ensure the .dll are in the PATH environment. diff --git a/library/network/http_client/src/http_client_session.e b/library/network/http_client/src/http_client_session.e index ae9177f6..e0b469dc 100644 --- a/library/network/http_client/src/http_client_session.e +++ b/library/network/http_client/src/http_client_session.e @@ -272,14 +272,13 @@ feature -- Authentication -- Associated optional credentials value. -- Computed as `username':`password'. - ciphers_settings: detachable READABLE_STRING_8 + ciphers_setting: detachable READABLE_STRING_8 -- SSL cipher preference lists -- examples: DEFAULT, ALL, TLSv1 -- check https://www.openssl.org/docs/man1.1.0/apps/ciphers.html - --Warning At the moment only used for LIB_CURL_HTTP_CLIENT - --Warning Net implementation set all the ciphers using the OpenSSL at - --Warning initialization time. - + -- Warning: At the moment only used for LIB_CURL_HTTP_CLIENT + -- Net implementation set all the ciphers using the OpenSSL at + -- initialization time. feature -- Status setting @@ -410,12 +409,12 @@ feature -- Element change chunk_size := a_size end - set_ciphers_settings (a_ciphers_settings: READABLE_STRING_8) - -- Set 'ciphers_settings' with 'a_ciphers_settings'. + set_ciphers_setting (a_ciphers_setting: READABLE_STRING_8) + -- Set 'ciphers_setting' with 'a_ciphers_setting'. do - create {STRING_8} ciphers_settings.make_from_string (a_ciphers_settings) + create {STRING_8} ciphers_setting.make_from_string (a_ciphers_setting) ensure - cipher_settings_set: attached ciphers_settings as c_settings and then c_settings.same_string (a_ciphers_settings) + ciphers_setting_set: attached ciphers_setting as c_setting and then c_setting.same_string (a_ciphers_setting) end note diff --git a/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e b/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e index 5fda6c06..37a784b6 100644 --- a/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e +++ b/library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e @@ -373,7 +373,7 @@ feature -- Execution end --| Cipher List - if attached session.ciphers_settings as c_list then + if attached session.ciphers_setting as c_list then curl_easy.setopt_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_ssl_cipher_list, c_list ) end