summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYour Name <you@example.com>2020-06-20 21:22:51 +0100
committerYour Name <you@example.com>2020-06-20 21:22:51 +0100
commit77f0f678b0567062bd1ce2a44047fc3afb675357 (patch)
treed42a68467881f792168a486d1562d7628b87488b
downloadcryptography-pq-77f0f678b0567062bd1ce2a44047fc3afb675357.zip
cryptography-pq-77f0f678b0567062bd1ce2a44047fc3afb675357.tar.gz
cryptography-pq-77f0f678b0567062bd1ce2a44047fc3afb675357.tar.bz2
fish
-rw-r--r--2.9.2/fix-engine44
-rw-r--r--2.9.2/series1
2 files changed, 45 insertions, 0 deletions
diff --git a/2.9.2/fix-engine b/2.9.2/fix-engine
new file mode 100644
index 0000000..04dca45
--- /dev/null
+++ b/2.9.2/fix-engine
@@ -0,0 +1,44 @@
+diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py
+index fa503a26..1cc61e92 100644
+--- a/src/_cffi_src/openssl/engine.py
++++ b/src/_cffi_src/openssl/engine.py
+@@ -10,6 +10,7 @@ INCLUDES = """
+
+ TYPES = """
+ typedef ... ENGINE;
++typedef ... UI_METHOD;
+
+ static const long Cryptography_HAS_ENGINE;
+ """
+@@ -24,6 +25,8 @@ void ENGINE_unregister_RAND(ENGINE *);
+ int ENGINE_ctrl_cmd(ENGINE *, const char *, long, void *, void (*)(void), int);
+ int ENGINE_free(ENGINE *);
+ const char *ENGINE_get_name(const ENGINE *);
++EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
++ UI_METHOD *ui_method, void *callback_data);
+
+ """
+
+@@ -44,6 +47,10 @@ int (*ENGINE_free)(ENGINE *) = NULL;
+ const char *(*ENGINE_get_id)(const ENGINE *) = NULL;
+ const char *(*ENGINE_get_name)(const ENGINE *) = NULL;
+
++EVP_PKEY *(*ENGINE_load_private_key(ENGINE *e, const char *key_id,
++ UI_METHOD *ui_method, void *callback_data)) = NULL;
++
++
+ #else
+ static const long Cryptography_HAS_ENGINE = 1;
+ #endif
+diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py
+index a293fb09..38efdb26 100644
+--- a/src/cryptography/hazmat/bindings/openssl/_conditional.py
++++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py
+@@ -355,6 +355,7 @@ def cryptography_has_engine():
+ "ENGINE_ctrl_cmd",
+ "ENGINE_free",
+ "ENGINE_get_name",
++ "ENGINE_load_private_key",
+ "Cryptography_add_osrandom_engine",
+ ]
+
diff --git a/2.9.2/series b/2.9.2/series
new file mode 100644
index 0000000..95b522f
--- /dev/null
+++ b/2.9.2/series
@@ -0,0 +1 @@
+fix-engine