diff options
| -rw-r--r-- | crypto/symhacks.h | 24 | ||||
| -rw-r--r-- | e_os.h | 1 | ||||
| -rw-r--r-- | ssl/ssl_task.c | 4 |
3 files changed, 27 insertions, 2 deletions
diff --git a/crypto/symhacks.h b/crypto/symhacks.h index 56922c99da..03cdb1ad64 100644 --- a/crypto/symhacks.h +++ b/crypto/symhacks.h @@ -189,6 +189,14 @@ SSL_CTX_set_not_resumbl_sess_cb # undef SSL_set_not_resumable_session_callback # define SSL_set_not_resumable_session_callback SSL_set_not_resumbl_sess_cb +# undef ssl_check_clienthello_tlsext_late +# define ssl_check_clienthello_tlsext_late ssl_chk_clienthello_tlsext_late +# undef ssl3_cbc_record_digest_supported +# define ssl3_cbc_record_digest_supported ssl3_cbc_rcd_digest_supported +# undef SSL_COMP_set0_compression_methods +# define SSL_COMP_set0_compression_methods SSL_COMP_set0_compr_methods +# undef SSL_COMP_free_compression_methods +# define SSL_COMP_free_compression_methods SSL_COMP_free_compr_methods /* Hack some long ENGINE names */ # undef ENGINE_get_default_BN_mod_exp_crt @@ -399,6 +407,18 @@ # define CMS_OriginatorIdentifierOrKey_it CMS_OriginatorIdOrKey_it # undef cms_SignerIdentifier_get0_signer_id # define cms_SignerIdentifier_get0_signer_id cms_SignerId_get0_signer_id +# undef CMS_RecipientInfo_kari_get0_orig_id +# define CMS_RecipientInfo_kari_get0_orig_id CMS_RecipInfo_kari_get0_orig_id +# undef CMS_RecipientInfo_kari_get0_reks +# define CMS_RecipientInfo_kari_get0_reks CMS_RecipInfo_kari_get0_reks +# undef CMS_RecipientInfo_kari_set0_pkey +# define CMS_RecipientInfo_kari_set0_pkey CMS_RecipInfo_kari_set0_pkey +# undef CMS_RecipientInfo_kari_orig_id_cmp +# define CMS_RecipientInfo_kari_orig_id_cmp CMS_RecipInfo_kari_orig_id_cmp +# undef CMS_RecipientEncryptedKey_cert_cmp +# define CMS_RecipientEncryptedKey_cert_cmp CMS_RecipEncryptedKey_cert_cmp +# undef CMS_RecipientEncryptedKey_get0_id +# define CMS_RecipientEncryptedKey_get0_id CMS_RecipEncryptedKey_get0_id /* Hack some long DTLS1 names */ # undef dtls1_retransmit_buffered_messages @@ -416,6 +436,10 @@ # undef UI_method_set_prompt_constructor # define UI_method_set_prompt_constructor UI_method_set_prompt_constructr +/* Hack some long RSA names */ +# undef RSA_padding_check_PKCS1_OAEP_mgf1 +# define RSA_padding_check_PKCS1_OAEP_mgf1 RSA_padding_chk_PKCS1_OAEP_mgf1 + # endif /* defined OPENSSL_SYS_VMS */ /* Case insensitive linking causes problems.... */ @@ -385,6 +385,7 @@ extern FILE *_imp___iob; __VMS_EXIT |= 0x10000000; \ exit(__VMS_EXIT); } while(0) # define NO_SYS_PARAM_H +# define NO_SYS_UN_H # elif defined(OPENSSL_SYS_NETWARE) # include <fcntl.h> diff --git a/ssl/ssl_task.c b/ssl/ssl_task.c index f0ed4e40bf..dad20c67ef 100644 --- a/ssl/ssl_task.c +++ b/ssl/ssl_task.c @@ -131,8 +131,8 @@ int LIB$INIT_TIMER(), LIB$SHOW_TIMER(); #include <openssl/ssl.h> #include <openssl/err.h> -int MS_CALLBACK verify_callback(int ok, X509 *xs, X509 *xi, int depth, - int error); +int verify_callback(int ok, X509 *xs, X509 *xi, int depth, + int error); BIO *bio_err = NULL; BIO *bio_stdout = NULL; BIO_METHOD *BIO_s_rtcp(); |