diff options
| author | Matt Caswell <matt@openssl.org> | 2016-04-04 13:53:35 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-04-13 08:52:33 +0100 |
| commit | 03b0e735556ed31c3e9096350e7a4563ea9d34b7 (patch) | |
| tree | cce1221d779f74dbbe6fd88c049fd5d59fa0bee5 /ssl | |
| parent | 6827cb3610fee4ec8cc120cc6b5bf88b04884ae7 (diff) | |
Deprecate SSL_COMP_free_compression_methods() and make it a no-op
SSL_COMP_free_compression_methods() 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 'ssl')
| -rw-r--r-- | ssl/ssl_ciph.c | 5 | ||||
| -rw-r--r-- | ssl/ssl_init.c | 4 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 46fa3e89c6..1faa2ea160 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1883,9 +1883,6 @@ STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP) { return meths; } -void SSL_COMP_free_compression_methods(void) -{ -} int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) { return 1; @@ -1911,7 +1908,7 @@ static void cmeth_free(SSL_COMP *cm) OPENSSL_free(cm); } -void SSL_COMP_free_compression_methods(void) +void ssl_comp_free_compression_methods_intern(void) { STACK_OF(SSL_COMP) *old_meths = ssl_comp_methods; ssl_comp_methods = NULL; diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index 2462fa5eab..2f8034a7d3 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -198,9 +198,9 @@ static void ssl_library_stop(void) #ifndef OPENSSL_NO_COMP #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: " - "SSL_COMP_free_compression_methods()\n"); + "ssl_comp_free_compression_methods_intern()\n"); #endif - SSL_COMP_free_compression_methods(); + ssl_comp_free_compression_methods_intern(); #endif } diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index c02dbbbe47..1596091e81 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -2195,6 +2195,8 @@ __owur int custom_ext_add(SSL *s, int server, __owur int custom_exts_copy(custom_ext_methods *dst, const custom_ext_methods *src); void custom_exts_free(custom_ext_methods *exts); +void ssl_comp_free_compression_methods_intern(void); + # else # define ssl_init_wbio_buffer SSL_test_functions()->p_ssl_init_wbio_buffer |