Re: [Libguestfs] [PATCH] curl: Fix verification of CURLOPT_TLS13_CIPHERS

The code checking for CURLOPT_TLS13_CIPHERS option did not work properly, because of incorrect assumption that this symbol was a preprocessor macro. It is in fact element of enum type, which resulted with #ifdef directive working improperly. Change replaces compile-time verification with run-time, based on return value of curl_easy_setopt function.

Signed-off-by: Michal Orzel <michalx.orzel(a)intel.com&gt; --- plugins/curl/curl.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/curl/curl.c b/plugins/curl/curl.c index 9a818bfa..42b70f01 100644 --- a/plugins/curl/curl.c +++ b/plugins/curl/curl.c @@ -560,14 +560,13 @@ curl_open (int readonly) if (ssl_cipher_list) curl_easy_setopt (h->c, CURLOPT_SSL_CIPHER_LIST, ssl_cipher_list); if (tls13_ciphers) { -#ifdef CURLOPT_TLS13_CIPHERS - curl_easy_setopt (h->c, CURLOPT_TLS13_CIPHERS, tls13_ciphers); -#else - /* This is not available in, eg, RHEL 7 */ - nbdkit_error ("tls13-ciphers is not supported in this build of " - "nbdkit-curl-plugin"); - goto err; -#endif + r = curl_easy_setopt (h->c, CURLOPT_TLS13_CIPHERS, tls13_ciphers);

+ if (r != CURLE_OK) { + /* This is not available in, eg, RHEL 7 */ + display_curl_error (h, r, "curl_easy_setopt: CURLOPT_TLS13_CIPHERS [%s]", + tls13_ciphers); + goto err; + } } if (tcp_keepalive) curl_easy_setopt (h->c, CURLOPT_TCP_KEEPALIVE, 1L); -- 2.25.1 --------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Spolka oswiadcza, ze posiada status duzego przedsiebiorcy w rozumieniu ustawy z dnia 8 marca 2013 r. o przeciwdzialaniu nadmiernym opoznieniom w transakcjach handlowych. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.