patches: Ruby 1.9 未満では ext/openssl を無効にする

12 files changed, 39 insertions, 558 deletions

diff --git a/Rakefile b/Rakefile
index e8174b4..edc7632 100644
--- a/Rakefile
+++ b/Rakefile
@@ -46,29 +46,26 @@ load_config
 RUBY_PATCHES = {
   ruby: [
     # core
-    [/^(1.6.[5-8])/,            "eval-64bit-fix-165", "disable-tcltklib-165"],
+    [/^(1.6.[5-8])/,            "eval-64bit-fix-165"],
 
-    # ext/tcltklib (old)
+    # ext/tcltklib
+    [/^1.6.[5-8]/,              "disable-tcltklib-165"],
     [/^1.8.[01]/,               "disable-tcltklib-180"],
 
     # ext/openssl
-    [/^1.8.2/,                  "r8532-X509_STORE_CTX-flags"],
-    [/^1.8.0/,                  "r16422-New-OpenSSL-180"],
-    [/^1.8.1/,                  "r16422-New-OpenSSL-181"],
-    [/^(1.8.[2-6]|1.9.0)/,      "r16422-New-OpenSSL-182"],
+    [/^1.8.[0-2]/,              "disable-openssl-180"],
+    [/^1.8.[3-4]/,              "disable-openssl-183"],
+    [/^1.8.[5-7]/,              "disable-openssl-185"],
+    [/^1.9.0/,                  "r16422-New-OpenSSL-182"],
     [/^1.9.0/,                  "r16478-pkcs5-typo"],
     # OpenSSL 1.0 support
-    [/^1.8.0/,                  "r26781-OpenSSL10-180"],
-    [/^(1.8.[1-7]|1.9.[01])/,   "r26781-OpenSSL10-181"],
+    [/^1.9.[01]/,               "r26781-OpenSSL10-181"],
     # apply SSLv2, then apply SSLv3
-    [/^1.8.0/,                  "r31346-r31528-SSLv2-180", "r51722-SSLv3-180"],
-    [/^1.8.1/,                  "r31346-r31528-SSLv2-181", "r51722-SSLv3-181"],
-    [/^1.8.2/,                  "r31346-r31528-SSLv2-182", "r51722-SSLv3-181"],
-    [/^(1.8.[3-7]|1.9.[01])/,   "r31346-r31528-SSLv2-183", "r51722-SSLv3-181"],
+    [/^1.9.[01]/,               "r31346-r31528-SSLv2-183", "r51722-SSLv3-181"],
     [/^1.9.[23]/,               "r31346-r31528-SSLv2-192", "r51722-SSLv3-192"],
     [/^2.[012]/,                "r51722-SSLv3-200"],
     # EC2M
-    [/^(1.8.7|1.9|2.[012])/,    "r41808-EC2M"],
+    [/^(1.9|2.[012])/,          "r41808-EC2M"],
   ]
 }
 
diff --git a/patches/ruby/disable-openssl-180.patch b/patches/ruby/disable-openssl-180.patch
new file mode 100644
index 0000000..b003826
--- /dev/null
+++ b/patches/ruby/disable-openssl-180.patch
@@ -0,0 +1,11 @@
+--- a/ext/openssl/extconf.rb	2016-05-03 01:48:25.147432731 +0900
++++ b/ext/openssl/extconf.rb	2016-05-03 01:49:44.075075351 +0900
+@@ -90,7 +90,7 @@
+ 
+ message "=== Checking done. ===\n"
+ $distcleanfiles << "GNUmakefile" << "dep"
+-create_makefile("openssl")
++create_makefile("openssl") if false
+ if /gcc/ =~ CONFIG["CC"]
+   File.open("GNUmakefile", "w") {|f|
+     f.print <<EOD
diff --git a/patches/ruby/disable-openssl-183.patch b/patches/ruby/disable-openssl-183.patch
new file mode 100644
index 0000000..9f83129
--- /dev/null
+++ b/patches/ruby/disable-openssl-183.patch
@@ -0,0 +1,9 @@
+--- a/ext/openssl/extconf.rb	2016-05-03 02:00:22.936142847 +0900
++++ b/ext/openssl/extconf.rb	2016-05-03 02:00:50.509805908 +0900
+@@ -114,5 +114,5 @@
+ have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h")
+ 
+ message "=== Checking done. ===\n"
+-create_makefile("openssl")
++create_makefile("openssl") if false
+ message "Done.\n"
diff --git a/patches/ruby/disable-openssl-185.patch b/patches/ruby/disable-openssl-185.patch
new file mode 100644
index 0000000..8c205ee
--- /dev/null
+++ b/patches/ruby/disable-openssl-185.patch
@@ -0,0 +1,9 @@
+--- a/ext/openssl/extconf.rb	2016-05-03 00:20:27.987380850 +0900
++++ b/ext/openssl/extconf.rb	2016-05-03 00:28:01.192415788 +0900
+@@ -137,5 +137,5 @@
+ message "=== Checking done. ===\n"
+ 
+ create_header
+-create_makefile("openssl")
++create_makefile("openssl") if false
+ message "Done.\n"
diff --git a/patches/ruby/r16422-New-OpenSSL-180.patch b/patches/ruby/r16422-New-OpenSSL-180.patch
deleted file mode 100644
index 170950d..0000000
--- a/patches/ruby/r16422-New-OpenSSL-180.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
-index f77731e..724f36b 100644
---- a/ext/openssl/openssl_missing.c
-+++ b/ext/openssl/openssl_missing.c
-@@ -14,25 +14,15 @@
- #include <openssl/hmac.h>
- 
- #if !defined(HAVE_HMAC_CTX_COPY)
--int
-+void
- HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
- {
--    if (!out || !in) {
--	/* HMACerr(HMAC_CTX_COPY,HMAC_R_INPUT_NOT_INITIALIZED); */
--	return 0;
--    }
-+    if (!out || !in) return;
-     memcpy(out, in, sizeof(HMAC_CTX));
- 
--    if (!EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx)) {
--	return 0;
--    }
--    if (!EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx)) {
--	return 0;
--    }
--    if (!EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx)) {
--	return 0;
--    }
--    return 1;
-+    EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx);
-+    EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx);
-+    EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);
- }
- #endif /* HAVE_HMAC_CTX_COPY */
- #endif /* NO_HMAC */
-diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
-for Ruby 1.8.0
---- a/ext/openssl/openssl_missing.h
-+++ b/ext/openssl/openssl_missing.h
-@@ -56,12 +56,33 @@
- 	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
- #endif
- 
--int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
--void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
--int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
-+#if !defined(HAVE_EVP_MD_CTX_INIT)
-+void HMAC_CTX_init(HMAC_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_HMAC_CTX_COPY)
-+void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-+#endif
-+
-+#if !defined(HAVE_HMAC_CTX_CLEANUP)
-+void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_CREATE)
- EVP_MD_CTX *EVP_MD_CTX_create(void);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_INIT)
-+void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
- int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_DESTROY)
- void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-+#endif
- 
- #if !defined(EVP_CIPHER_name)
- #  define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e))
-@@ -71,10 +92,6 @@
- #  define EVP_MD_name(e) OBJ_nid2sn(EVP_MD_type(e))
- #endif
- 
--void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
--void HMAC_CTX_init(HMAC_CTX *ctx);
--void HMAC_CTX_cleanup(HMAC_CTX *ctx);
--
- #if !defined(PKCS7_is_detached)
- #  define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
- #endif
-@@ -83,14 +100,42 @@
- #  define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
- #endif
- 
-+#if !defined(HAVE_X509_STORE_SET_EX_DATA)
-+void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
-+int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SET_VERSION)
- int X509_CRL_set_version(X509_CRL *x, long version);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
- int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SORT)
- int X509_CRL_sort(X509_CRL *c);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
- int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_SQR)
- int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_ADD)
- int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_SUB)
- int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
- char *CONF_get1_default_config_file(void);
-+#endif
- 
- #if !defined(HAVE_PEM_DEF_CALLBACK)
- int PEM_def_callback(char *buf, int num, int w, void *key);
-diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
-index ba85f52..ef77d6c 100644
---- a/ext/openssl/ossl_hmac.c
-+++ b/ext/openssl/ossl_hmac.c
-@@ -87,9 +87,7 @@ ossl_hmac_copy(VALUE self, VALUE other)
-     GetHMAC(self, ctx1);
-     SafeGetHMAC(other, ctx2);
- 
--    if (!HMAC_CTX_copy(ctx1, ctx2)) {
--	ossl_raise(eHMACError, NULL);
--    }
-+    HMAC_CTX_copy(ctx1, ctx2);
-     return self;
- }
- 
-@@ -115,9 +113,7 @@ hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
- {
-     HMAC_CTX final;
- 
--    if (!HMAC_CTX_copy(&final, ctx)) {
--	ossl_raise(eHMACError, NULL);
--    }
-+    HMAC_CTX_copy(&final, ctx);
-     if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
- 	HMAC_CTX_cleanup(&final);
- 	OSSL_Debug("Allocating %d mem", HMAC_size(&final));
diff --git a/patches/ruby/r16422-New-OpenSSL-181.patch b/patches/ruby/r16422-New-OpenSSL-181.patch
deleted file mode 100644
index a5606ad..0000000
--- a/patches/ruby/r16422-New-OpenSSL-181.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
-index f77731e..724f36b 100644
---- a/ext/openssl/openssl_missing.c
-+++ b/ext/openssl/openssl_missing.c
-@@ -22,17 +22,15 @@
- #include "openssl_missing.h"
- 
- #if !defined(HAVE_HMAC_CTX_COPY)
--int
-+void
- HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
- {
--    if (!out || !in) return 0;
-+    if (!out || !in) return;
-     memcpy(out, in, sizeof(HMAC_CTX));
- 
--    if (!EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx)
--	    || !EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx)
--	    || !EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx))
--	return 0;
--    return 1;
-+    EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx);
-+    EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx);
-+    EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);
- }
- #endif /* HAVE_HMAC_CTX_COPY */
- #endif /* NO_HMAC */
-diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
-for Ruby 1.8.1 or older
---- a/ext/openssl/openssl_missing.h
-+++ b/ext/openssl/openssl_missing.h
-@@ -56,12 +56,33 @@
- 	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
- #endif
- 
--int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
--void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
--int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
-+#if !defined(HAVE_EVP_MD_CTX_INIT)
-+void HMAC_CTX_init(HMAC_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_HMAC_CTX_COPY)
-+void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-+#endif
-+
-+#if !defined(HAVE_HMAC_CTX_CLEANUP)
-+void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_CREATE)
- EVP_MD_CTX *EVP_MD_CTX_create(void);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_INIT)
-+void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
- int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_DESTROY)
- void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-+#endif
- 
- #if !defined(EVP_CIPHER_name)
- #  define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e))
-@@ -83,17 +104,54 @@
- #  define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
- #endif
- 
-+#if !defined(HAVE_X509_STORE_SET_EX_DATA)
-+void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
-+int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SET_VERSION)
- int X509_CRL_set_version(X509_CRL *x, long version);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
- int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SORT)
- int X509_CRL_sort(X509_CRL *c);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
- int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_SQR)
- int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_ADD)
- int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_SUB)
- int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_RAND_RANGE)
- int BN_rand_range(BIGNUM *r, BIGNUM *range);
-+#endif
-+
-+#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
- int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
-+#endif
-+
-+#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
- char *CONF_get1_default_config_file(void);
-+#endif
-+
-+#if !defined(HAVE_PEM_DEF_CALLBACK)
- int PEM_def_callback(char *buf, int num, int w, void *key);
-+#endif
- 
- #if defined(__cplusplus)
- }
-diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
-index ba85f52..ef77d6c 100644
---- a/ext/openssl/ossl_hmac.c
-+++ b/ext/openssl/ossl_hmac.c
-@@ -87,9 +87,7 @@ ossl_hmac_copy(VALUE self, VALUE other)
-     GetHMAC(self, ctx1);
-     SafeGetHMAC(other, ctx2);
- 
--    if (!HMAC_CTX_copy(ctx1, ctx2)) {
--	ossl_raise(eHMACError, NULL);
--    }
-+    HMAC_CTX_copy(ctx1, ctx2);
-     return self;
- }
- 
-@@ -115,9 +113,7 @@ hmac_final(HMAC_CTX *ctx, char **buf, int *buf_len)
- {
-     HMAC_CTX final;
- 
--    if (!HMAC_CTX_copy(&final, ctx)) {
--	ossl_raise(eHMACError, NULL);
--    }
-+    HMAC_CTX_copy(&final, ctx);
-     if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
- 	HMAC_CTX_cleanup(&final);
- 	OSSL_Debug("Allocating %d mem", HMAC_size(&final));
diff --git a/patches/ruby/r26781-OpenSSL10-180.patch b/patches/ruby/r26781-OpenSSL10-180.patch
deleted file mode 100644
index b78589c..0000000
--- a/patches/ruby/r26781-OpenSSL10-180.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
-index d4a2dc1..85ba654 100644
---- a/ext/openssl/ossl.c
-+++ b/ext/openssl/ossl.c
-@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary)
- 
- #define OSSL_IMPL_SK2ARY(name, type)	        \
- VALUE						\
--ossl_##name##_sk2ary(STACK *sk)			\
-+ossl_##name##_sk2ary(STACK_OF(type) *sk)	\
- {						\
-     type *t;					\
-     int i, num;					\
-@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
- 	OSSL_Debug("empty sk!");		\
- 	return Qnil;				\
-     }						\
--    num = sk_num(sk);				\
-+    num = sk_##type##_num(sk);			\
-     if (num < 0) {				\
- 	OSSL_Debug("items in sk < -1???");	\
- 	return rb_ary_new();			\
-@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk)			\
-     ary = rb_ary_new2(num);			\
- 						\
-     for (i=0; i<num; i++) {			\
--	t = (type *)sk_value(sk, i);		\
-+	t = sk_##type##_value(sk, i);		\
- 	rb_ary_push(ary, ossl_##name##_new(t));	\
-     }						\
-     return ary;					\
-diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
-index 9ac1525..4bb18d5 100644
---- a/ext/openssl/ossl.h
-+++ b/ext/openssl/ossl.h
-@@ -104,6 +104,13 @@ 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 *);
-diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
-index 1be9640..818fdba 100644
---- a/ext/openssl/ossl_x509crl.c
-+++ b/ext/openssl/ossl_x509crl.c
-@@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self)
-     VALUE ary, revoked;
- 
-     GetX509CRL(self, crl);
--    num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl));
-+    num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl));
-     if (num < 0) {
- 	OSSL_Debug("num < 0???");
- 	return rb_ary_new();
-@@ -272,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self)
-     ary = rb_ary_new2(num);
-     for(i=0; i<num; i++) {
- 	/* NO DUP - don't free! */
--	rev = (X509_REVOKED *)sk_X509_CRL_value(X509_CRL_get_REVOKED(crl), i);
-+	rev = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), i);
- 	revoked = ossl_x509revoked_new(rev);
- 	rb_ary_push(ary, revoked);
-     }
diff --git a/patches/ruby/r31346-r31528-SSLv2-180.patch b/patches/ruby/r31346-r31528-SSLv2-180.patch
deleted file mode 100644
index 62f3fc1..0000000
--- a/patches/ruby/r31346-r31528-SSLv2-180.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
-index b1f2d88..1bd5a07 100644
---- a/ext/openssl/extconf.rb
-+++ b/ext/openssl/extconf.rb
-@@ -100,6 +100,9 @@
- have_func("BN_rand_range")
- have_func("BN_pseudo_rand_range")
- have_func("CONF_get1_default_config_file")
-+have_func("SSLv2_method")
-+have_func("SSLv2_server_method")
-+have_func("SSLv2_client_method")
- if try_cpp("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1,2);}\n")
-   $defs.push("-DHAVE_VA_ARGS_MACRO")
- end
-diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
-index d8951fb..d750e95 100644
---- a/ext/openssl/ossl_ssl.c
-+++ b/ext/openssl/ossl_ssl.c
-@@ -107,9 +107,12 @@ struct {
-     OSSL_SSL_METHOD_ENTRY(TLSv1),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
-+#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
-+        defined(HAVE_SSLV2_CLIENT_METHOD)
-     OSSL_SSL_METHOD_ENTRY(SSLv2),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
-+#endif
-     OSSL_SSL_METHOD_ENTRY(SSLv3),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
diff --git a/patches/ruby/r31346-r31528-SSLv2-181.patch b/patches/ruby/r31346-r31528-SSLv2-181.patch
deleted file mode 100644
index a038ebb..0000000
--- a/patches/ruby/r31346-r31528-SSLv2-181.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
-index b1f2d88..1bd5a07 100644
---- a/ext/openssl/extconf.rb
-+++ b/ext/openssl/extconf.rb
-@@ -100,6 +100,9 @@
- have_func("BN_pseudo_rand_range")
- have_func("CONF_get1_default_config_file")
- have_func("X509V3_set_nconf")
-+have_func("SSLv2_method")
-+have_func("SSLv2_server_method")
-+have_func("SSLv2_client_method")
- if try_compile("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
-   $defs.push("-DHAVE_VA_ARGS_MACRO")
- end
-diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
-index d8951fb..d750e95 100644
---- a/ext/openssl/ossl_ssl.c
-+++ b/ext/openssl/ossl_ssl.c
-@@ -107,9 +107,12 @@ struct {
-     OSSL_SSL_METHOD_ENTRY(TLSv1),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
-+#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
-+        defined(HAVE_SSLV2_CLIENT_METHOD)
-     OSSL_SSL_METHOD_ENTRY(SSLv2),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
-+#endif
-     OSSL_SSL_METHOD_ENTRY(SSLv3),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
diff --git a/patches/ruby/r31346-r31528-SSLv2-182.patch b/patches/ruby/r31346-r31528-SSLv2-182.patch
deleted file mode 100644
index 09386e6..0000000
--- a/patches/ruby/r31346-r31528-SSLv2-182.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
-index b1f2d88..1bd5a07 100644
---- a/ext/openssl/extconf.rb
-+++ b/ext/openssl/extconf.rb
-@@ -100,6 +100,9 @@
- have_func("X509_CRL_sort")
- have_func("X509_STORE_get_ex_data")
- have_func("X509_STORE_set_ex_data")
-+have_func("SSLv2_method")
-+have_func("SSLv2_server_method")
-+have_func("SSLv2_client_method")
- if try_compile("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n")
-   $defs.push("-DHAVE_VA_ARGS_MACRO")
- end
-diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
-index d8951fb..d750e95 100644
---- a/ext/openssl/ossl_ssl.c
-+++ b/ext/openssl/ossl_ssl.c
-@@ -107,9 +107,12 @@ struct {
-     OSSL_SSL_METHOD_ENTRY(TLSv1),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_server),
-     OSSL_SSL_METHOD_ENTRY(TLSv1_client),
-+#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
-+        defined(HAVE_SSLV2_CLIENT_METHOD)
-     OSSL_SSL_METHOD_ENTRY(SSLv2),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
-+#endif
-     OSSL_SSL_METHOD_ENTRY(SSLv3),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
diff --git a/patches/ruby/r51722-SSLv3-180.patch b/patches/ruby/r51722-SSLv3-180.patch
deleted file mode 100644
index 59f148f..0000000
--- a/patches/ruby/r51722-SSLv3-180.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
-for Ruby 1.8.0 to 1.9.1
---- a/ext/openssl/extconf.rb
-+++ b/ext/openssl/extconf.rb
-@@ -104,6 +104,9 @@
- have_func("SSLv2_method")
- have_func("SSLv2_server_method")
- have_func("SSLv2_client_method")
-+have_func("SSLv3_method")
-+have_func("SSLv3_server_method")
-+have_func("SSLv3_client_method")
- if try_cpp("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1,2);}\n")
-   $defs.push("-DHAVE_VA_ARGS_MACRO")
- end
-diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
-index f7cb7f0..47111f6 100644
---- a/ext/openssl/ossl_ssl.c
-+++ b/ext/openssl/ossl_ssl.c
-@@ -109,9 +109,12 @@ static const struct {
-     OSSL_SSL_METHOD_ENTRY(SSLv2_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv2_client),
- #endif
-+#if defined(HAVE_SSLV3_METHOD) && defined(HAVE_SSLV3_SERVER_METHOD) && \
-+        defined(HAVE_SSLV3_CLIENT_METHOD)
-     OSSL_SSL_METHOD_ENTRY(SSLv3),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv3_client),
-+#endif
-     OSSL_SSL_METHOD_ENTRY(SSLv23),
-     OSSL_SSL_METHOD_ENTRY(SSLv23_server),
-     OSSL_SSL_METHOD_ENTRY(SSLv23_client),
diff --git a/patches/ruby/r8532-X509_STORE_CTX-flags.patch b/patches/ruby/r8532-X509_STORE_CTX-flags.patch
deleted file mode 100644
index d02e853..0000000
--- a/patches/ruby/r8532-X509_STORE_CTX-flags.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
-index b08f90c..5dba733 100644
---- a/ext/openssl/ossl_x509store.c
-+++ b/ext/openssl/ossl_x509store.c
-@@ -358,7 +358,7 @@ static VALUE ossl_x509stctx_set_time(VALUE, VALUE);
- static VALUE
- ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
- {
--    VALUE store, cert, chain;
-+    VALUE store, cert, chain, t;
-     X509_STORE_CTX *ctx;
-     X509_STORE *x509st;
-     X509 *x509 = NULL;
-@@ -380,7 +380,8 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
-     ossl_x509stctx_set_purpose(self, rb_iv_get(store, "@purpose"));
-     ossl_x509stctx_set_trust(self, rb_iv_get(store, "@trust"));
- #endif
--    ossl_x509stctx_set_time(self, rb_iv_get(store, "@time"));
-+    if (!NIL_P(t = rb_iv_get(store, "@time")))
-+	ossl_x509stctx_set_time(self, t);
-     rb_iv_set(self, "@verify_callback", rb_iv_get(store, "@verify_callback"));
-     rb_iv_set(self, "@cert", cert);
- 
-@@ -546,17 +547,11 @@ static VALUE
- ossl_x509stctx_set_time(VALUE self, VALUE time)
- {
-     X509_STORE_CTX *store;
-+    long t;
- 
--    if(NIL_P(time)) {
--	GetX509StCtx(self, store);
--	store->flags &= ~X509_V_FLAG_USE_CHECK_TIME;
--    }
--    else {
--	long t = NUM2LONG(rb_Integer(time));
--
--	GetX509StCtx(self, store);
--	X509_STORE_CTX_set_time(store, 0, t);
--    }
-+    t = NUM2LONG(rb_Integer(time));
-+    GetX509StCtx(self, store);
-+    X509_STORE_CTX_set_time(store, 0, t);
- 
-     return time;
- }