diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-04 15:28:58 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
| commit | 22c84afa773559279af928652a2d9f3489cc7d73 (patch) | |
| tree | 60c93f35edc2423b771f049fba284c14b5a46499 /include | |
| parent | 62d876ad1784bce2feb1b95cfff8aca0fbc3e1e2 (diff) | |
| download | openssl-22c84afa773559279af928652a2d9f3489cc7d73.tar.gz | |
Deprecate EVP_cleanup() and make it a no-op
EVP_cleanup() should not be called expicitly - we should leave
auto-deinit to clean this up instead.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/evp.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 25a3e6f937..2cf6f14130 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -888,11 +888,11 @@ const EVP_CIPHER *EVP_seed_ofb(void); # endif # if OPENSSL_API_COMPAT < 0x10100000L -# define OPENSSL_add_all_algorithms_conf() \ +# define OPENSSL_add_all_algorithms_conf() \ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ | OPENSSL_INIT_ADD_ALL_DIGESTS \ | OPENSSL_INIT_LOAD_CONFIG, NULL) -# define OPENSSL_add_all_algorithms_noconf() \ +# define OPENSSL_add_all_algorithms_noconf() \ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) @@ -907,10 +907,12 @@ const EVP_CIPHER *EVP_seed_ofb(void); | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) # endif -# define OpenSSL_add_all_ciphers() \ +# define OpenSSL_add_all_ciphers() \ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL) -# define OpenSSL_add_all_digests() \ +# define OpenSSL_add_all_digests() \ OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) + +# define EVP_cleanup() # endif int EVP_add_cipher(const EVP_CIPHER *cipher); @@ -918,7 +920,6 @@ int EVP_add_digest(const EVP_MD *digest); const EVP_CIPHER *EVP_get_cipherbyname(const char *name); const EVP_MD *EVP_get_digestbyname(const char *name); -void EVP_cleanup(void); void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph, const char *from, const char *to, void *x), |