diff options
| author | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-25 08:50:03 +0000 |
|---|---|---|
| committer | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-25 08:50:03 +0000 |
| commit | cf2792d59191424ee7875b5cc96fe31facce2471 (patch) | |
| tree | 9a364fd7aab34a08b49427759776060aa4b3afbf /ext/openssl/ossl.h | |
| parent | 0766b8af2a3348acbce1b8b6ccf9a5e68f29fb8b (diff) | |
| download | ruby-cf2792d59191424ee7875b5cc96fe31facce2471.tar.gz | |
openssl: drop OpenSSL 0.9.6/0.9.7 support
* ext/openssl, test/openssl: Drop OpenSSL < 0.9.8 support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl.h')
| -rw-r--r-- | ext/openssl/ossl.h | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 4a538e9b12..2317fa8b5e 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 @@ -62,14 +56,10 @@ #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 +#if !defined(OPENSSL_NO_OCSP) # include <openssl/ocsp.h> #endif @@ -107,13 +97,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 *); |