diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-04 19:01:26 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-10-28 11:31:00 +0900 |
| commit | ec8e28e7d8440d619a24e93a872fb2955011b25c (patch) | |
| tree | a446a673ede710e756759de78020adb24905f297 /ext/openssl | |
| parent | 536c643759ea00aba7815c300cc867f6367b3a6a (diff) | |
| download | ruby-openssl-ec8e28e7d8440d619a24e93a872fb2955011b25c.tar.gz | |
Always include openssl/crypto.h
It should be usable regardless of the platform.
Diffstat (limited to 'ext/openssl')
| -rw-r--r-- | ext/openssl/ossl.h | 4 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl_session.c | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 7172e39a..00d0b1b6 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -47,9 +47,7 @@ #include <openssl/rand.h> #include <openssl/conf.h> #include <openssl/conf_api.h> -#if !defined(_WIN32) -# include <openssl/crypto.h> -#endif +#include <openssl/crypto.h> #if !defined(OPENSSL_NO_ENGINE) # include <openssl/engine.h> #endif diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c index f3da25b7..7abb8671 100644 --- a/ext/openssl/ossl_ssl_session.c +++ b/ext/openssl/ossl_ssl_session.c @@ -108,11 +108,7 @@ int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b) if (a_len != b_len) return 1; -#if defined(_WIN32) - return memcmp(a_sid, b_sid, a_len); -#else return CRYPTO_memcmp(a_sid, b_sid, a_len); -#endif } #endif |