diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-04 17:00:04 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
| commit | cbf6959fe8ff51730a397ea426075d547ec5d7a8 (patch) | |
| tree | eef161225ca88ad3d6471c81c942dc6c7f3a26df /include | |
| parent | 6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743 (diff) | |
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')
| -rw-r--r-- | include/internal/conf.h | 1 | ||||
| -rw-r--r-- | include/openssl/conf.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/internal/conf.h b/include/internal/conf.h index 3bd6069a59..e21f22f9d0 100644 --- a/include/internal/conf.h +++ b/include/internal/conf.h @@ -53,6 +53,7 @@ struct ossl_init_settings_st { void openssl_config_internal(const char *config_name); void openssl_no_config_internal(void); +void conf_modules_free_intern(void); #ifdef __cplusplus } 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); |