generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return previous compression methods when setting them.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2014-02-06 13:57:26 +00:00
parent c53a5308a5
commit b45e874d7c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/ssl.h
View File

@ -2503,7 +2503,7 @@ const COMP_METHOD *SSL_get_current_compression(SSL *s);
const COMP_METHOD *SSL_get_current_expansion(SSL *s); const COMP_METHOD *SSL_get_current_expansion(SSL *s);
const char *SSL_COMP_get_name(const COMP_METHOD *comp); const char *SSL_COMP_get_name(const COMP_METHOD *comp);
STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); 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); int SSL_COMP_add_compression_method(int id,COMP_METHOD *cm);
#else #else
const void *SSL_get_current_compression(SSL *s); const void *SSL_get_current_compression(SSL *s);

4
ssl/ssl_ciph.c
View File

@ -1892,9 +1892,11 @@ STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void)
return(ssl_comp_methods); 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; ssl_comp_methods = meths;
return old_meths;
} }
int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)