Commit c41e242e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Return previous compression methods when setting them. 

(cherry picked from commit b45e874d)
parent 95783193

ssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

ssl/ssl_ciph.c

+3 −1
Original line number Diff line number Diff line
@@ -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)