diff options
| author | Matt Caswell <matt@openssl.org> | 2016-02-08 16:43:03 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-09 15:11:38 +0000 |
| commit | 7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59 (patch) | |
| tree | 30f805756265bd1d016aead84dcf1c909cca8b4b /engines | |
| parent | b184e3ef73200cb3b7914a603b43a5b8a074c85f (diff) | |
| download | openssl-new-7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59.tar.gz | |
Auto init/deinit libcrypto
This builds on the previous commit to auto initialise/deinitialise
libcrypto.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_capi.c | 7 | ||||
| -rw-r--r-- | engines/e_dasync.c | 5 | ||||
| -rw-r--r-- | engines/e_ossltest.c | 1 | ||||
| -rw-r--r-- | engines/e_padlock.c | 4 |
4 files changed, 11 insertions, 6 deletions
diff --git a/engines/e_capi.c b/engines/e_capi.c index d3c9b8b163..62c4ad3c2d 100644 --- a/engines/e_capi.c +++ b/engines/e_capi.c @@ -187,6 +187,8 @@ static int cert_select_simple(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs); static int cert_select_dialog(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs); # endif +void engine_load_capi_internal(void); + typedef PCCERT_CONTEXT(WINAPI *CERTDLG) (HCERTSTORE, HWND, LPCWSTR, LPCWSTR, DWORD, DWORD, void *); typedef HWND(WINAPI *GETCONSWIN) (void); @@ -592,7 +594,7 @@ static ENGINE *engine_capi(void) return ret; } -void ENGINE_load_capi(void) +void engine_load_capi_internal(void) { /* Copied from eng_[openssl|dyn].c */ ENGINE *toadd = engine_capi(); @@ -1874,7 +1876,8 @@ OPENSSL_EXPORT IMPLEMENT_DYNAMIC_CHECK_FN() # else -void ENGINE_load_capi(void) +void engine_load_capi_internal(void); +void engine_load_capi_internal(void) { } # endif diff --git a/engines/e_dasync.c b/engines/e_dasync.c index 2f18d07db8..cca9f5e3e9 100644 --- a/engines/e_dasync.c +++ b/engines/e_dasync.c @@ -59,6 +59,7 @@ #include <openssl/evp.h> #include <openssl/async.h> #include <openssl/bn.h> +#include <openssl/crypto.h> #define DASYNC_LIB_NAME "DASYNC" #include "e_dasync_err.c" @@ -72,7 +73,7 @@ static const char *engine_dasync_name = "Dummy Async engine support"; static int dasync_destroy(ENGINE *e); static int dasync_init(ENGINE *e); static int dasync_finish(ENGINE *e); -void ENGINE_load_dasync(void); +void engine_load_dasync_internal(void); /* Set up digests. Just SHA1 for now */ @@ -210,7 +211,7 @@ static ENGINE *engine_dasync(void) return ret; } -void ENGINE_load_dasync(void) +void engine_load_dasync_internal(void) { ENGINE *toadd = engine_dasync(); if (!toadd) diff --git a/engines/e_ossltest.c b/engines/e_ossltest.c index a31e5a9cfa..e641a44c16 100644 --- a/engines/e_ossltest.c +++ b/engines/e_ossltest.c @@ -66,6 +66,7 @@ #include <openssl/evp.h> #include <openssl/modes.h> #include <openssl/aes.h> +#include <openssl/crypto.h> #define OSSLTEST_LIB_NAME "OSSLTEST" #include "e_ossltest_err.c" diff --git a/engines/e_padlock.c b/engines/e_padlock.c index e5eecee554..00732edb98 100644 --- a/engines/e_padlock.c +++ b/engines/e_padlock.c @@ -112,8 +112,8 @@ static ENGINE *ENGINE_padlock(void); # endif # ifdef OPENSSL_NO_DYNAMIC_ENGINE - -void ENGINE_load_padlock(void) +void engine_load_padlock_internal(void); +void engine_load_padlock_internal(void) { /* On non-x86 CPUs it just returns. */ # ifdef COMPILE_HW_PADLOCK |