From 28668bc5743897e403ecd688fad25ceebd8b5f3f Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Wed, 27 Apr 2016 15:13:12 +0900 Subject: ext/openssl: fix ex_data handling for X509_STORE X509_STORE_get_ex_new_index() is required in addition to X509_STORE_CTX_get_ex_new_index() because they are independent. --- ext/openssl/openssl_missing.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'ext/openssl/openssl_missing.h') diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index a23f7d87ea..7d736189ea 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -108,11 +108,12 @@ int HMAC_CTX_reset(HMAC_CTX *ctx); #endif #if !defined(HAVE_X509_STORE_GET_EX_DATA) -void *X509_STORE_get_ex_data(X509_STORE *str, int idx); -#endif - -#if !defined(HAVE_X509_STORE_SET_EX_DATA) -int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data); +# define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \ + CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, l, p, newf, dupf, freef) +# define X509_STORE_get_ex_data(x, idx) \ + CRYPTO_get_ex_data(&(x)->ex_data, idx) +# define X509_STORE_set_ex_data(x, idx, data) \ + CRYPTO_set_ex_data(&(x)->ex_data, idx, data) #endif #if !defined(HAVE_X509_CRL_GET0_SIGNATURE) -- cgit v1.2.3