diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2016-04-13 12:11:59 +0100 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2016-04-13 15:05:07 +0100 |
commit | a535fe12f625f30e5e6b27d588403fe25a3ffcf3 (patch) | |
tree | 98f2236f3977192ec01b5196a0e17e7bc0a6cc19 /crypto/objects/obj_dat.c | |
parent | 7e74eaa661e05f27a503b3ff3fecc8c94e9e781e (diff) |
Remove check_defer()
The check_defer() function was used to ensure that EVP_cleanup() was always
called before OBJ_cleanup(). The new cleanup code ensures this so it is
no longer needed.
Remove obj_cleanup() call in OID config module: it is not needed
any more either.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/objects/obj_dat.c')
-rw-r--r-- | crypto/objects/obj_dat.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 24e684acd4..6baf2f05b0 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -198,24 +198,8 @@ static void cleanup3_doall(ADDED_OBJ *a) OPENSSL_free(a); } -/* - * The purpose of obj_cleanup_defer is to avoid int_evp_cleanup() attempting - * to use freed up OIDs. If necessary the actual freeing up of OIDs is delayed. - */ -int obj_cleanup_defer = 0; - -void check_defer(int nid) -{ - if (!obj_cleanup_defer && nid >= NUM_NID) - obj_cleanup_defer = 1; -} - void obj_cleanup_int(void) { - if (obj_cleanup_defer) { - obj_cleanup_defer = 2; - return; - } if (added == NULL) return; lh_ADDED_OBJ_set_down_load(added, 0); |