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/evp/names.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/evp/names.c')
| -rw-r--r-- | crypto/evp/names.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/crypto/evp/names.c b/crypto/evp/names.c index 501bfeead5..2e8281a3ff 100644 --- a/crypto/evp/names.c +++ b/crypto/evp/names.c @@ -73,7 +73,6 @@ int EVP_add_cipher(const EVP_CIPHER *c) (const char *)c); if (r == 0) return (0); - check_defer(c->nid); r = OBJ_NAME_add(OBJ_nid2ln(c->nid), OBJ_NAME_TYPE_CIPHER_METH, (const char *)c); return (r); @@ -88,7 +87,6 @@ int EVP_add_digest(const EVP_MD *md) r = OBJ_NAME_add(name, OBJ_NAME_TYPE_MD_METH, (const char *)md); if (r == 0) return (0); - check_defer(md->type); r = OBJ_NAME_add(OBJ_nid2ln(md->type), OBJ_NAME_TYPE_MD_METH, (const char *)md); if (r == 0) @@ -99,7 +97,6 @@ int EVP_add_digest(const EVP_MD *md) OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name); if (r == 0) return (0); - check_defer(md->pkey_type); r = OBJ_NAME_add(OBJ_nid2ln(md->pkey_type), OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, name); } @@ -140,10 +137,6 @@ void evp_cleanup_int(void) OBJ_NAME_cleanup(-1); EVP_PBE_cleanup(); - if (obj_cleanup_defer == 2) { - obj_cleanup_defer = 0; - obj_cleanup_int(); - } OBJ_sigid_free(); } |