kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* Fixed wrong check of missing functions. Patch by Adrian Quark.

Browse source 
ref #3400
          The patch contains following comment:
            This patch should avoid unnecessary incompatibility with future
            versions of Openssl.  Changes suggested by bmaher_at_amazon.com.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nahi 2010-09-06 02:08:30 +00:00
parent 8233db65b6
commit dad43c29f8
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Sep 6 11:03:13 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* Fixed wrong check of missing functions. Patch by Adrian Quark.
ref #3400
The patch contains following comment:
This patch should avoid unnecessary incompatibility with future
versions of Openssl. Changes suggested by bmaher_at_amazon.com.
Mon Sep 6 10:46:55 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org> Mon Sep 6 10:46:55 2010 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* Fixed exception message for SSL post connection check failure. Patch * Fixed exception message for SSL post connection check failure. Patch

3
ext/openssl/openssl_missing.c
View file

@ -36,12 +36,13 @@ HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
#endif /* NO_HMAC */ #endif /* NO_HMAC */
#if !defined(HAVE_X509_STORE_SET_EX_DATA) #if !defined(HAVE_X509_STORE_SET_EX_DATA)
int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data) int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data)
{ {
return CRYPTO_set_ex_data(&str->ex_data, idx, data); return CRYPTO_set_ex_data(&str->ex_data, idx, data);
} }
#endif
#if !defined(HAVE_X509_STORE_GET_EX_DATA)
void *X509_STORE_get_ex_data(X509_STORE *str, int idx) void *X509_STORE_get_ex_data(X509_STORE *str, int idx)
{ {
return CRYPTO_get_ex_data(&str->ex_data, idx); return CRYPTO_get_ex_data(&str->ex_data, idx);

7
ext/openssl/openssl_missing.h
View file

@ -63,7 +63,7 @@ typedef int i2d_of_void();
(d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri) (d2i_of_void *)d2i_PKCS7_RECIP_INFO, (char *)ri)
#endif #endif
#if !defined(HAVE_EVP_MD_CTX_INIT) #if !defined(HAVE_HMAC_CTX_INIT)
void HMAC_CTX_init(HMAC_CTX *ctx); void HMAC_CTX_init(HMAC_CTX *ctx);
#endif #endif
@ -133,8 +133,11 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
#define OPENSSL_cleanse(p, l) memset(p, 0, l) #define OPENSSL_cleanse(p, l) memset(p, 0, l)
#endif #endif
#if !defined(HAVE_X509_STORE_SET_EX_DATA) #if !defined(HAVE_X509_STORE_GET_EX_DATA)
void *X509_STORE_get_ex_data(X509_STORE *str, int idx); void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
#endif
#if !defined(HAVE_X509_STORE_SET_EX_DATA)
int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data); int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
#endif #endif