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

openssl: fix building against no-dsa openssl

Browse source 
(Not tested in CI. Regression within this release cycle.)

Fixing:
```
lib/vtls/openssl.c:304:48: error: unused parameter 'data' [-Werror,-Wunused-parameter]
  304 | static CURLcode get_pkey_dsa(struct Curl_easy *data,
      |                                                ^
lib/vtls/openssl.c:305:40: error: unused parameter 'pubkey' [-Werror,-Wunused-parameter]
  305 |                              EVP_PKEY *pubkey, BIO *mem, int i)
      |                                        ^
lib/vtls/openssl.c:305:53: error: unused parameter 'mem' [-Werror,-Wunused-parameter]
  305 |                              EVP_PKEY *pubkey, BIO *mem, int i)
      |                                                     ^
lib/vtls/openssl.c:305:62: error: unused parameter 'i' [-Werror,-Wunused-parameter]
  305 |                              EVP_PKEY *pubkey, BIO *mem, int i)
      |                                                              ^
```

Follow-up to 833efb437d #19471

Closes #20127
This commit is contained in:
Viktor Szakats 2025-12-31 14:29:24 +01:00
parent ba7e729ffd
commit be675eeb6d
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/vtls/openssl.c
View file

@ -301,11 +301,11 @@ static CURLcode get_pkey_rsa(struct Curl_easy *data,
return result;
}
#ifndef OPENSSL_NO_DSA
static CURLcode get_pkey_dsa(struct Curl_easy *data,
EVP_PKEY *pubkey, BIO *mem, int i)
{
CURLcode result = CURLE_OK;
#ifndef OPENSSL_NO_DSA
#ifndef HAVE_EVP_PKEY_GET_PARAMS
DSA *dsa = EVP_PKEY_get0_DSA(pubkey);
#endif /* !HAVE_EVP_PKEY_GET_PARAMS */
@ -333,9 +333,9 @@ static CURLcode get_pkey_dsa(struct Curl_easy *data,
FREE_PKEY_PARAM_BIGNUM(q);
FREE_PKEY_PARAM_BIGNUM(g);
FREE_PKEY_PARAM_BIGNUM(pub_key);
#endif /* !OPENSSL_NO_DSA */
return result;
}
#endif /* !OPENSSL_NO_DSA */
static CURLcode get_pkey_dh(struct Curl_easy *data,
EVP_PKEY *pubkey, BIO *mem, int i)
@ -483,9 +483,11 @@ static CURLcode ossl_certchain(struct Curl_easy *data, SSL *ssl)
result = get_pkey_rsa(data, pubkey, mem, i);
break;
#ifndef OPENSSL_NO_DSA
case EVP_PKEY_DSA:
result = get_pkey_dsa(data, pubkey, mem, i);
break;
#endif
case EVP_PKEY_DH:
result = get_pkey_dh(data, pubkey, mem, i);