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

Return previous compression methods when setting them.

Browse Source 
(cherry picked from commit b45e874d7c4a8fdac7ec10cff43f21d02e75d511)
This commit is contained in:
Dr. Stephen Henson 2014-02-06 13:57:26 +00:00
parent 9578319394
commit c41e242e5c
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

@ -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);

4
ssl/ssl_ciph.c
View File

@ -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)