From 8caed30aa43a9a8e5bb3333e9408cd29c14fbf15 Mon Sep 17 00:00:00 2001 From: William Ahern Date: Sat, 29 Oct 2016 21:19:37 -0700 Subject: fix constantness warning with OpenSSL 1.1 API --- src/openssl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/openssl.c b/src/openssl.c index 88c34d8..fd392d7 100644 --- a/src/openssl.c +++ b/src/openssl.c @@ -1788,7 +1788,13 @@ static struct ex_type { [EX_SSL_CTX_ALPN_SELECT_CB] = { CRYPTO_EX_INDEX_SSL_CTX, -1, &SSL_CTX_get_ex_data, &SSL_CTX_set_ex_data }, }; -static int ex_ondup(CRYPTO_EX_DATA *to NOTUSED, CRYPTO_EX_DATA *from NOTUSED, void *from_d, int idx NOTUSED, long argl NOTUSED, void *argp NOTUSED) { +#if OPENSSL_PREREQ(1,1,0) +typedef const CRYPTO_EX_DATA const_CRYPTO_EX_DATA; +#else +typedef CRYPTO_EX_DATA const_CRYPTO_EX_DATA; +#endif + +static int ex_ondup(CRYPTO_EX_DATA *to NOTUSED, const_CRYPTO_EX_DATA *from NOTUSED, void *from_d, int idx NOTUSED, long argl NOTUSED, void *argp NOTUSED) { struct ex_data **data = from_d; if (*data) -- cgit v1.2.3-59-g8ed1b