1 files changed, 0 insertions, 149 deletions
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));