New function to set compression methods so they can be safely freed.

(cherry picked from commit cbb67448277232c8403f96edad4931c4203e7746)

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 6ac4e92216de1957e637b79ae97bbb363b0ba471..1505816d3454e713fba5d9d5c83d2396d6cadf09 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2440,6 +2440,7 @@ const COMP_METHOD *SSL_get_current_compression(SSL *s);
 const COMP_METHOD *SSL_get_current_expansion(SSL *s);
 const char *SSL_COMP_get_name(const COMP_METHOD *comp);
 STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
+void SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP) *meths);
 int SSL_COMP_add_compression_method(int id,COMP_METHOD *cm);
 #else
 const void *SSL_get_current_compression(SSL *s);

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 22047c3e4191893687e7cd80377762637dcdb212..33bbfa2810509cf42413833b49001c5f0a7abffc 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1862,6 +1862,11 @@ STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void)
        return(ssl_comp_methods);
        }
 
+void SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP) *meths)
+       {
+       ssl_comp_methods = meths;
+       }
+
 int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
        {
        SSL_COMP *comp;