commit 34036d649f3f666cbadba3b737e03daa55e86d20
author Paul Kehrer <paul.l.kehrer@gmail.com> Tue Jun 06 01:57:35 2017 -1000
committer Alex Gaynor <alex.gaynor@gmail.com> Tue Jun 06 07:57:35 2017 -0400
tree ae00a95073fb78a0df9dfde8e0daa17b98fdbd0c
parent e2e87824051d3a6a3fc66d4af35dea52b531a230

bind even more evp (#3684)

* bind even more evp

* oops

src/_cffi_src/openssl/evp.py

diff --git a/src/_cffi_src/openssl/evp.py b/src/_cffi_src/openssl/evp.py
index 1b10863..0f53828 100644
--- a/src/_cffi_src/openssl/evp.py
+++ b/src/_cffi_src/openssl/evp.py
@@ -31,7 +31,7 @@
 static const int Cryptography_HAS_PKEY_CTX;
 static const int Cryptography_HAS_SCRYPT;
 static const int Cryptography_HAS_EVP_PKEY_DHX;
-static const int Cryptography_HAS_EVP_PKEY_get1_tls_encodedpoint;
+static const int Cryptography_HAS_EVP_PKEY_get_set_tls_encodedpoint;
 """
 
 FUNCTIONS = """
@@ -136,6 +136,7 @@
 int EVP_PKEY_derive_init(EVP_PKEY_CTX *);
 int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *, EVP_PKEY *);
 int EVP_PKEY_derive(EVP_PKEY_CTX *, unsigned char *, size_t *);
+int EVP_PKEY_set_type(EVP_PKEY *, int);
 
 int EVP_PKEY_id(const EVP_PKEY *);
 int Cryptography_EVP_PKEY_id(const EVP_PKEY *);
@@ -150,6 +151,8 @@
 MACROS = """
 /* Added in 1.1.0 */
 size_t EVP_PKEY_get1_tls_encodedpoint(EVP_PKEY *, unsigned char **);
+int EVP_PKEY_set1_tls_encodedpoint(EVP_PKEY *, const unsigned char *,
+                                   size_t);
 
 /* PKCS8_PRIV_KEY_INFO * became const in 1.1.0 */
 EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *);
@@ -223,10 +226,12 @@
 #endif
 
 #if CRYPTOGRAPHY_OPENSSL_110_OR_GREATER
-static const long Cryptography_HAS_EVP_PKEY_get1_tls_encodedpoint = 1;
+static const long Cryptography_HAS_EVP_PKEY_get_set_tls_encodedpoint = 1;
 #else
-static const long Cryptography_HAS_EVP_PKEY_get1_tls_encodedpoint = 0;
+static const long Cryptography_HAS_EVP_PKEY_get_set_tls_encodedpoint = 0;
 size_t (*EVP_PKEY_get1_tls_encodedpoint)(EVP_PKEY *, unsigned char **) = NULL;
+size_t (*EVP_PKEY_set1_tls_encodedpoint)(EVP_PKEY *, const unsigned char *,
+                                         size_t) = NULL;
 #endif
 
 /* OpenSSL 1.1.0+ does this define for us, but if not present we'll do it */

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 8672a59..10c94d7 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -176,7 +176,8 @@
     "Cryptography_HAS_X25519": [
         "NID_X25519",
     ],
-    "Cryptography_HAS_EVP_PKEY_get1_tls_encodedpoint": [
+    "Cryptography_HAS_EVP_PKEY_get_set_tls_encodedpoint": [
         "EVP_PKEY_get1_tls_encodedpoint",
+        "EVP_PKEY_set1_tls_encodedpoint",
     ],
 }