diff options
| author | Viktor Szakats <vszakats@users.noreply.github.com> | 2016-02-16 00:22:54 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-02-16 00:29:36 +0100 |
| commit | 71398487e75e47c026d0655d540ade247d18f62c (patch) | |
| tree | 56fcad5f6f7a92d568de66d5f384635fc4a846c0 /lib | |
| parent | ae01698ea493efaf0190814bd3fbff3e192f837e (diff) | |
openssl: use macro to guard the opaque EVP_PKEY branch
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vtls/openssl.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 0c7315eab..74b531980 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -108,6 +108,7 @@ #define SSLeay_add_ssl_algorithms() SSL_library_init() #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */ +#define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */ #endif #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \ @@ -2357,8 +2358,7 @@ static CURLcode get_cert_chain(struct connectdata *conn, infof(data, " Unable to load public key\n"); else { int pktype; -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ - !defined(LIBRESSL_VERSION_NUMBER) +#ifdef HAVE_OPAQUE_EVP_PKEY pktype = EVP_PKEY_id(pubkey); #else pktype = pubkey->type; @@ -2367,8 +2367,7 @@ static CURLcode get_cert_chain(struct connectdata *conn, case EVP_PKEY_RSA: { RSA *rsa; -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ - !defined(LIBRESSL_VERSION_NUMBER) +#ifdef HAVE_OPAQUE_EVP_PKEY rsa = EVP_PKEY_get0_RSA(pubkey); #else rsa = pubkey->pkey.rsa; @@ -2389,8 +2388,7 @@ static CURLcode get_cert_chain(struct connectdata *conn, case EVP_PKEY_DSA: { DSA *dsa; -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ - !defined(LIBRESSL_VERSION_NUMBER) +#ifdef HAVE_OPAQUE_EVP_PKEY dsa = EVP_PKEY_get0_DSA(pubkey); #else dsa = pubkey->pkey.dsa; @@ -2405,8 +2403,7 @@ static CURLcode get_cert_chain(struct connectdata *conn, case EVP_PKEY_DH: { DH *dh; -#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ - !defined(LIBRESSL_VERSION_NUMBER) +#ifdef HAVE_OPAQUE_EVP_PKEY dh = EVP_PKEY_get0_DH(pubkey); #else dh = pubkey->pkey.dh; |