mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed ciphers_settings as ciphers_setting .

Browse Source
This commit is contained in:
Jocelyn Fiat
2017-10-06 09:34:08 +02:00
parent 18ed92a61d
commit 2ed4d03168
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/network/http_client/README.md
View File

@@ -10,7 +10,7 @@ It provides simple routine to perform http requests, and get response.
- Eiffel Net library - Eiffel Net library
- and optionally Eiffel NetSSL library to support `https://...` - 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. 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. 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.

17
library/network/http_client/src/http_client_session.e
View File

@@ -272,14 +272,13 @@ feature -- Authentication
-- Associated optional credentials value. -- Associated optional credentials value.
-- Computed as `username':`password'. -- Computed as `username':`password'.
ciphers_settings: detachable READABLE_STRING_8 ciphers_setting: detachable READABLE_STRING_8
-- SSL cipher preference lists -- SSL cipher preference lists
-- examples: DEFAULT, ALL, TLSv1 -- examples: DEFAULT, ALL, TLSv1
-- check https://www.openssl.org/docs/man1.1.0/apps/ciphers.html -- check https://www.openssl.org/docs/man1.1.0/apps/ciphers.html
--Warning At the moment only used for LIB_CURL_HTTP_CLIENT -- Warning: At the moment only used for LIB_CURL_HTTP_CLIENT
--Warning Net implementation set all the ciphers using the OpenSSL at -- Net implementation set all the ciphers using the OpenSSL at
--Warning initialization time. -- initialization time.
feature -- Status setting feature -- Status setting
@@ -410,12 +409,12 @@ feature -- Element change
chunk_size := a_size chunk_size := a_size
end end
set_ciphers_settings (a_ciphers_settings: READABLE_STRING_8) set_ciphers_setting (a_ciphers_setting: READABLE_STRING_8)
-- Set 'ciphers_settings' with 'a_ciphers_settings'. -- Set 'ciphers_setting' with 'a_ciphers_setting'.
do do
create {STRING_8} ciphers_settings.make_from_string (a_ciphers_settings) create {STRING_8} ciphers_setting.make_from_string (a_ciphers_setting)
ensure 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 end
note note

2
library/network/http_client/src/spec/libcurl/libcurl_http_client_request.e
View File

@@ -373,7 +373,7 @@ feature -- Execution
end end
--| Cipher List --| 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 ) curl_easy.setopt_string (curl_handle, {CURL_OPT_CONSTANTS}.curlopt_ssl_cipher_list, c_list )
end end