romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-10 13:37:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib1587: fix gcc -Wconversion with LibreSSL on Windows, test in CI

Browse source 
By exposing and reusing existing custom type via `vtls/openss.h`.

Also:
- GHA/curl-for-win: test in CI by enabling building tests.
  Cost is 45s per job, so limit it to the gcc job.

Seen with Windows x64 gcc (not tested in CI prior to this patch):
```
tests/libtest/lib1587.c:50:7: error: conversion from 'opt1587' {aka 'long long unsigned int'} to 'long int' may change value [-Werror=conversion]
   50 |       SSL_CTX_set_options(info->internals, opts);
      |       ^~~~~~~~~~~~~~~~~~~
tests/libtest/lib1587.c:59:7: error: conversion from 'opt1587' {aka 'long long unsigned int'} to 'long int' may change value [-Werror=conversion]
   59 |       SSL_set_options(info->internals, opts);
      |       ^~~~~~~~~~~~~~~
```
Ref: https://github.com/curl/curl/actions/runs/28258372229/job/83727170184?pr=22195#step:3:4884

Ref: da2f05e6f6 #22198
Ref: 6163566461 #22197
Follow-up to 3e40ccb875 #21290
Follow-up to 2db8ae480f #17809 #17801

Closes #22195
This commit is contained in:
Viktor Szakats 2026-06-26 19:48:17 +02:00
parent da2f05e6f6
commit 9f9d2d10d9
No known key found for this signature in database
4 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/curl-for-win.yml vendored
View file

@ -185,7 +185,7 @@ jobs:
run: |
git clone --depth 1 https://github.com/curl/curl-for-win
mv curl-for-win/* .
export CW_CONFIG='-main-werror-unitybatch-nocertdata-win-x64-gcc-zlibold-noWINE'
export CW_CONFIG='-main-werror-unitybatch-nocertdata-curltests-win-x64-gcc-zlibold-noWINE'
export CW_REVISION="${GITHUB_SHA}"
. ./_versions.sh
sudo podman image trust set --type reject default

8
lib/vtls/openssl.c
View file

@ -2630,14 +2630,6 @@ static CURLcode ossl_set_ssl_version_min_max(struct Curl_cfilter *cf,
return CURLE_OK;
}
#ifdef LIBRESSL_VERSION_NUMBER
typedef long ctx_option_t;
#elif defined(HAVE_BORINGSSL_LIKE)
typedef uint32_t ctx_option_t;
#else
typedef uint64_t ctx_option_t;
#endif
CURLcode Curl_ossl_add_session(struct Curl_cfilter *cf,
struct Curl_easy *data,
const char *ssl_peer_key,

8
lib/vtls/openssl.h
View file

@ -100,6 +100,14 @@
#define HAVE_OPENSSL_EARLYDATA
#endif
#ifdef LIBRESSL_VERSION_NUMBER
typedef long ctx_option_t;
#elif defined(HAVE_BORINGSSL_LIKE)
typedef uint32_t ctx_option_t;
#else
typedef uint64_t ctx_option_t;
#endif
struct alpn_spec;
struct ssl_peer;
struct Curl_ssl_session;

11
tests/libtest/lib1587.c
View file

@ -26,13 +26,6 @@
#ifdef USE_OPENSSL
#include <vtls/openssl.h>
#ifdef HAVE_BORINGSSL_LIKE
/* AWS-LC and BoringSSL */
typedef uint32_t opt1587;
#else
typedef uint64_t opt1587;
#endif
static size_t write_cb(char *ptr, size_t size, size_t nmemb, void *stream)
{
const struct curl_tlssessioninfo *info;
@ -46,7 +39,7 @@ static size_t write_cb(char *ptr, size_t size, size_t nmemb, void *stream)
if(result == CURLE_OK) {
/* set and read stuff using the SSL_CTX to verify it */
opt1587 opts = SSL_CTX_get_options(info->internals);
ctx_option_t opts = SSL_CTX_get_options(info->internals);
SSL_CTX_set_options(info->internals, opts);
curl_mprintf("CURLINFO_TLS_SESSION: OK\n");
}
@ -55,7 +48,7 @@ static size_t write_cb(char *ptr, size_t size, size_t nmemb, void *stream)
if(result == CURLE_OK) {
/* set and read stuff using the SSL pointer to verify it */
opt1587 opts = SSL_get_options(info->internals);
ctx_option_t opts = SSL_get_options(info->internals);
SSL_set_options(info->internals, opts);
curl_mprintf("CURLINFO_TLS_SSL_PTR: OK\n");
}