aboutsummaryrefslogtreecommitdiff
path: root/include/openssl/objects.h
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 /include/openssl/objects.h
parent22c84afa773559279af928652a2d9f3489cc7d73 (diff)
downloadopenssl-7b8cc9b3458ec3f18b4d4d9ca2a72b6b3e3744c8.zip
openssl-7b8cc9b3458ec3f18b4d4d9ca2a72b6b3e3744c8.tar.gz
openssl-7b8cc9b3458ec3f18b4d4d9ca2a72b6b3e3744c8.tar.bz2
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 'include/openssl/objects.h')
-rw-r--r--include/openssl/objects.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/objects.h b/include/openssl/objects.h
index 05bc9b0..c61e49e 100644
--- a/include/openssl/objects.h
+++ b/include/openssl/objects.h
@@ -1103,7 +1103,9 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
int OBJ_new_nid(int num);
int OBJ_add_object(const ASN1_OBJECT *obj);
int OBJ_create(const char *oid, const char *sn, const char *ln);
-void OBJ_cleanup(void);
+#if OPENSSL_API_COMPAT < 0x10100000L
+# define OBJ_cleanup()
+#endif
int OBJ_create_objects(BIO *in);
size_t OBJ_length(const ASN1_OBJECT *obj);