summaryrefslogtreecommitdiffstats
path: root/crypto/conf
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-04-04 18:00:04 +0200
committerMatt Caswell <matt@openssl.org>2016-04-13 09:52:33 +0200
commitcbf6959fe8ff51730a397ea426075d547ec5d7a8 (patch)
treeeef161225ca88ad3d6471c81c942dc6c7f3a26df /crypto/conf
parentDeprecate ENGINE_cleanup() and make it a no-op (diff)
downloadopenssl-cbf6959fe8ff51730a397ea426075d547ec5d7a8.tar.xz
openssl-cbf6959fe8ff51730a397ea426075d547ec5d7a8.zip
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 'crypto/conf')
-rw-r--r--crypto/conf/conf_mod.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index aede656045..99f552ce61 100644
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -60,7 +60,7 @@
#include <ctype.h>
#include <openssl/crypto.h>
#include "internal/cryptlib.h"
-#include <openssl/conf.h>
+#include "internal/conf.h"
#include "internal/dso.h"
#include <openssl/x509.h>
@@ -460,7 +460,7 @@ int CONF_module_add(const char *name, conf_init_func *ifunc,
return 0;
}
-void CONF_modules_free(void)
+void conf_modules_free_intern(void)
{
CONF_modules_finish();
CONF_modules_unload(1);