From: Viktor Szakats Date: Wed, 31 Dec 2025 13:29:24 +0000 (+0100) Subject: openssl: fix building against no-dsa openssl X-Git-Tag: curl-8_18_0~64 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be675eeb6daa91671765ac74849a21628c169fb0;p=thirdparty%2Fcurl.git openssl: fix building against no-dsa openssl (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 833efb437dd8fb8b3ff48274531b83a03798b24b #19471 Closes #20127 --- diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 339130103f..8a39d513d4 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -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);