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 /include/openssl/engine.h | |
| parent | b184e3ef73200cb3b7914a603b43a5b8a074c85f (diff) | |
| download | openssl-7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59.zip openssl-7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59.tar.gz openssl-7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59.tar.bz2 | |
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 'include/openssl/engine.h')
| -rw-r--r-- | include/openssl/engine.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/include/openssl/engine.h b/include/openssl/engine.h index 58b2d7c..b5b4d07 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -387,23 +387,22 @@ int ENGINE_remove(ENGINE *e); /* Retrieve an engine from the list by its unique "id" value. */ ENGINE *ENGINE_by_id(const char *id); /* Add all the built-in engines. */ -void ENGINE_load_openssl(void); -void ENGINE_load_dynamic(void); +#define ENGINE_load_openssl() \ + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_OPENSSL, NULL) +#define ENGINE_load_dynamic() \ + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_DYNAMIC, NULL) # ifndef OPENSSL_NO_STATIC_ENGINE -void ENGINE_load_4758cca(void); -void ENGINE_load_aep(void); -void ENGINE_load_atalla(void); -void ENGINE_load_chil(void); -void ENGINE_load_cswift(void); -void ENGINE_load_nuron(void); -void ENGINE_load_sureware(void); -void ENGINE_load_ubsec(void); -void ENGINE_load_padlock(void); -void ENGINE_load_capi(void); -void ENGINE_load_dasync(void); +# define ENGINE_load_padlock() \ + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_PADLOCK, NULL) +#define ENGINE_load_capi() \ + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_CAPI, NULL) +#define ENGINE_load_dasync() \ + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_DASYNC, NULL) # endif -void ENGINE_load_cryptodev(void); -void ENGINE_load_rdrand(void); +#define ENGINE_load_cryptodev() \ + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL) +#define ENGINE_load_rdrand() \ + OPENSSL_INIT_crypto_library_start(OPENSSL_INIT_ENGINE_RDRAND, NULL) void ENGINE_load_builtin_engines(void); /* |