diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-03 02:50:31 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-03 02:50:31 +0000 |
| commit | f0577b7563f72ae1effd82f12246fc8f91fece7c (patch) | |
| tree | 8433f6f1c1cad447e4430cbcfeda75c76eb46c68 | |
| parent | e9ebaaa15d45998b088ef747f0c2ff63c4b0f7b6 (diff) | |
| download | ruby-f0577b7563f72ae1effd82f12246fc8f91fece7c.tar.gz | |
* ext/openssl/ossl.h: avoid to build failure of Windows environment.
* ext/openssl/ossl_ssl_session.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 4 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl_session.c | 4 |
3 files changed, 12 insertions, 1 deletions
@@ -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> * array.c: Improve performance of Array#shift. use shared instead of diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index fd7c8401f3..a53f0f413f 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -64,7 +64,9 @@ extern "C" { #include <openssl/rand.h> #include <openssl/conf.h> #include <openssl/conf_api.h> -#include <openssl/crypto.h> +#if !defined(_WIN32) +# include <openssl/crypto.h> +#endif #undef X509_NAME #undef PKCS7_SIGNER_INFO #if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_EVP_CIPHER_CTX_ENGINE) diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c index 2fd853f9ff..e1bbc6fb54 100644 --- a/ext/openssl/ossl_ssl_session.c +++ b/ext/openssl/ossl_ssl_session.c @@ -79,7 +79,11 @@ int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b) if (a->ssl_version != b->ssl_version || a->session_id_length != b->session_id_length) 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); +#endif } #endif |