diff options
| -rw-r--r-- | crypto/symhacks.h | 2 | ||||
| -rw-r--r-- | ssl/ssl.h | 4 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 6 | ||||
| -rwxr-xr-x | util/ssleay.num | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/crypto/symhacks.h b/crypto/symhacks.h index a40e4fa468..9a46a2a210 100644 --- a/crypto/symhacks.h +++ b/crypto/symhacks.h @@ -163,6 +163,8 @@ #define SSL_CTX_set_cert_verify_callback SSL_CTX_set_cert_verify_cb #undef SSL_CTX_set_default_passwd_cb_userdata #define SSL_CTX_set_default_passwd_cb_userdata SSL_CTX_set_def_passwd_cb_ud +#undef SSL_COMP_get_compression_methods +#define SSL_COMP_get_compression_methods SSL_COMP_get_compress_methods /* Hack some long ENGINE names */ #undef ENGINE_get_default_BN_mod_exp_crt @@ -1490,10 +1490,10 @@ void SSL_set_tmp_ecdh_callback(SSL *ssl, #endif #ifndef OPENSSL_NO_COMP -STACK_OF(SSL_COMP) *SSL_COMP_get_compression_method(void); +STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); int SSL_COMP_add_compression_method(int id,COMP_METHOD *cm); #else -void *SSL_COMP_get_compression_method(void); +void *SSL_COMP_get_compression_methods(void); int SSL_COMP_add_compression_method(int id,char *cm); #endif diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index c2e6ff8cf7..26e518ade7 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -492,11 +492,6 @@ OPENSSL_EXTERN SSL3_ENC_METHOD ssl3_undef_enc_method; OPENSSL_EXTERN SSL_CIPHER ssl2_ciphers[]; OPENSSL_EXTERN SSL_CIPHER ssl3_ciphers[]; -#ifdef OPENSSL_SYS_VMS -#undef SSL_COMP_get_compression_methods -#define SSL_COMP_get_compression_methods SSL_COMP_get_compress_methods -#endif - SSL_METHOD *ssl_bad_method(int ver); SSL_METHOD *sslv2_base_method(void); @@ -643,7 +638,6 @@ int ssl_ok(SSL *s); int check_srvr_ecc_cert_and_alg(X509 *x, SSL_CIPHER *cs); SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); -STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); #endif diff --git a/util/ssleay.num b/util/ssleay.num index c2a4909f11..8ed7b4ab10 100755 --- a/util/ssleay.num +++ b/util/ssleay.num @@ -218,8 +218,8 @@ SSL_set_msg_callback 267 EXIST::FUNCTION: SSL_set_tmp_ecdh_callback 268 EXIST::FUNCTION:ECDH SSL_CTX_set_tmp_ecdh_callback 269 EXIST::FUNCTION:ECDH SSL_SESSION_get_id 270 EXIST::FUNCTION: -SSL_COMP_get_compression_method 271 EXIST::FUNCTION:COMP +SSL_COMP_get_compression_methods 271 EXIST:!VMS:FUNCTION:COMP +SSL_COMP_get_compress_methods 271 EXIST:VMS:FUNCTION:COMP SSL_COMP_get_name 272 EXIST::FUNCTION: SSL_get_current_expansion 273 EXIST::FUNCTION: SSL_get_current_compression 274 EXIST::FUNCTION: -SSL_COMP_get_compression_methods 275 EXIST::FUNCTION: |