Return previous compression methods when setting them.

9 years ago · b45e874d7c
parent c53a5308a5
commit b45e874d7c
2 changed files with 4 additions and 2 deletions
--- 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);
--- 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)