From 3a2ae678710e7f61c7fe374e1ebc76e0b4705ecb Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 7 Jan 2016 17:11:29 -0800 Subject: use EVP_PKEY_id where we can --- src/_cffi_src/openssl/evp.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/_cffi_src/openssl/evp.py b/src/_cffi_src/openssl/evp.py index 5d631a69..1d37b814 100644 --- a/src/_cffi_src/openssl/evp.py +++ b/src/_cffi_src/openssl/evp.py @@ -229,8 +229,13 @@ int (*EVP_PKEY_assign_EC_KEY)(EVP_PKEY *, EC_KEY *) = NULL; EC_KEY *(*EVP_PKEY_get1_EC_KEY)(EVP_PKEY *) = NULL; int (*EVP_PKEY_set1_EC_KEY)(EVP_PKEY *, EC_KEY *) = NULL; #endif -/* EVP_PKEY_id is not available on RHEL5 0.9.8e so we'll define our own */ +/* EVP_PKEY_id is not available on 0.9.8 so we'll define our own. This can + be removed when we remove 0.9.8 support. */ int Cryptography_EVP_PKEY_id(const EVP_PKEY *key) { - return key->type; + #if OPENSSL_VERSION_NUMBER >= 0x10000000L + return EVP_PKEY_id(key); + #else + return key->type; + #endif } """ -- cgit v1.2.3