diff options
Diffstat (limited to 'meta-freedesktop/recipes-core/ruby/ruby/openssl.patch')
-rw-r--r-- | meta-freedesktop/recipes-core/ruby/ruby/openssl.patch | 156 |
1 files changed, 0 insertions, 156 deletions
diff --git a/meta-freedesktop/recipes-core/ruby/ruby/openssl.patch b/meta-freedesktop/recipes-core/ruby/ruby/openssl.patch deleted file mode 100644 index 9de37ef..0000000 --- a/meta-freedesktop/recipes-core/ruby/ruby/openssl.patch +++ /dev/null @@ -1,156 +0,0 @@ -This patch backports changes from ruby 1.8.7 which only includes the -openssl prototypes for functions that are not in the system openssl -library. - -diff -u ruby-1.8.5.orig/ext/openssl/extconf.rb ruby-1.8.5/ext/openssl/extconf.rb ---- ruby-1.8.5.orig/ext/openssl/openssl_missing.c 2007-02-13 00:01:19.000000000 +0100 -+++ ruby-1.8.5/ext/openssl/openssl_missing.c 2008-05-19 05:00:52.000000000 +0200 -@@ -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 -u ruby-1.8.5.orig/ext/openssl/openssl_missing.h ruby-1.8.5/ext/openssl/openssl_missing.h ---- ruby-1.8.5.orig/ext/openssl/openssl_missing.h 2008-08-04 06:43:34.000000000 +0200 -+++ ruby-1.8.5/ext/openssl/openssl_missing.h 2008-08-04 06:44:17.000000000 +0200 -@@ -60,14 +60,33 @@ - (char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri) - #endif - -+#if !defined(HAVE_EVP_MD_CTX_INIT) - void HMAC_CTX_init(HMAC_CTX *ctx); --int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); -+#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(HAVE_EVP_CIPHER_CTX_COPY) - int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in); -@@ -111,19 +130,54 @@ - #define OPENSSL_cleanse(p, l) memset(p, 0, l) - #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 -u ruby-1.8.5.orig/ext/openssl/ossl_hmac.c ruby-1.8.5/ext/openssl/ossl_hmac.c ---- ruby-1.8.5.orig/ext/openssl/ossl_hmac.c 2007-03-12 05:12:32.000000000 +0100 -+++ ruby-1.8.5/ext/openssl/ossl_hmac.c 2008-05-19 05:00:52.000000000 +0200 -@@ -81,12 +87,15 @@ - GetHMAC(self, ctx1); - SafeGetHMAC(other, ctx2); - -- if (!HMAC_CTX_copy(ctx1, ctx2)) { -- ossl_raise(eHMACError, NULL); -- } -+ HMAC_CTX_copy(ctx1, ctx2); - return self; - } - -+/* -+ * call-seq: -+ * hmac.update(string) -> self -+ * -+ */ - static VALUE - ossl_hmac_update(VALUE self, VALUE data) - { -@@ -104,9 +113,7 @@ - { - 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)); |