From cba79c3e6a918196a9ac5166c33782503471ec7b Mon Sep 17 00:00:00 2001 From: Kazuki Yamaguchi Date: Sun, 17 Apr 2016 23:15:25 +0900 Subject: use EVP_PKEY_base_id(pkey) instead of EVP_PKEY_type(EVP_PKEY_id(pkey)) --- ext/openssl/extconf.rb | 2 +- ext/openssl/openssl_missing.h | 4 ++-- ext/openssl/ossl_pkey.c | 4 ++-- ext/openssl/ossl_pkey_dh.c | 4 ++-- ext/openssl/ossl_pkey_dsa.c | 4 ++-- ext/openssl/ossl_pkey_ec.c | 4 ++-- ext/openssl/ossl_pkey_rsa.c | 4 ++-- ext/openssl/ossl_ssl.c | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index efb9de2d5a..5f597b13c3 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -129,7 +129,7 @@ have_func("OCSP_SINGLERESP_delete_ext") # added in 1.0.0 have_struct_member("CRYPTO_THREADID", "ptr", "openssl/crypto.h") # check if CRYPTO_THREADID exists have_func("EVP_CIPHER_CTX_copy") -have_func("EVP_PKEY_id") +have_func("EVP_PKEY_base_id") have_func("HMAC_CTX_copy") have_func("PKCS5_PBKDF2_HMAC") have_func("X509_NAME_hash_old") diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index b51f8bb057..3528571c80 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -255,8 +255,8 @@ int SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len); int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in); #endif -#if !defined(HAVE_EVP_PKEY_id) -# define EVP_PKEY_id(pkey) ((pkey)->type) +#if !defined(HAVE_EVP_PKEY_BASE_ID) +# define EVP_PKEY_base_id(pkey) EVP_PKEY_type((pkey)->type) #endif #if !defined(HAVE_HMAC_CTX_COPY) diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index 3130c9cc99..df39985aa8 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c @@ -71,7 +71,7 @@ ossl_generate_cb_stop(void *ptr) static void ossl_evp_pkey_free(void *ptr) { -// EVP_PKEY_free(ptr); + EVP_PKEY_free(ptr); } /* @@ -91,7 +91,7 @@ ossl_pkey_new(EVP_PKEY *pkey) if (!pkey) { ossl_raise(ePKeyError, "Cannot make new key from NULL."); } - switch (EVP_PKEY_type(EVP_PKEY_id(pkey))) { + switch (EVP_PKEY_base_id(pkey)) { #if !defined(OPENSSL_NO_RSA) case EVP_PKEY_RSA: return ossl_rsa_new(pkey); diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index 73ad37d114..08e340eb15 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -13,7 +13,7 @@ #define GetPKeyDH(obj, pkey) do { \ GetPKey((obj), (pkey)); \ - if (EVP_PKEY_type(EVP_PKEY_id(pkey)) != EVP_PKEY_DH) { /* PARANOIA? */ \ + if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) { /* PARANOIA? */ \ ossl_raise(rb_eRuntimeError, "THIS IS NOT A DH!") ; \ } \ } while (0) @@ -58,7 +58,7 @@ ossl_dh_new(EVP_PKEY *pkey) obj = dh_instance(cDH, DH_new()); } else { obj = NewPKey(cDH); - if (EVP_PKEY_type(EVP_PKEY_id(pkey)) != EVP_PKEY_DH) { + if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) { ossl_raise(rb_eTypeError, "Not a DH key!"); } SetPKey(obj, pkey); diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c index 68b8eaa8b2..0213843ee7 100644 --- a/ext/openssl/ossl_pkey_dsa.c +++ b/ext/openssl/ossl_pkey_dsa.c @@ -13,7 +13,7 @@ #define GetPKeyDSA(obj, pkey) do { \ GetPKey((obj), (pkey)); \ - if (EVP_PKEY_type(EVP_PKEY_id(pkey)) != EVP_PKEY_DSA) { /* PARANOIA? */ \ + if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DSA) { /* PARANOIA? */ \ ossl_raise(rb_eRuntimeError, "THIS IS NOT A DSA!"); \ } \ } while (0) @@ -66,7 +66,7 @@ ossl_dsa_new(EVP_PKEY *pkey) obj = dsa_instance(cDSA, DSA_new()); } else { obj = NewPKey(cDSA); - if (EVP_PKEY_type(EVP_PKEY_id(pkey)) != EVP_PKEY_DSA) { + if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DSA) { ossl_raise(rb_eTypeError, "Not a DSA key!"); } SetPKey(obj, pkey); diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c index 3cb21d214b..8218e714e3 100644 --- a/ext/openssl/ossl_pkey_ec.c +++ b/ext/openssl/ossl_pkey_ec.c @@ -25,7 +25,7 @@ static const rb_data_type_t ossl_ec_point_type; #define GetPKeyEC(obj, pkey) do { \ GetPKey((obj), (pkey)); \ - if (EVP_PKEY_type(EVP_PKEY_id(pkey)) != EVP_PKEY_EC) { \ + if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC) { \ ossl_raise(rb_eRuntimeError, "THIS IS NOT A EC PKEY!"); \ } \ } while (0) @@ -137,7 +137,7 @@ VALUE ossl_ec_new(EVP_PKEY *pkey) obj = ec_instance(cEC, EC_KEY_new()); } else { obj = NewPKey(cEC); - if (EVP_PKEY_type(EVP_PKEY_id(pkey)) != EVP_PKEY_EC) { + if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC) { ossl_raise(rb_eTypeError, "Not a EC key!"); } SetPKey(obj, pkey); diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c index 41c94e2267..5182fc3a32 100644 --- a/ext/openssl/ossl_pkey_rsa.c +++ b/ext/openssl/ossl_pkey_rsa.c @@ -13,7 +13,7 @@ #define GetPKeyRSA(obj, pkey) do { \ GetPKey((obj), (pkey)); \ - if (EVP_PKEY_type(EVP_PKEY_id(pkey)) != EVP_PKEY_RSA) { /* PARANOIA? */ \ + if (EVP_PKEY_base_id(pkey) != EVP_PKEY_RSA) { /* PARANOIA? */ \ ossl_raise(rb_eRuntimeError, "THIS IS NOT A RSA!") ; \ } \ } while (0) @@ -68,7 +68,7 @@ ossl_rsa_new(EVP_PKEY *pkey) } else { obj = NewPKey(cRSA); - if (EVP_PKEY_type(EVP_PKEY_id(pkey)) != EVP_PKEY_RSA) { + if (EVP_PKEY_base_id(pkey) != EVP_PKEY_RSA) { ossl_raise(rb_eTypeError, "Not a RSA key!"); } SetPKey(obj, pkey); diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 7cbb2f474f..724c61c8d7 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -248,7 +248,7 @@ ossl_call_tmp_dh_callback(VALUE args) if (NIL_P(cb)) return Qfalse; dh = rb_apply(cb, rb_intern("call"), args); pkey = GetPKeyPtr(dh); - if (EVP_PKEY_type(EVP_PKEY_id(pkey)) != EVP_PKEY_DH) return Qfalse; + if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) return Qfalse; return dh; } -- cgit v1.2.3