commit 3982b887556230b44b3dd0ae2b73437f1d889bed
author Alex Gaynor <alex.gaynor@gmail.com> Mon Mar 14 00:12:19 2016 -0400
committer Alex Gaynor <alex.gaynor@gmail.com> Mon Mar 14 00:12:19 2016 -0400
tree 9a8f4d5b629018581fe107b01777c76ce0b2ceb5
parent 3e03e72dc2d30ee04e64664e6bdd0a8b3d02d5e9
parent 5296a37717b7bc97bf6d3dede1c128e4b33a5728

Merge pull request #2824 from reaperhulk/110-patch-34

remove some EC functions we don't use

src/_cffi_src/openssl/ec.py

diff --git a/src/_cffi_src/openssl/ec.py b/src/_cffi_src/openssl/ec.py
index dab1635..9160309 100644
--- a/src/_cffi_src/openssl/ec.py
+++ b/src/_cffi_src/openssl/ec.py
@@ -90,19 +90,6 @@
 void EC_KEY_set_enc_flags(EC_KEY *eckey, unsigned int);
 point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *);
 void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t);
-void *EC_KEY_get_key_method_data(
-    EC_KEY *,
-    void *(*)(void *),
-    void (*)(void *),
-    void (*)(void *)
-);
-void EC_KEY_insert_key_method_data(
-    EC_KEY *,
-    void *,
-    void *(*)(void *),
-    void (*)(void *),
-    void (*)(void *)
-);
 void EC_KEY_set_asn1_flag(EC_KEY *, int);
 int EC_KEY_precompute_mult(EC_KEY *, BN_CTX *);
 int EC_KEY_generate_key(EC_KEY *);
@@ -237,11 +224,6 @@
 void (*EC_KEY_set_enc_flags)(EC_KEY *eckey, unsigned int) = NULL;
 point_conversion_form_t (*EC_KEY_get_conv_form)(const EC_KEY *) = NULL;
 void (*EC_KEY_set_conv_form)(EC_KEY *, point_conversion_form_t) = NULL;
-void *(*EC_KEY_get_key_method_data)(
-    EC_KEY *, void *(*)(void *), void (*)(void *), void (*)(void *)) = NULL;
-void (*EC_KEY_insert_key_method_data)(
-    EC_KEY *, void *,
-    void *(*)(void *), void (*)(void *), void (*)(void *)) = NULL;
 void (*EC_KEY_set_asn1_flag)(EC_KEY *, int) = NULL;
 int (*EC_KEY_precompute_mult)(EC_KEY *, BN_CTX *) = NULL;
 int (*EC_KEY_generate_key)(EC_KEY *) = 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 8b91899..148534d 100644
--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
+++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
@@ -86,8 +86,6 @@
         "EC_KEY_get_enc_flags",
         "EC_KEY_set_enc_flags",
         "EC_KEY_set_conv_form",
-        "EC_KEY_get_key_method_data",
-        "EC_KEY_insert_key_method_data",
         "EC_KEY_set_asn1_flag",
         "EC_KEY_precompute_mult",
         "EC_KEY_generate_key",