quick fix for X509_STORE_set_ex_data to let this package/run; config checking

sets HAVE_X509_STORE_SET_EX_DATA though we don't actually have it yet, causing
undefined symbol when running ruby as part of "make fake" to generate docs.
This commit is contained in:
sthen 2018-02-22 21:35:11 +00:00
parent c8307509d3
commit 87b689426d
3 changed files with 34 additions and 2 deletions

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-ext_openssl_openssl_missing_h,v 1.1 2018/02/22 21:35:11 sthen Exp $
Index: ext/openssl/openssl_missing.h
--- ext/openssl/openssl_missing.h.orig
+++ ext/openssl/openssl_missing.h
@@ -137,7 +137,7 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHE
CRYPTO_get_ex_data(&(x)->ex_data, (idx))
#endif
-#if !defined(HAVE_X509_STORE_SET_EX_DATA)
+#if !defined(HAVE_X509_STORE_SET_EX_DATA) || defined(LIBRESSL_VERSION_NUMBER)
# define X509_STORE_set_ex_data(x, idx, data) \
CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data))
# define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \

View File

@ -1,8 +1,17 @@
$OpenBSD: patch-ext_openssl_openssl_missing_h,v 1.2 2018/02/22 19:36:04 sthen Exp $
$OpenBSD: patch-ext_openssl_openssl_missing_h,v 1.3 2018/02/22 21:35:11 sthen Exp $
Index: ext/openssl/openssl_missing.h
--- ext/openssl/openssl_missing.h.orig
+++ ext/openssl/openssl_missing.h
@@ -116,7 +116,7 @@ void ossl_HMAC_CTX_free(HMAC_CTX *);
CRYPTO_get_ex_data(&(x)->ex_data, (idx))
#endif
-#if !defined(HAVE_X509_STORE_SET_EX_DATA)
+#if !defined(HAVE_X509_STORE_SET_EX_DATA) || defined(LIBRESSL_VERSION_NUMBER)
# define X509_STORE_set_ex_data(x, idx, data) \
CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data))
# define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \
@@ -192,6 +192,7 @@ void ossl_X509_REQ_get0_signature(const X509_REQ *, co
#endif

View File

@ -1,8 +1,17 @@
$OpenBSD: patch-ext_openssl_openssl_missing_h,v 1.2 2018/02/22 19:36:04 sthen Exp $
$OpenBSD: patch-ext_openssl_openssl_missing_h,v 1.3 2018/02/22 21:35:11 sthen Exp $
Index: ext/openssl/openssl_missing.h
--- ext/openssl/openssl_missing.h.orig
+++ ext/openssl/openssl_missing.h
@@ -69,7 +69,7 @@ void ossl_HMAC_CTX_free(HMAC_CTX *);
CRYPTO_get_ex_data(&(x)->ex_data, (idx))
#endif
-#if !defined(HAVE_X509_STORE_SET_EX_DATA)
+#if !defined(HAVE_X509_STORE_SET_EX_DATA) || defined(LIBRESSL_VERSION_NUMBER)
# define X509_STORE_set_ex_data(x, idx, data) \
CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data))
# define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \
@@ -145,6 +145,7 @@ void ossl_X509_REQ_get0_signature(const X509_REQ *, co
#endif