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>
This commit is contained in:
Matt Caswell
2016-04-04 17:00:04 +01:00
parent 6d4fb1d59e
commit cbf6959fe8
6 changed files with 25 additions and 15 deletions

View File

@@ -9,10 +9,15 @@
#include <openssl/conf.h>
void CONF_modules_free(void);
void CONF_modules_finish(void);
void CONF_modules_unload(int all);
Deprecated:
#if OPENSSL_API_COMPAT < 0x10100000L
# define CONF_modules_free()
#endif
=head1 DESCRIPTION
CONF_modules_free() closes down and frees up all memory allocated by all
@@ -27,8 +32,10 @@ B<all> is B<1> all modules, including builtin modules will be unloaded.
=head1 NOTES
Normally applications will only call CONF_modules_free() at application to
tidy up any configuration performed.
Normally in versions of OpenSSL prior to 1.1.0 applications will only call
CONF_modules_free() at application to tidy up any configuration performed. From
1.1.0 CONF_modules_free() is deprecated an no explicit CONF cleanup as required
at all. For more information see L<OPENSSL_init_crypto(3)>.
=head1 RETURN VALUE
@@ -39,4 +46,8 @@ None of the functions return a value.
L<conf(5)>, L<OPENSSL_config(3)>,
L<CONF_modules_load_file(3)>
=head1 HISTORY
CONF_modules_free() was deprecated in OpenSSL 1.1.0.
=cut

View File

@@ -23,9 +23,6 @@ Multiple calls have no effect.
OPENSSL_no_config() disables configuration. If called before OPENSSL_config()
no configuration takes place.
Applications should free up configuration at application closedown by calling
CONF_modules_free().
If the application is built with B<OPENSSL_LOAD_CONF> defined, then a
call to OpenSSL_add_all_algorithms() will implicitly call OPENSSL_config()
first.
@@ -57,8 +54,7 @@ Neither OPENSSL_config() nor OPENSSL_no_config() return a value.
=head1 SEE ALSO
L<conf(5)>,
L<CONF_modules_load_file(3)>,
L<CONF_modules_free(3)>
L<CONF_modules_load_file(3)>
=head1 HISTORY