diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-12-01 22:27:03 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-12-01 22:27:03 +0900 |
| commit | 72126d6c8b88abd69c3565fc3bbbd5ed1e401611 (patch) | |
| tree | f1ac4d813e757517c25da6fc70d26b6a7e832178 | |
| parent | 94a1c4e0c5705ad1e9a4ca08cacaa6cba8b1e6f5 (diff) | |
| download | ruby-openssl-72126d6c8b88abd69c3565fc3bbbd5ed1e401611.tar.gz | |
pkey: check existence of EVP_PKEY_get0()
EVP_PKEY_get0() did not exist in early OpenSSL 0.9.8 series. So define
ourselves if needed.
| -rw-r--r-- | ext/openssl/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/openssl/openssl_missing.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index a812e59d..60132b35 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -95,6 +95,7 @@ have_func("i2d_ASN1_SET_ANY") have_func("SSL_SESSION_cmp") # removed OpenSSL.check_func_or_macro("SSL_set_tlsext_host_name", "openssl/ssl.h") have_struct_member("CRYPTO_THREADID", "ptr", "openssl/crypto.h") +have_func("EVP_PKEY_get0") # added in 1.0.1 have_func("SSL_CTX_set_next_proto_select_cb") diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index 897d6235..df27b1a8 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -47,6 +47,10 @@ int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in); i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0) #endif +#if !defined(HAVE_EVP_PKEY_GET0) +# define EVP_PKEY_get0(pk) (pk->pkey.ptr) +#endif + /* added in 1.0.2 */ #if !defined(OPENSSL_NO_EC) #if !defined(HAVE_EC_CURVE_NIST2NID) |