Return previous compression methods when setting them.

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 4f38c3ba46255b93bb652c9ea68f1af9c9db63d1..13e7b7218f299dc9743b0c325270da78ad1559f0 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2503,7 +2503,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);
+STACK_OF(SSL_COMP) *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 33b7d089104b8c620f60dc8b12092482e42868d7..1927969a76decc56c722fb3b05f7285bcc7b1c01 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1892,9 +1892,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)
+STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP) *meths)
        {
+       STACK_OF(SSL_COMP) *old_meths = ssl_comp_methods;
        ssl_comp_methods = meths;
+       return old_meths;
        }
 
 int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)