summaryrefslogtreecommitdiffstats
path: root/crypto/objects
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/objects
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/objects')
-rw-r--r--crypto/objects/obj_dat.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 21b4187a25..90db56bbd8 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -61,7 +61,7 @@
#include "internal/cryptlib.h"
#include <openssl/lhash.h>
#include <openssl/asn1.h>
-#include <openssl/objects.h>
+#include "internal/objects.h"
#include <openssl/bn.h>
#include "internal/asn1_int.h"
#include "obj_lcl.h"
@@ -210,7 +210,7 @@ void check_defer(int nid)
obj_cleanup_defer = 1;
}
-void OBJ_cleanup(void)
+void obj_cleanup_intern(void)
{
if (obj_cleanup_defer) {
obj_cleanup_defer = 2;