reduce our engine bindings even more (#4768)

3 files changed, 18 insertions, 78 deletions

diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py
index 8996f0c8..048f4ad5 100644
--- a/src/_cffi_src/openssl/engine.py
+++ b/src/_cffi_src/openssl/engine.py
@@ -10,130 +10,52 @@ INCLUDES = """
 
 TYPES = """
 typedef ... ENGINE;
-typedef struct {
-    int (*bytes)(unsigned char *, int);
-    int (*pseudorand)(unsigned char *, int);
-    int (*status)();
-    ...;
-} RAND_METHOD;
-typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);
-typedef ... *ENGINE_CTRL_FUNC_PTR;
-typedef ... *ENGINE_LOAD_KEY_PTR;
-typedef ... *ENGINE_CIPHERS_PTR;
-typedef ... *ENGINE_DIGESTS_PTR;
-typedef ... ENGINE_CMD_DEFN;
-typedef ... UI_METHOD;
-
-static const unsigned int ENGINE_METHOD_RAND;
 
 static const int ENGINE_R_CONFLICTING_ENGINE_ID;
 static const long Cryptography_HAS_ENGINE;
 """
 
 FUNCTIONS = """
-ENGINE *ENGINE_get_first(void);
-ENGINE *ENGINE_get_last(void);
 int ENGINE_add(ENGINE *);
-int ENGINE_remove(ENGINE *);
 ENGINE *ENGINE_by_id(const char *);
 int ENGINE_init(ENGINE *);
 int ENGINE_finish(ENGINE *);
-void ENGINE_load_builtin_engines(void);
 ENGINE *ENGINE_get_default_RAND(void);
 int ENGINE_set_default_RAND(ENGINE *);
-int ENGINE_register_RAND(ENGINE *);
 void ENGINE_unregister_RAND(ENGINE *);
-void ENGINE_register_all_RAND(void);
-int ENGINE_ctrl(ENGINE *, int, long, void *, void (*)(void));
 int ENGINE_ctrl_cmd(ENGINE *, const char *, long, void *, void (*)(void), int);
-int ENGINE_ctrl_cmd_string(ENGINE *, const char *, const char *, int);
-
-ENGINE *ENGINE_new(void);
 int ENGINE_free(ENGINE *);
-int ENGINE_up_ref(ENGINE *);
-int ENGINE_set_id(ENGINE *, const char *);
-int ENGINE_set_name(ENGINE *, const char *);
-int ENGINE_set_RAND(ENGINE *, const RAND_METHOD *);
-int ENGINE_set_destroy_function(ENGINE *, ENGINE_GEN_INT_FUNC_PTR);
-int ENGINE_set_init_function(ENGINE *, ENGINE_GEN_INT_FUNC_PTR);
-int ENGINE_set_finish_function(ENGINE *, ENGINE_GEN_INT_FUNC_PTR);
-int ENGINE_set_ctrl_function(ENGINE *, ENGINE_CTRL_FUNC_PTR);
-const char *ENGINE_get_id(const ENGINE *);
 const char *ENGINE_get_name(const ENGINE *);
-const RAND_METHOD *ENGINE_get_RAND(const ENGINE *);
 
-void ENGINE_add_conf_module(void);
 /* these became macros in 1.1.0 */
-void ENGINE_load_openssl(void);
 void ENGINE_load_dynamic(void);
-void ENGINE_cleanup(void);
 """
 
 CUSTOMIZATIONS = """
 #ifdef OPENSSL_NO_ENGINE
 static const long Cryptography_HAS_ENGINE = 0;
-typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);
-typedef void *ENGINE_CTRL_FUNC_PTR;
-typedef void *ENGINE_LOAD_KEY_PTR;
-typedef void *ENGINE_CIPHERS_PTR;
-typedef void *ENGINE_DIGESTS_PTR;
-typedef struct ENGINE_CMD_DEFN_st {
-    unsigned int cmd_num;
-    const char *cmd_name;
-    const char *cmd_desc;
-    unsigned int cmd_flags;
-} ENGINE_CMD_DEFN;
-
-/* This section is so osrandom_engine.c can successfully compile even
-   when engine support is disabled */
-#define ENGINE_CMD_BASE 0
-#define ENGINE_CMD_FLAG_NO_INPUT 0
-#define ENGINE_F_ENGINE_CTRL 0
-#define ENGINE_R_INVALID_ARGUMENT 0
-#define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED 0
-int (*ENGINE_set_cmd_defns)(ENGINE *, const ENGINE_CMD_DEFN *) = NULL;
 
-static const unsigned int ENGINE_METHOD_RAND = 0;
 static const int ENGINE_R_CONFLICTING_ENGINE_ID = 0;
 
-ENGINE *(*ENGINE_get_first)(void) = NULL;
-ENGINE *(*ENGINE_get_last)(void) = NULL;
 int (*ENGINE_add)(ENGINE *) = NULL;
-int (*ENGINE_remove)(ENGINE *) = NULL;
 ENGINE *(*ENGINE_by_id)(const char *) = NULL;
 int (*ENGINE_init)(ENGINE *) = NULL;
 int (*ENGINE_finish)(ENGINE *) = NULL;
-void (*ENGINE_load_builtin_engines)(void) = NULL;
 ENGINE *(*ENGINE_get_default_RAND)(void) = NULL;
 int (*ENGINE_set_default_RAND)(ENGINE *) = NULL;
-int (*ENGINE_register_RAND)(ENGINE *) = NULL;
 void (*ENGINE_unregister_RAND)(ENGINE *) = NULL;
-void (*ENGINE_register_all_RAND)(void) = NULL;
 int (*ENGINE_ctrl)(ENGINE *, int, long, void *, void (*)(void)) = NULL;
 int (*ENGINE_ctrl_cmd)(ENGINE *, const char *, long, void *,
                        void (*)(void), int) = NULL;
 int (*ENGINE_ctrl_cmd_string)(ENGINE *, const char *, const char *,
                               int) = NULL;
 
-ENGINE *(*ENGINE_new)(void) = NULL;
 int (*ENGINE_free)(ENGINE *) = NULL;
-int (*ENGINE_up_ref)(ENGINE *) = NULL;
-int (*ENGINE_set_id)(ENGINE *, const char *) = NULL;
-int (*ENGINE_set_name)(ENGINE *, const char *) = NULL;
-int (*ENGINE_set_RAND)(ENGINE *, const RAND_METHOD *) = NULL;
-int (*ENGINE_set_destroy_function)(ENGINE *, ENGINE_GEN_INT_FUNC_PTR) = NULL;
-int (*ENGINE_set_init_function)(ENGINE *, ENGINE_GEN_INT_FUNC_PTR) = NULL;
-int (*ENGINE_set_finish_function)(ENGINE *, ENGINE_GEN_INT_FUNC_PTR) = NULL;
-int (*ENGINE_set_ctrl_function)(ENGINE *, ENGINE_CTRL_FUNC_PTR) = NULL;
 const char *(*ENGINE_get_id)(const ENGINE *) = NULL;
 const char *(*ENGINE_get_name)(const ENGINE *) = NULL;
-const RAND_METHOD *(*ENGINE_get_RAND)(const ENGINE *) = NULL;
 
-void (*ENGINE_add_conf_module)(void) = NULL;
 /* these became macros in 1.1.0 */
-void (*ENGINE_load_openssl)(void) = NULL;
 void (*ENGINE_load_dynamic)(void) = NULL;
-void (*ENGINE_cleanup)(void) = NULL;
 #else
 static const long Cryptography_HAS_ENGINE = 1;
 #endif
diff --git a/src/_cffi_src/openssl/src/osrandom_engine.c b/src/_cffi_src/openssl/src/osrandom_engine.c
index 1a660f0b..1b893ec7 100644
--- a/src/_cffi_src/openssl/src/osrandom_engine.c
+++ b/src/_cffi_src/openssl/src/osrandom_engine.c
@@ -17,6 +17,8 @@
 #include <poll.h>
 #endif
 
+#ifndef OPENSSL_NO_ENGINE
+/* OpenSSL has ENGINE support so build the engine. */
 static const char *Cryptography_osrandom_engine_id = "osrandom";
 
 /****************************************************************************
@@ -638,3 +640,16 @@ int Cryptography_add_osrandom_engine(void) {
 
     return 1;
 }
+
+#else
+/* If OpenSSL has no ENGINE support then we don't want
+ * to compile the osrandom engine, but we do need some
+ * placeholders */
+static const char *Cryptography_osrandom_engine_id = "no-engine-support";
+static const char *Cryptography_osrandom_engine_name = "osrandom_engine disabled due to no engine support";
+
+int Cryptography_add_osrandom_engine(void) {
+    return 0;
+}
+
+#endif
diff --git a/src/_cffi_src/openssl/src/osrandom_engine.h b/src/_cffi_src/openssl/src/osrandom_engine.h
index 53f957fa..7a48787d 100644
--- a/src/_cffi_src/openssl/src/osrandom_engine.h
+++ b/src/_cffi_src/openssl/src/osrandom_engine.h
@@ -1,3 +1,5 @@
+#ifndef OPENSSL_NO_ENGINE
+/* OpenSSL has ENGINE support so include all of this. */
 #ifdef _WIN32
   #include <Wincrypt.h>
 #else
@@ -97,3 +99,4 @@ static void ERR_Cryptography_OSRandom_error(int function, int reason,
 #define CRYPTOGRAPHY_OSRANDOM_R_GETRANDOM_INIT_FAILED_UNEXPECTED 402
 #define CRYPTOGRAPHY_OSRANDOM_R_GETRANDOM_FAILED 403
 #define CRYPTOGRAPHY_OSRANDOM_R_GETRANDOM_NOT_INIT 404
+#endif