Skip to content

vtls: fix static function name collisions between TLS backends - #14516

Closed
vszakats wants to merge 2 commits into
curl:masterfrom
vszakats:multi-static
Closed

vszakats wants to merge 2 commits into
curl:masterfrom
vszakats:multi-static

Conversation

@vszakats

@vszakats vszakats commented Aug 12, 2024 •

Copy link
Copy Markdown
Member

When using CMake Unity build.

  • use unique name for set_ssl_version_min_max()
    Fixes collision between GnuTLS, mbedTLS and SecureTransport.

    lib\vtls\mbedtls.c(317,1): error C2084: function 'CURLcode set_ssl_version_min_max(Curl_easy *,ssl_peer *,ssl_primary_config *,const char **,const char *)' already has a body
    lib\vtls\mbedtls.c(837,49): warning C4133: 'function': incompatible types - from 'Curl_cfilter *' to 'Curl_easy *'
    lib\vtls\mbedtls.c(837,53): warning C4133: 'function': incompatible types - from 'Curl_easy *' to 'ssl_peer *'
    lib\vtls\mbedtls.c(837,25): error C2198: 'set_ssl_version_min_max': too few arguments for call
    
  • use unique name for do_file_type()
    Fixes collision between GnuTLS, OpenSSL and wolfSSL.

    lib\vtls\openssl.c(1053,12): error C2084: function 'gnutls_x509_crt_fmt_t do_file_type(const char *)' already has a body
    

Ref: https://github.com/curl/curl/actions/runs/10341162641/job/28622681573?pr=14484#step:10:31
Cherry-picked from #14495
Closes #14516

Avoid collision between gnutls, mbedtls and securetransport.

```
lib\vtls\mbedtls.c(317,1): error C2084: function 'CURLcode set_ssl_version_min_max(Curl_easy *,ssl_peer *,ssl_primary_config *,const char **,const char *)' already has a body
lib\vtls\mbedtls.c(837,49): warning C4133: 'function': incompatible types - from 'Curl_cfilter *' to 'Curl_easy *'
lib\vtls\mbedtls.c(837,53): warning C4133: 'function': incompatible types - from 'Curl_easy *' to 'ssl_peer *'
lib\vtls\mbedtls.c(837,25): error C2198: 'set_ssl_version_min_max': too few arguments for call
```
Ref: https://github.com/curl/curl/actions/runs/10341162641/job/28622681573?pr=14484#step:10:31
Avoids collision between gnutls, openssl and wolfssl.

```
lib\vtls\openssl.c(1053,12): error C2084: function 'gnutls_x509_crt_fmt_t do_file_type(const char *)' already has a body
```
Ref: https://github.com/curl/curl/actions/runs/10341162641/job/28622681573?pr=14484#step:10:31
@vszakats vszakats closed this in 71d3ab5 Aug 13, 2024
@vszakats
vszakats deleted the multi-static branch August 13, 2024 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant