aboutsummaryrefslogtreecommitdiffstats
path: root/ext/openssl/ossl.h
diff options
context:
space:
mode:
Diffstat (limited to 'ext/openssl/ossl.h')
-rw-r--r--ext/openssl/ossl.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index e8271e9d64..a719ea99ee 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -31,11 +31,6 @@ extern "C" {
#include <ruby/io.h>
#include <ruby/thread.h>
-/*
- * Check the OpenSSL version
- * The only supported are:
- * OpenSSL >= 0.9.7
- */
#include <openssl/opensslv.h>
#ifdef HAVE_ASSERT_H
@@ -46,7 +41,6 @@ extern "C" {
#if defined(_WIN32) && !defined(LIBRESSL_VERSION_NUMBER)
# include <openssl/e_os2.h>
-# define OSSL_NO_CONF_API 1
# if !defined(OPENSSL_SYS_WIN32)
# define OPENSSL_SYS_WIN32 1
# endif
@@ -66,13 +60,10 @@ extern "C" {
#if !defined(_WIN32)
# include <openssl/crypto.h>
#endif
-#undef X509_NAME
-#undef PKCS7_SIGNER_INFO
-#if defined(HAVE_SUPPORT_ENGINE)
+#if !defined(OPENSSL_NO_ENGINE)
# include <openssl/engine.h>
#endif
-#if defined(HAVE_OPENSSL_OCSP_H)
-# define OSSL_OCSP_ENABLED
+#if !defined(OPENSSL_NO_OCSP)
# include <openssl/ocsp.h>
#endif
@@ -118,7 +109,7 @@ extern VALUE eOSSLError;
* Compatibility
*/
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-#define STACK _STACK
+//define STACK _STACK
#endif
/*