diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-03 01:14:56 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-03 01:14:56 +0000 |
commit | 2758be26bb21be9acfd8720bb8160dab2ddc363e (patch) | |
tree | faf9fc1ecdb5549df051148a5fd7c55360199a3f /ext/openssl | |
parent | f661c0be4465ba257c4d5472d09ffe742a8e2f3f (diff) | |
download | ruby-2758be26bb21be9acfd8720bb8160dab2ddc363e.tar.gz |
* ext/openssl/ossl.h: Make `SSL_SESSION_cmp` use `CRYPTO_memcmp`
[fix GH-591] Patch by @PiPeep
* ext/openssl/ossl_ssl_session.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
-rw-r--r-- | ext/openssl/ossl.h | 1 | ||||
-rw-r--r-- | ext/openssl/ossl_ssl_session.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index c843c06f5c..fd7c8401f3 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -64,6 +64,7 @@ extern "C" { #include <openssl/rand.h> #include <openssl/conf.h> #include <openssl/conf_api.h> +#include <openssl/crypto.h> #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 5318f1a525..2fd853f9ff 100644 --- a/ext/openssl/ossl_ssl_session.c +++ b/ext/openssl/ossl_ssl_session.c @@ -79,7 +79,7 @@ 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; - return 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 |