Updated OpenSSL lib. Thanks to Neo2003. Author: tomrus88

--HG--
branch : trunk

1 files changed, 196 insertions, 181 deletions

diff --git a/dep/include/openssl/engine.h b/dep/include/openssl/engine.h
index a0dc2d08fd4..f503595eceb 100644
--- a/dep/include/openssl/engine.h
+++ b/dep/include/openssl/engine.h
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
+ *    notice, this list of conditions and the following disclaimer. 
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -57,7 +57,7 @@
  */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
+ * ECDH support in OpenSSL originally developed by 
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
@@ -93,6 +93,8 @@
 #include <openssl/err.h>
 #endif
 
+#include <openssl/x509.h>
+
 #include <openssl/ossl_typ.h>
 #include <openssl/symhacks.h>
 
@@ -102,32 +104,32 @@ extern "C" {
 
 /* These flags are used to control combinations of algorithm (methods)
  * by bitwise "OR"ing. */
-#define ENGINE_METHOD_RSA       (unsigned int)0x0001
-#define ENGINE_METHOD_DSA       (unsigned int)0x0002
-#define ENGINE_METHOD_DH        (unsigned int)0x0004
-#define ENGINE_METHOD_RAND      (unsigned int)0x0008
-#define ENGINE_METHOD_ECDH      (unsigned int)0x0010
-#define ENGINE_METHOD_ECDSA     (unsigned int)0x0020
-#define ENGINE_METHOD_CIPHERS       (unsigned int)0x0040
-#define ENGINE_METHOD_DIGESTS       (unsigned int)0x0080
-#define ENGINE_METHOD_STORE     (unsigned int)0x0100
+#define ENGINE_METHOD_RSA		(unsigned int)0x0001
+#define ENGINE_METHOD_DSA		(unsigned int)0x0002
+#define ENGINE_METHOD_DH		(unsigned int)0x0004
+#define ENGINE_METHOD_RAND		(unsigned int)0x0008
+#define ENGINE_METHOD_ECDH		(unsigned int)0x0010
+#define ENGINE_METHOD_ECDSA		(unsigned int)0x0020
+#define ENGINE_METHOD_CIPHERS		(unsigned int)0x0040
+#define ENGINE_METHOD_DIGESTS		(unsigned int)0x0080
+#define ENGINE_METHOD_STORE		(unsigned int)0x0100
 /* Obvious all-or-nothing cases. */
-#define ENGINE_METHOD_ALL       (unsigned int)0xFFFF
-#define ENGINE_METHOD_NONE      (unsigned int)0x0000
+#define ENGINE_METHOD_ALL		(unsigned int)0xFFFF
+#define ENGINE_METHOD_NONE		(unsigned int)0x0000
 
 /* This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used
  * internally to control registration of ENGINE implementations, and can be set
  * by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to
  * initialise registered ENGINEs if they are not already initialised. */
-#define ENGINE_TABLE_FLAG_NOINIT    (unsigned int)0x0001
+#define ENGINE_TABLE_FLAG_NOINIT	(unsigned int)0x0001
 
 /* ENGINE flags that can be set by ENGINE_set_flags(). */
-/* #define ENGINE_FLAGS_MALLOCED    0x0001 */ /* Not used */
+/* #define ENGINE_FLAGS_MALLOCED	0x0001 */ /* Not used */
 
 /* This flag is for ENGINEs that wish to handle the various 'CMD'-related
  * control commands on their own. Without this flag, ENGINE_ctrl() handles these
  * control commands on behalf of the ENGINE using their "cmd_defns" data. */
-#define ENGINE_FLAGS_MANUAL_CMD_CTRL    (int)0x0002
+#define ENGINE_FLAGS_MANUAL_CMD_CTRL	(int)0x0002
 
 /* This flag is for ENGINEs who return new duplicate structures when found via
  * "ENGINE_by_id()". When an ENGINE must store state (eg. if ENGINE_ctrl()
@@ -136,7 +138,7 @@ extern "C" {
  * to obtain the ENGINE will result in it being copied into a new structure.
  * Normally, ENGINEs don't declare this flag so ENGINE_by_id() just increments
  * the existing ENGINE's structural reference count. */
-#define ENGINE_FLAGS_BY_ID_COPY     (int)0x0004
+#define ENGINE_FLAGS_BY_ID_COPY		(int)0x0004
 
 /* ENGINEs can support their own command types, and these flags are used in
  * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input each
@@ -149,17 +151,17 @@ extern "C" {
  * ENGINE_cmd_is_executable() and ENGINE_ctrl_cmd_string(). */
 
 /* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */
-#define ENGINE_CMD_FLAG_NUMERIC     (unsigned int)0x0001
+#define ENGINE_CMD_FLAG_NUMERIC		(unsigned int)0x0001
 /* accepts string input (cast from 'void*' to 'const char *', 4th parameter to
  * ENGINE_ctrl) */
-#define ENGINE_CMD_FLAG_STRING      (unsigned int)0x0002
+#define ENGINE_CMD_FLAG_STRING		(unsigned int)0x0002
 /* Indicates that the control command takes *no* input. Ie. the control command
  * is unparameterised. */
-#define ENGINE_CMD_FLAG_NO_INPUT    (unsigned int)0x0004
+#define ENGINE_CMD_FLAG_NO_INPUT	(unsigned int)0x0004
 /* Indicates that the control command is internal. This control command won't
  * be shown in any output, and is only usable through the ENGINE_ctrl_cmd()
  * function. */
-#define ENGINE_CMD_FLAG_INTERNAL    (unsigned int)0x0008
+#define ENGINE_CMD_FLAG_INTERNAL	(unsigned int)0x0008
 
 /* NB: These 3 control commands are deprecated and should not be used. ENGINEs
  * relying on these commands should compile conditional support for
@@ -174,21 +176,21 @@ extern "C" {
  * All command numbers are shared between all engines, even if some don't
  * make sense to some engines.  In such a case, they do nothing but return
  * the error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED. */
-#define ENGINE_CTRL_SET_LOGSTREAM       1
-#define ENGINE_CTRL_SET_PASSWORD_CALLBACK   2
-#define ENGINE_CTRL_HUP             3 /* Close and reinitialise any
-                             handles/connections etc. */
+#define ENGINE_CTRL_SET_LOGSTREAM		1
+#define ENGINE_CTRL_SET_PASSWORD_CALLBACK	2
+#define ENGINE_CTRL_HUP				3 /* Close and reinitialise any
+						     handles/connections etc. */
 #define ENGINE_CTRL_SET_USER_INTERFACE          4 /* Alternative to callback */
 #define ENGINE_CTRL_SET_CALLBACK_DATA           5 /* User-specific data, used
-                             when calling the password
-                             callback and the user
-                             interface */
-#define ENGINE_CTRL_LOAD_CONFIGURATION      6 /* Load a configuration, given
-                             a string that represents a
-                             file name or so */
-#define ENGINE_CTRL_LOAD_SECTION        7 /* Load data from a given
-                             section in the already loaded
-                             configuration */
+						     when calling the password
+						     callback and the user
+						     interface */
+#define ENGINE_CTRL_LOAD_CONFIGURATION		6 /* Load a configuration, given
+						     a string that represents a
+						     file name or so */
+#define ENGINE_CTRL_LOAD_SECTION		7 /* Load data from a given
+						     section in the already loaded
+						     configuration */
 
 /* These control commands allow an application to deal with an arbitrary engine
  * in a dynamic way. Warn: Negative return values indicate errors FOR THESE
@@ -207,35 +209,35 @@ extern "C" {
  * all the remaining control commands will return failure, so it is worth
  * checking this first if the caller is trying to "discover" the engine's
  * capabilities and doesn't want errors generated unnecessarily. */
-#define ENGINE_CTRL_HAS_CTRL_FUNCTION       10
+#define ENGINE_CTRL_HAS_CTRL_FUNCTION		10
 /* Returns a positive command number for the first command supported by the
  * engine. Returns zero if no ctrl commands are supported. */
-#define ENGINE_CTRL_GET_FIRST_CMD_TYPE      11
+#define ENGINE_CTRL_GET_FIRST_CMD_TYPE		11
 /* The 'long' argument specifies a command implemented by the engine, and the
  * return value is the next command supported, or zero if there are no more. */
-#define ENGINE_CTRL_GET_NEXT_CMD_TYPE       12
+#define ENGINE_CTRL_GET_NEXT_CMD_TYPE		12
 /* The 'void*' argument is a command name (cast from 'const char *'), and the
  * return value is the command that corresponds to it. */
-#define ENGINE_CTRL_GET_CMD_FROM_NAME       13
+#define ENGINE_CTRL_GET_CMD_FROM_NAME		13
 /* The next two allow a command to be converted into its corresponding string
  * form. In each case, the 'long' argument supplies the command. In the NAME_LEN
  * case, the return value is the length of the command name (not counting a
  * trailing EOL). In the NAME case, the 'void*' argument must be a string buffer
  * large enough, and it will be populated with the name of the command (WITH a
  * trailing EOL). */
-#define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD   14
-#define ENGINE_CTRL_GET_NAME_FROM_CMD       15
+#define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD	14
+#define ENGINE_CTRL_GET_NAME_FROM_CMD		15
 /* The next two are similar but give a "short description" of a command. */
-#define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD   16
-#define ENGINE_CTRL_GET_DESC_FROM_CMD       17
+#define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD	16
+#define ENGINE_CTRL_GET_DESC_FROM_CMD		17
 /* With this command, the return value is the OR'd combination of
  * ENGINE_CMD_FLAG_*** values that indicate what kind of input a given
  * engine-specific ctrl command expects. */
-#define ENGINE_CTRL_GET_CMD_FLAGS       18
+#define ENGINE_CTRL_GET_CMD_FLAGS		18
 
 /* ENGINE implementations should start the numbering of their own control
  * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc). */
-#define ENGINE_CMD_BASE             200
+#define ENGINE_CMD_BASE				200
 
 /* NB: These 2 nCipher "chil" control commands are deprecated, and their
  * functionality is now available through ENGINE-specific control commands
@@ -244,14 +246,14 @@ extern "C" {
  * are removed. */
 
 /* Flags specific to the nCipher "chil" engine */
-#define ENGINE_CTRL_CHIL_SET_FORKCHECK      100
-    /* Depending on the value of the (long)i argument, this sets or
-     * unsets the SimpleForkCheck flag in the CHIL API to enable or
-     * disable checking and workarounds for applications that fork().
-     */
-#define ENGINE_CTRL_CHIL_NO_LOCKING     101
-    /* This prevents the initialisation function from providing mutex
-     * callbacks to the nCipher library. */
+#define ENGINE_CTRL_CHIL_SET_FORKCHECK		100
+	/* Depending on the value of the (long)i argument, this sets or
+	 * unsets the SimpleForkCheck flag in the CHIL API to enable or
+	 * disable checking and workarounds for applications that fork().
+	 */
+#define ENGINE_CTRL_CHIL_NO_LOCKING		101
+	/* This prevents the initialisation function from providing mutex
+	 * callbacks to the nCipher library. */
 
 /* If an ENGINE supports its own specific control commands and wishes the
  * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on its
@@ -262,12 +264,12 @@ extern "C" {
  * "null-terminated" means that the last ENGINE_CMD_DEFN element has cmd_num set
  * to zero and/or cmd_name set to NULL. */
 typedef struct ENGINE_CMD_DEFN_st
-    {
-    unsigned int cmd_num; /* The command number */
-    const char *cmd_name; /* The command name itself */
-    const char *cmd_desc; /* A short description of the command */
-    unsigned int cmd_flags; /* The input the command expects */
-    } ENGINE_CMD_DEFN;
+	{
+	unsigned int cmd_num; /* The command number */
+	const char *cmd_name; /* The command name itself */
+	const char *cmd_desc; /* A short description of the command */
+	unsigned int cmd_flags; /* The input the command expects */
+	} ENGINE_CMD_DEFN;
 
 /* Generic function pointer */
 typedef int (*ENGINE_GEN_FUNC_PTR)(void);
@@ -277,7 +279,10 @@ typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);
 typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *, void (*f)(void));
 /* Generic load_key function pointer */
 typedef EVP_PKEY * (*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
-    UI_METHOD *ui_method, void *callback_data);
+	UI_METHOD *ui_method, void *callback_data);
+typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,
+	STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **pkey,
+	STACK_OF(X509) **pother, UI_METHOD *ui_method, void *callback_data);
 /* These callback types are for an ENGINE's handler for cipher and digest logic.
  * These handlers have these prototypes;
  *   int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);
@@ -334,6 +339,9 @@ void ENGINE_load_ubsec(void);
 void ENGINE_load_cryptodev(void);
 void ENGINE_load_padlock(void);
 void ENGINE_load_builtin_engines(void);
+#ifndef OPENSSL_NO_CAPIENG
+void ENGINE_load_capi(void);
+#endif
 
 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
  * "registry" handling. */
@@ -433,7 +441,7 @@ int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
  * compliant ENGINE-based applications can work consistently with the same
  * configuration for the same ENGINE-enabled devices, across applications. */
 int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-                int cmd_optional);
+				int cmd_optional);
 
 /* These functions are useful for manufacturing new ENGINE structures. They
  * don't address reference counting at all - one uses them to populate an ENGINE
@@ -459,13 +467,15 @@ int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);
 int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
 int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f);
 int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
+int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
+				ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
 int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
 int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
 int ENGINE_set_flags(ENGINE *e, int flags);
 int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
 /* These functions allow control over any per-structure ENGINE data. */
 int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-        CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
+		CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
 void *ENGINE_get_ex_data(const ENGINE *e, int idx);
 
@@ -494,6 +504,7 @@ ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e);
 ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e);
 ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e);
 ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e);
+ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE *e);
 ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);
 ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);
 const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);
@@ -526,9 +537,13 @@ int ENGINE_finish(ENGINE *e);
  * location, handled by the engine.  The storage may be on a card or
  * whatever. */
 EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-    UI_METHOD *ui_method, void *callback_data);
+	UI_METHOD *ui_method, void *callback_data);
 EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-    UI_METHOD *ui_method, void *callback_data);
+	UI_METHOD *ui_method, void *callback_data);
+int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
+	STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey,
+	STACK_OF(X509) **pother,
+	UI_METHOD *ui_method, void *callback_data);
 
 /* This returns a pointer for the current ENGINE structure that
  * is (by default) performing any RSA operations. The value returned
@@ -578,10 +593,10 @@ void ENGINE_add_conf_module(void);
 /**************************/
 
 /* Binary/behaviour compatibility levels */
-#define OSSL_DYNAMIC_VERSION        (unsigned long)0x00020000
+#define OSSL_DYNAMIC_VERSION		(unsigned long)0x00020000
 /* Binary versions older than this are too old for us (whether we're a loader or
  * a loadee) */
-#define OSSL_DYNAMIC_OLDEST     (unsigned long)0x00020000
+#define OSSL_DYNAMIC_OLDEST		(unsigned long)0x00020000
 
 /* When compiling an ENGINE entirely as an external shared library, loadable by
  * the "dynamic" ENGINE, these types are needed. The 'dynamic_fns' structure
@@ -596,35 +611,35 @@ typedef void *(*dyn_MEM_malloc_cb)(size_t);
 typedef void *(*dyn_MEM_realloc_cb)(void *, size_t);
 typedef void (*dyn_MEM_free_cb)(void *);
 typedef struct st_dynamic_MEM_fns {
-    dyn_MEM_malloc_cb           malloc_cb;
-    dyn_MEM_realloc_cb          realloc_cb;
-    dyn_MEM_free_cb             free_cb;
-    } dynamic_MEM_fns;
+	dyn_MEM_malloc_cb			malloc_cb;
+	dyn_MEM_realloc_cb			realloc_cb;
+	dyn_MEM_free_cb				free_cb;
+	} dynamic_MEM_fns;
 /* FIXME: Perhaps the memory and locking code (crypto.h) should declare and use
  * these types so we (and any other dependant code) can simplify a bit?? */
 typedef void (*dyn_lock_locking_cb)(int,int,const char *,int);
 typedef int (*dyn_lock_add_lock_cb)(int*,int,int,const char *,int);
 typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb)(
-                        const char *,int);
+						const char *,int);
 typedef void (*dyn_dynlock_lock_cb)(int,struct CRYPTO_dynlock_value *,
-                        const char *,int);
+						const char *,int);
 typedef void (*dyn_dynlock_destroy_cb)(struct CRYPTO_dynlock_value *,
-                        const char *,int);
+						const char *,int);
 typedef struct st_dynamic_LOCK_fns {
-    dyn_lock_locking_cb         lock_locking_cb;
-    dyn_lock_add_lock_cb            lock_add_lock_cb;
-    dyn_dynlock_create_cb           dynlock_create_cb;
-    dyn_dynlock_lock_cb         dynlock_lock_cb;
-    dyn_dynlock_destroy_cb          dynlock_destroy_cb;
-    } dynamic_LOCK_fns;
+	dyn_lock_locking_cb			lock_locking_cb;
+	dyn_lock_add_lock_cb			lock_add_lock_cb;
+	dyn_dynlock_create_cb			dynlock_create_cb;
+	dyn_dynlock_lock_cb			dynlock_lock_cb;
+	dyn_dynlock_destroy_cb			dynlock_destroy_cb;
+	} dynamic_LOCK_fns;
 /* The top-level structure */
 typedef struct st_dynamic_fns {
-    void                    *static_state;
-    const ERR_FNS               *err_fns;
-    const CRYPTO_EX_DATA_IMPL       *ex_data_fns;
-    dynamic_MEM_fns             mem_fns;
-    dynamic_LOCK_fns            lock_fns;
-    } dynamic_fns;
+	void 					*static_state;
+	const ERR_FNS				*err_fns;
+	const CRYPTO_EX_DATA_IMPL		*ex_data_fns;
+	dynamic_MEM_fns				mem_fns;
+	dynamic_LOCK_fns			lock_fns;
+	} dynamic_fns;
 
 /* The version checking function should be of this prototype. NB: The
  * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading code.
@@ -637,9 +652,9 @@ typedef struct st_dynamic_fns {
  * can be fully instantiated with IMPLEMENT_DYNAMIC_CHECK_FN(). */
 typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
 #define IMPLEMENT_DYNAMIC_CHECK_FN() \
-    OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
-        if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
-        return 0; }
+	OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
+		if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
+		return 0; }
 
 /* This function is passed the ENGINE structure to initialise with its own
  * function and command settings. It should not adjust the structural or
@@ -657,25 +672,25 @@ typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
  * and returns an int value (zero for failure). 'fn' should have prototype;
  *    [static] int fn(ENGINE *e, const char *id); */
 typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
-                const dynamic_fns *fns);
+				const dynamic_fns *fns);
 #define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
-    OPENSSL_EXPORT \
-    int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
-        if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
-        if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
-            fns->mem_fns.realloc_cb, fns->mem_fns.free_cb)) \
-            return 0; \
-        CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \
-        CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \
-        CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \
-        CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \
-        CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \
-        if(!CRYPTO_set_ex_data_implementation(fns->ex_data_fns)) \
-            return 0; \
-        if(!ERR_set_implementation(fns->err_fns)) return 0; \
-    skip_cbs: \
-        if(!fn(e,id)) return 0; \
-        return 1; }
+	OPENSSL_EXPORT \
+	int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
+		if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
+		if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
+			fns->mem_fns.realloc_cb, fns->mem_fns.free_cb)) \
+			return 0; \
+		CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \
+		CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \
+		CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \
+		CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \
+		CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \
+		if(!CRYPTO_set_ex_data_implementation(fns->ex_data_fns)) \
+			return 0; \
+		if(!ERR_set_implementation(fns->err_fns)) return 0; \
+	skip_cbs: \
+		if(!fn(e,id)) return 0; \
+		return 1; }
 
 /* If the loading application (or library) and the loaded ENGINE library share
  * the same static data (eg. they're both dynamically linked to the same
@@ -701,86 +716,86 @@ void ERR_load_ENGINE_strings(void);
 /* Error codes for the ENGINE functions. */
 
 /* Function codes. */
-#define ENGINE_F_DYNAMIC_CTRL                180
-#define ENGINE_F_DYNAMIC_GET_DATA_CTX            181
-#define ENGINE_F_DYNAMIC_LOAD                182
-#define ENGINE_F_DYNAMIC_SET_DATA_CTX            183
-#define ENGINE_F_ENGINE_ADD              105
-#define ENGINE_F_ENGINE_BY_ID                106
-#define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE        170
-#define ENGINE_F_ENGINE_CTRL                 142
-#define ENGINE_F_ENGINE_CTRL_CMD             178
-#define ENGINE_F_ENGINE_CTRL_CMD_STRING          171
-#define ENGINE_F_ENGINE_FINISH               107
-#define ENGINE_F_ENGINE_FREE_UTIL            108
-#define ENGINE_F_ENGINE_GET_CIPHER           185
-#define ENGINE_F_ENGINE_GET_DEFAULT_TYPE         177
-#define ENGINE_F_ENGINE_GET_DIGEST           186
-#define ENGINE_F_ENGINE_GET_NEXT             115
-#define ENGINE_F_ENGINE_GET_PREV             116
-#define ENGINE_F_ENGINE_INIT                 119
-#define ENGINE_F_ENGINE_LIST_ADD             120
-#define ENGINE_F_ENGINE_LIST_REMOVE          121
-#define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY         150
-#define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY          151
-#define ENGINE_F_ENGINE_NEW              122
-#define ENGINE_F_ENGINE_REMOVE               123
-#define ENGINE_F_ENGINE_SET_DEFAULT_STRING       189
-#define ENGINE_F_ENGINE_SET_DEFAULT_TYPE         126
-#define ENGINE_F_ENGINE_SET_ID               129
-#define ENGINE_F_ENGINE_SET_NAME             130
-#define ENGINE_F_ENGINE_TABLE_REGISTER           184
-#define ENGINE_F_ENGINE_UNLOAD_KEY           152
-#define ENGINE_F_ENGINE_UNLOCKED_FINISH          191
-#define ENGINE_F_ENGINE_UP_REF               190
-#define ENGINE_F_INT_CTRL_HELPER             172
-#define ENGINE_F_INT_ENGINE_CONFIGURE            188
-#define ENGINE_F_INT_ENGINE_MODULE_INIT          187
-#define ENGINE_F_LOG_MESSAGE                 141
+#define ENGINE_F_DYNAMIC_CTRL				 180
+#define ENGINE_F_DYNAMIC_GET_DATA_CTX			 181
+#define ENGINE_F_DYNAMIC_LOAD				 182
+#define ENGINE_F_DYNAMIC_SET_DATA_CTX			 183
+#define ENGINE_F_ENGINE_ADD				 105
+#define ENGINE_F_ENGINE_BY_ID				 106
+#define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE		 170
+#define ENGINE_F_ENGINE_CTRL				 142
+#define ENGINE_F_ENGINE_CTRL_CMD			 178
+#define ENGINE_F_ENGINE_CTRL_CMD_STRING			 171
+#define ENGINE_F_ENGINE_FINISH				 107
+#define ENGINE_F_ENGINE_FREE_UTIL			 108
+#define ENGINE_F_ENGINE_GET_CIPHER			 185
+#define ENGINE_F_ENGINE_GET_DEFAULT_TYPE		 177
+#define ENGINE_F_ENGINE_GET_DIGEST			 186
+#define ENGINE_F_ENGINE_GET_NEXT			 115
+#define ENGINE_F_ENGINE_GET_PREV			 116
+#define ENGINE_F_ENGINE_INIT				 119
+#define ENGINE_F_ENGINE_LIST_ADD			 120
+#define ENGINE_F_ENGINE_LIST_REMOVE			 121
+#define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY		 150
+#define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY			 151
+#define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT		 192
+#define ENGINE_F_ENGINE_NEW				 122
+#define ENGINE_F_ENGINE_REMOVE				 123
+#define ENGINE_F_ENGINE_SET_DEFAULT_STRING		 189
+#define ENGINE_F_ENGINE_SET_DEFAULT_TYPE		 126
+#define ENGINE_F_ENGINE_SET_ID				 129
+#define ENGINE_F_ENGINE_SET_NAME			 130
+#define ENGINE_F_ENGINE_TABLE_REGISTER			 184
+#define ENGINE_F_ENGINE_UNLOAD_KEY			 152
+#define ENGINE_F_ENGINE_UNLOCKED_FINISH			 191
+#define ENGINE_F_ENGINE_UP_REF				 190
+#define ENGINE_F_INT_CTRL_HELPER			 172
+#define ENGINE_F_INT_ENGINE_CONFIGURE			 188
+#define ENGINE_F_INT_ENGINE_MODULE_INIT			 187
+#define ENGINE_F_LOG_MESSAGE				 141
 
 /* Reason codes. */
-#define ENGINE_R_ALREADY_LOADED              100
-#define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER        133
-#define ENGINE_R_CMD_NOT_EXECUTABLE          134
-#define ENGINE_R_COMMAND_TAKES_INPUT             135
-#define ENGINE_R_COMMAND_TAKES_NO_INPUT          136
-#define ENGINE_R_CONFLICTING_ENGINE_ID           103
-#define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED        119
-#define ENGINE_R_DH_NOT_IMPLEMENTED          139
-#define ENGINE_R_DSA_NOT_IMPLEMENTED             140
-#define ENGINE_R_DSO_FAILURE                 104
-#define ENGINE_R_DSO_NOT_FOUND               132
-#define ENGINE_R_ENGINES_SECTION_ERROR           148
-#define ENGINE_R_ENGINE_IS_NOT_IN_LIST           105
-#define ENGINE_R_ENGINE_SECTION_ERROR            149
-#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY      128
-#define ENGINE_R_FAILED_LOADING_PUBLIC_KEY       129
-#define ENGINE_R_FINISH_FAILED               106
-#define ENGINE_R_GET_HANDLE_FAILED           107
-#define ENGINE_R_ID_OR_NAME_MISSING          108
-#define ENGINE_R_INIT_FAILED                 109
-#define ENGINE_R_INTERNAL_LIST_ERROR             110
-#define ENGINE_R_INVALID_ARGUMENT            143
-#define ENGINE_R_INVALID_CMD_NAME            137
-#define ENGINE_R_INVALID_CMD_NUMBER          138
-#define ENGINE_R_INVALID_INIT_VALUE          151
-#define ENGINE_R_INVALID_STRING              150
-#define ENGINE_R_NOT_INITIALISED             117
-#define ENGINE_R_NOT_LOADED              112
-#define ENGINE_R_NO_CONTROL_FUNCTION             120
-#define ENGINE_R_NO_INDEX                144
-#define ENGINE_R_NO_LOAD_FUNCTION            125
-#define ENGINE_R_NO_REFERENCE                130
-#define ENGINE_R_NO_SUCH_ENGINE              116
-#define ENGINE_R_NO_UNLOAD_FUNCTION          126
-#define ENGINE_R_PROVIDE_PARAMETERS          113
-#define ENGINE_R_RSA_NOT_IMPLEMENTED             141
-#define ENGINE_R_UNIMPLEMENTED_CIPHER            146
-#define ENGINE_R_UNIMPLEMENTED_DIGEST            147
-#define ENGINE_R_VERSION_INCOMPATIBILITY         145
+#define ENGINE_R_ALREADY_LOADED				 100
+#define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER		 133
+#define ENGINE_R_CMD_NOT_EXECUTABLE			 134
+#define ENGINE_R_COMMAND_TAKES_INPUT			 135
+#define ENGINE_R_COMMAND_TAKES_NO_INPUT			 136
+#define ENGINE_R_CONFLICTING_ENGINE_ID			 103
+#define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED		 119
+#define ENGINE_R_DH_NOT_IMPLEMENTED			 139
+#define ENGINE_R_DSA_NOT_IMPLEMENTED			 140
+#define ENGINE_R_DSO_FAILURE				 104
+#define ENGINE_R_DSO_NOT_FOUND				 132
+#define ENGINE_R_ENGINES_SECTION_ERROR			 148
+#define ENGINE_R_ENGINE_IS_NOT_IN_LIST			 105
+#define ENGINE_R_ENGINE_SECTION_ERROR			 149
+#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY		 128
+#define ENGINE_R_FAILED_LOADING_PUBLIC_KEY		 129
+#define ENGINE_R_FINISH_FAILED				 106
+#define ENGINE_R_GET_HANDLE_FAILED			 107
+#define ENGINE_R_ID_OR_NAME_MISSING			 108
+#define ENGINE_R_INIT_FAILED				 109
+#define ENGINE_R_INTERNAL_LIST_ERROR			 110
+#define ENGINE_R_INVALID_ARGUMENT			 143
+#define ENGINE_R_INVALID_CMD_NAME			 137
+#define ENGINE_R_INVALID_CMD_NUMBER			 138
+#define ENGINE_R_INVALID_INIT_VALUE			 151
+#define ENGINE_R_INVALID_STRING				 150
+#define ENGINE_R_NOT_INITIALISED			 117
+#define ENGINE_R_NOT_LOADED				 112
+#define ENGINE_R_NO_CONTROL_FUNCTION			 120
+#define ENGINE_R_NO_INDEX				 144
+#define ENGINE_R_NO_LOAD_FUNCTION			 125
+#define ENGINE_R_NO_REFERENCE				 130
+#define ENGINE_R_NO_SUCH_ENGINE				 116
+#define ENGINE_R_NO_UNLOAD_FUNCTION			 126
+#define ENGINE_R_PROVIDE_PARAMETERS			 113
+#define ENGINE_R_RSA_NOT_IMPLEMENTED			 141
+#define ENGINE_R_UNIMPLEMENTED_CIPHER			 146
+#define ENGINE_R_UNIMPLEMENTED_DIGEST			 147
+#define ENGINE_R_VERSION_INCOMPATIBILITY		 145
 
 #ifdef  __cplusplus
 }
 #endif
 #endif
-