moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-23 08:38:49 -05:00
Code Issues Releases Wiki Activity

openssl: adapt to v3's new const for a few API calls

Browse Source 
Closes #6703
This commit is contained in:
Daniel Stenberg 2021-03-08 23:11:19 +01:00
parent ec549aa625
commit b7e01382d6
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vtls/openssl.c
View File

@ -3492,6 +3492,12 @@ typedef size_t numcert_t;
typedef int numcert_t; typedef int numcert_t;
#endif #endif
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
#define OSSL3_CONST const
#else
#define OSSL3_CONST
#endif
static CURLcode get_cert_chain(struct Curl_easy *data, static CURLcode get_cert_chain(struct Curl_easy *data,
struct ssl_connect_data *connssl) struct ssl_connect_data *connssl)
{ {
@ -3599,7 +3605,7 @@ static CURLcode get_cert_chain(struct Curl_easy *data,
switch(pktype) { switch(pktype) {
case EVP_PKEY_RSA: case EVP_PKEY_RSA:
{ {
RSA *rsa; OSSL3_CONST RSA *rsa;
#ifdef HAVE_OPAQUE_EVP_PKEY #ifdef HAVE_OPAQUE_EVP_PKEY
rsa = EVP_PKEY_get0_RSA(pubkey); rsa = EVP_PKEY_get0_RSA(pubkey);
#else #else
@ -3629,7 +3635,7 @@ static CURLcode get_cert_chain(struct Curl_easy *data,
case EVP_PKEY_DSA: case EVP_PKEY_DSA:
{ {
#ifndef OPENSSL_NO_DSA #ifndef OPENSSL_NO_DSA
DSA *dsa; OSSL3_CONST DSA *dsa;
#ifdef HAVE_OPAQUE_EVP_PKEY #ifdef HAVE_OPAQUE_EVP_PKEY
dsa = EVP_PKEY_get0_DSA(pubkey); dsa = EVP_PKEY_get0_DSA(pubkey);
#else #else
@ -3661,7 +3667,7 @@ static CURLcode get_cert_chain(struct Curl_easy *data,
} }
case EVP_PKEY_DH: case EVP_PKEY_DH:
{ {
DH *dh; OSSL3_CONST DH *dh;
#ifdef HAVE_OPAQUE_EVP_PKEY #ifdef HAVE_OPAQUE_EVP_PKEY
dh = EVP_PKEY_get0_DH(pubkey); dh = EVP_PKEY_get0_DH(pubkey);
#else #else