From dad43c29f88081fc683a3f2993073d4a315d5ffe Mon Sep 17 00:00:00 2001 From: nahi Date: Mon, 6 Sep 2010 02:08:30 +0000 Subject: * Fixed wrong check of missing functions. Patch by Adrian Quark. ref #3400 The patch contains following comment: This patch should avoid unnecessary incompatibility with future versions of Openssl. Changes suggested by bmaher_at_amazon.com. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/openssl_missing.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ext/openssl/openssl_missing.h') diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index 619cf6fdb5..a1c256ba20 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -63,7 +63,7 @@ typedef int i2d_of_void(); (d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri) #endif -#if !defined(HAVE_EVP_MD_CTX_INIT) +#if !defined(HAVE_HMAC_CTX_INIT) void HMAC_CTX_init(HMAC_CTX *ctx); #endif @@ -133,8 +133,11 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in); #define OPENSSL_cleanse(p, l) memset(p, 0, l) #endif -#if !defined(HAVE_X509_STORE_SET_EX_DATA) +#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); #endif -- cgit v1.2.3