commit 84cdca7aecd84878c4650214c3222f7c805d8763
author Aviv Palivoda <palaviv@gmail.com> Mon Feb 13 02:59:16 2017 +0200
committer Paul Kehrer <paul.l.kehrer@gmail.com> Mon Feb 13 08:59:16 2017 +0800
tree 9bde93b77b312fcd9f527d0595eb254e56f8bfb3
parent f99e3f5c383c08858fa6be84ff104ef23345c86e

Add EVP_PKEY_DHX (#3388)

* Add EVP_PKEY_DHX

* Add Cryptography_HAS_EVP_PKEY_DHX to _conditional.py

src/_cffi_src/openssl/evp.py

diff --git a/src/_cffi_src/openssl/evp.py b/src/_cffi_src/openssl/evp.py
index a5032d1..6582882 100644
--- a/src/_cffi_src/openssl/evp.py
+++ b/src/_cffi_src/openssl/evp.py
@@ -19,6 +19,7 @@
 static const int EVP_PKEY_RSA;
 static const int EVP_PKEY_DSA;
 static const int EVP_PKEY_DH;
+static const int EVP_PKEY_DHX;
 static const int EVP_PKEY_EC;
 static const int EVP_MAX_MD_SIZE;
 static const int EVP_CTRL_GCM_SET_IVLEN;
@@ -29,6 +30,7 @@
 static const int Cryptography_HAS_PBKDF2_HMAC;
 static const int Cryptography_HAS_PKEY_CTX;
 static const int Cryptography_HAS_SCRYPT;
+static const int Cryptography_HAS_EVP_PKEY_DHX;
 """
 
 FUNCTIONS = """
@@ -183,6 +185,13 @@
 const long Cryptography_HAS_PBKDF2_HMAC = 1;
 const long Cryptography_HAS_PKEY_CTX = 1;
 
+#ifdef EVP_PKEY_DHX
+const long Cryptography_HAS_EVP_PKEY_DHX = 1;
+#else
+const long Cryptography_HAS_EVP_PKEY_DHX = 0;
+const long EVP_PKEY_DHX = -1;
+#endif
+
 #ifdef OPENSSL_NO_EC
 int (*EVP_PKEY_assign_EC_KEY)(EVP_PKEY *, EC_KEY *) = NULL;
 EC_KEY *(*EVP_PKEY_get1_EC_KEY)(EVP_PKEY *) = NULL;

src/cryptography/hazmat/bindings/openssl/_conditional.py

diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
index 291cea8..5d377d1 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -307,4 +307,7 @@
         "Cryptography_DTLSv1_get_timeout",
         "DTLSv1_handle_timeout",
     ],
+    "Cryptography_HAS_EVP_PKEY_DHX": [
+        "EVP_PKEY_DHX",
+    ],
 }