aboutsummaryrefslogtreecommitdiffstats
path: root/include/openssl/conf.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-04 17:00:04 +0100
committerMatt Caswell <matt@openssl.org>2016-04-13 08:52:33 +0100
commitcbf6959fe8ff51730a397ea426075d547ec5d7a8 (patch)
treeeef161225ca88ad3d6471c81c942dc6c7f3a26df /include/openssl/conf.h
parent6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743 (diff)
downloadopenssl-cbf6959fe8ff51730a397ea426075d547ec5d7a8.tar.gz
Deprecate CONF_modules_free() and make it a no-op
CONF_modules_free() 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/conf.h')
-rw-r--r--include/openssl/conf.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/conf.h b/include/openssl/conf.h
index 24e9dee49f..29189d0547 100644
--- a/include/openssl/conf.h
+++ b/include/openssl/conf.h
@@ -186,7 +186,9 @@ int CONF_modules_load_file(const char *filename, const char *appname,
unsigned long flags);
void CONF_modules_unload(int all);
void CONF_modules_finish(void);
-void CONF_modules_free(void);
+#if OPENSSL_API_COMPAT < 0x10100000L
+# define CONF_modules_free()
+#endif
int CONF_module_add(const char *name, conf_init_func *ifunc,
conf_finish_func *ffunc);