diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-04-04 10:55:56 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-04-04 13:24:36 +0200 |
| commit | 256b80fe81ad6de63e7fcffbef5e2ce554319ae8 (patch) | |
| tree | f614aa60627ebf44e77ca5fc773e7f437900228e | |
| parent | 7c90c93c0b061da81f69fabdd57125b2783c15fb (diff) | |
| download | curl-256b80fe81ad6de63e7fcffbef5e2ce554319ae8.tar.gz | |
openssl: provide defines for argument typecasts to build warning-free
... as OpenSSL >= 1.1.0 and libressl >= 2.7.0 use different argument types.
| -rw-r--r-- | lib/vtls/openssl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index bbb8ec766..fc9ad47ad 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -112,6 +112,14 @@ #define HAVE_OPAQUE_RSA_DSA_DH 1 /* since 1.1.0 -pre5 */ #define CONST_EXTS const #define HAVE_ERR_REMOVE_THREAD_STATE_DEPRECATED 1 + +/* funny typecast define due to difference in API */ +#ifdef LIBRESSL_VERSION_NUMBER +#define ARG2_X509_signature_print (X509_ALGOR *) +#else +#define ARG2_X509_signature_print +#endif + #else /* For OpenSSL before 1.1.0 */ #define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) @@ -2802,7 +2810,7 @@ static CURLcode get_cert_chain(struct connectdata *conn, ASN1_STRING *a = ASN1_STRING_new(); if(a) { X509_get0_signature(&psig, &palg, x); - X509_signature_print(mem, palg, a); + X509_signature_print(mem, ARG2_X509_signature_print palg, a); ASN1_STRING_free(a); if(palg) { |