summaryrefslogtreecommitdiffstats
path: root/crypto/evp/names.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-04 15:49:21 +0100
committerMatt Caswell <matt@openssl.org>2016-04-13 08:52:33 +0100
commit7b8cc9b3458ec3f18b4d4d9ca2a72b6b3e3744c8 (patch)
treeda9131b97fb33b3ae50e5d79665a8bdef5eee16c /crypto/evp/names.c
parent22c84afa773559279af928652a2d9f3489cc7d73 (diff)
Deprecate OBJ_cleanup() and make it a no-op
OBJ_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/evp/names.c')
-rw-r--r--crypto/evp/names.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/evp/names.c b/crypto/evp/names.c
index 22c725d060..5ef52b43df 100644
--- a/crypto/evp/names.c
+++ b/crypto/evp/names.c
@@ -58,7 +58,7 @@
#include <stdio.h>
#include "internal/cryptlib.h"
#include <openssl/evp.h>
-#include <openssl/objects.h>
+#include <internal/objects.h>
#include <openssl/x509.h>
#include "internal/evp_int.h"
@@ -142,7 +142,7 @@ void evp_cleanup_intern(void)
EVP_PBE_cleanup();
if (obj_cleanup_defer == 2) {
obj_cleanup_defer = 0;
- OBJ_cleanup();
+ obj_cleanup_intern();
}
OBJ_sigid_free();
}