From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 6 Feb 2014 13:57:26 +0000 (+0000)
Subject: Return previous compression methods when setting them.
X-Git-Tag: OpenSSL_1_0_2-beta1~46
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c41e242e5c0d84b2ae0e5a0ac9011eddfaeb5fb1;p=oweals%2Fopenssl.git

Return previous compression methods when setting them.
(cherry picked from commit b45e874d7c4a8fdac7ec10cff43f21d02e75d511)
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 247d4cfb34..a2f32d2c34 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2451,7 +2451,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 839b210081..1ea202f136 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1870,9 +1870,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)