aboutsummaryrefslogtreecommitdiffstats
path: root/ext/openssl/ossl.h
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-05-05 16:57:29 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-05-05 16:57:29 +0900
commitc7dd70671f65e19db94702965069f76efd30d65c (patch)
tree32b3a20e41c7f3a0fec0d15dd21350a18e41f3a2 /ext/openssl/ossl.h
parent0869da58a9bd4e037b1eac16d5041755bd9d75a3 (diff)
downloadruby-c7dd70671f65e19db94702965069f76efd30d65c.tar.gz
ext/openssl: drop support for OpenSSL 0.9.6/0.9.7
The last release of OpenSSL 0.9.7 series was over 9 years ago (!) and even 0.9.8/1.0.0 are no longer supported (EOL was 2015-12-31). It actually doesn't compile since r40461 (ext/openssl/ossl_bn.c (ossl_bn_initialize): allow Fixnum and Bignum. [ruby-core:53986] [Feature #8217], 2013-04-25, 2.1.0) and it looks like nobody noticed it.
Diffstat (limited to 'ext/openssl/ossl.h')
-rw-r--r--ext/openssl/ossl.h25
1 files changed, 4 insertions, 21 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index fdeca83705..a8e70f09dc 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -27,11 +27,6 @@
#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
@@ -42,7 +37,6 @@
#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
@@ -59,19 +53,15 @@
#include <openssl/rand.h>
#include <openssl/conf.h>
#include <openssl/conf_api.h>
+#if !defined(OPENSSL_NO_OCSP)
+# include <openssl/ocsp.h>
+#endif
#if !defined(_WIN32)
# include <openssl/crypto.h>
#endif
-#undef X509_NAME
-#undef PKCS7_SIGNER_INFO
-#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_EVP_CIPHER_CTX_ENGINE)
-# define OSSL_ENGINE_ENABLED
+#if !defined(OPENSSL_NO_ENGINE)
# include <openssl/engine.h>
#endif
-#if defined(HAVE_OPENSSL_OCSP_H)
-# define OSSL_OCSP_ENABLED
-# include <openssl/ocsp.h>
-#endif
/* OpenSSL requires passwords for PEM-encoded files to be at least four
* characters long
@@ -112,13 +102,6 @@ extern VALUE eOSSLError;
} while (0)
/*
- * Compatibility
- */
-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-#define STACK _STACK
-#endif
-
-/*
* String to HEXString conversion
*/
int string2hex(const unsigned char *, int, char **, int *);