1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/openssl/ossl.h: avoid to build failure of Windows environment.

Browse Source 
* ext/openssl/ossl_ssl_session.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2015-01-03 02:50:31 +00:00
parent e9ebaaa15d
commit f0577b7563
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Jan 3 11:50:16 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* ext/openssl/ossl.h: avoid to build failure of Windows environment.
* ext/openssl/ossl_ssl_session.c: ditto.
Sat Jan 3 11:27:46 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Sat Jan 3 11:27:46 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* array.c: Improve performance of Array#shift. use shared instead of * array.c: Improve performance of Array#shift. use shared instead of

4
ext/openssl/ossl.h
View File

@ -64,7 +64,9 @@ extern "C" {
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/conf.h> #include <openssl/conf.h>
#include <openssl/conf_api.h> #include <openssl/conf_api.h>
#include <openssl/crypto.h> #if !defined(_WIN32)
# include <openssl/crypto.h>
#endif
#undef X509_NAME #undef X509_NAME
#undef PKCS7_SIGNER_INFO #undef PKCS7_SIGNER_INFO
#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_EVP_CIPHER_CTX_ENGINE) #if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_EVP_CIPHER_CTX_ENGINE)

4
ext/openssl/ossl_ssl_session.c
View File

@ -79,7 +79,11 @@ int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b)
if (a->ssl_version != b->ssl_version || if (a->ssl_version != b->ssl_version ||
a->session_id_length != b->session_id_length) a->session_id_length != b->session_id_length)
return 1; return 1;
#if defined(_WIN32)
return memcmp(a->session_id, b->session_id, a->session_id_length);
#else
return CRYPTO_memcmp(a->session_id, b->session_id, a->session_id_length); return CRYPTO_memcmp(a->session_id, b->session_id, a->session_id_length);
#endif
} }
#endif #endif