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 /crypto | |
| parent | 62d876ad1784bce2feb1b95cfff8aca0fbc3e1e2 (diff) | |
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 'crypto')
| -rw-r--r-- | crypto/evp/names.c | 2 | ||||
| -rw-r--r-- | crypto/include/internal/evp_int.h | 1 | ||||
| -rw-r--r-- | crypto/init.c | 4 | ||||
| -rw-r--r-- | crypto/objects/obj_dat.c | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 2a5606b040..22c725d060 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -128,7 +128,7 @@ const EVP_MD *EVP_get_digestbyname(const char *name) return (cp); } -void EVP_cleanup(void) +void evp_cleanup_intern(void) { OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH); OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH); diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index f5811c1d10..972f58994d 100644 --- a/crypto/include/internal/evp_int.h +++ b/crypto/include/internal/evp_int.h @@ -422,3 +422,4 @@ struct evp_pkey_st { void openssl_add_all_ciphers_internal(void); void openssl_add_all_digests_internal(void); +void evp_cleanup_intern(void); diff --git a/crypto/init.c b/crypto/init.c index 2d50d4deb8..dc24c02693 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -466,7 +466,7 @@ void OPENSSL_cleanup(void) fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "bio_sock_cleanup_intern()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " - "EVP_cleanup()\n"); + "evp_cleanup_intern()\n"); fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " "OBJ_cleanup()\n"); #endif @@ -488,7 +488,7 @@ void OPENSSL_cleanup(void) #ifndef OPENSSL_NO_SOCK bio_sock_cleanup_intern(); #endif - EVP_cleanup(); + evp_cleanup_intern(); OBJ_cleanup(); base_inited = 0; } diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 82b44949b2..21b4187a25 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -199,8 +199,8 @@ static void cleanup3_doall(ADDED_OBJ *a) } /* - * The purpose of obj_cleanup_defer is to avoid EVP_cleanup() attempting to - * use freed up OIDs. If necessary the actual freeing up of OIDs is delayed. + * The purpose of obj_cleanup_defer is to avoid evp_cleanup_intern() attempting + * to use freed up OIDs. If necessary the actual freeing up of OIDs is delayed. */ int obj_cleanup_defer = 0; |