diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-02-09 11:52:40 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-10 09:37:03 -0500 |
| commit | f672aee49450e03e7b1a26c8701d0be720e9ae0e (patch) | |
| tree | 3f0eacb640d461102a8962d3a663a6e17df70fd6 /include/openssl/engine.h | |
| parent | ea7736a0930d8c9dd3d4d1a3b3e001ff56364bd6 (diff) | |
| download | openssl-f672aee49450e03e7b1a26c8701d0be720e9ae0e.zip openssl-f672aee49450e03e7b1a26c8701d0be720e9ae0e.tar.gz openssl-f672aee49450e03e7b1a26c8701d0be720e9ae0e.tar.bz2 | |
Rename INIT funtions, deprecate old ones.
Man, there were a lot of renamings :)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include/openssl/engine.h')
| -rw-r--r-- | include/openssl/engine.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/include/openssl/engine.h b/include/openssl/engine.h index 0708147..c1dd45b 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -385,23 +385,25 @@ int ENGINE_add(ENGINE *e); 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. */ -#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) + +#if OPENSSL_API_COMPAT < 0x10100000L +# define ENGINE_load_openssl() \ + OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_OPENSSL, NULL) +# define ENGINE_load_dynamic() \ + OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL) # ifndef OPENSSL_NO_STATIC_ENGINE -# 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) +# define ENGINE_load_padlock() \ + OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL) +# define ENGINE_load_capi() \ + OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL) +# define ENGINE_load_dasync() \ + OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DASYNC, NULL) # endif -#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) +# define ENGINE_load_cryptodev() \ + OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL) +# define ENGINE_load_rdrand() \ + OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_RDRAND, NULL) +#endif void ENGINE_load_builtin_engines(void); /* |