resolve conflicts

1 files changed, 27 insertions, 1 deletions

diff --git a/src/lib/libcrypto/util/ssleay.num b/src/lib/libcrypto/util/ssleay.num
index 46e38a131f..b3ac136a56 100644
--- a/src/lib/libcrypto/util/ssleay.num
+++ b/src/lib/libcrypto/util/ssleay.num
@@ -170,7 +170,7 @@ SSL_add_file_cert_subjs_to_stk          185	EXIST:VMS:FUNCTION:STDIO
 SSL_set_tmp_rsa_callback                186     EXIST::FUNCTION:RSA
 SSL_set_tmp_dh_callback                 187     EXIST::FUNCTION:DH
 SSL_add_dir_cert_subjects_to_stack      188     EXIST:!VMS:FUNCTION:STDIO
-SSL_add_dir_cert_subjs_to_stk           188     NOEXIST::FUNCTION:
+SSL_add_dir_cert_subjs_to_stk           188     EXIST:VMS:FUNCTION:STDIO
 SSL_set_session_id_context              189     EXIST::FUNCTION:
 SSL_CTX_use_certificate_chain_file      222     EXIST:!VMS:FUNCTION:STDIO
 SSL_CTX_use_cert_chain_file             222     EXIST:VMS:FUNCTION:STDIO
@@ -215,3 +215,29 @@ SSL_CTX_set_generate_session_id         264	EXIST::FUNCTION:
 SSL_renegotiate_pending                 265     EXIST::FUNCTION:
 SSL_CTX_set_msg_callback                266     EXIST::FUNCTION:
 SSL_set_msg_callback                    267     EXIST::FUNCTION:
+DTLSv1_client_method                    268     EXIST::FUNCTION:
+SSL_CTX_set_tmp_ecdh_callback           269     EXIST::FUNCTION:ECDH
+SSL_set_tmp_ecdh_callback               270     EXIST::FUNCTION:ECDH
+SSL_COMP_get_name                       271     EXIST::FUNCTION:COMP
+SSL_get_current_compression             272     EXIST::FUNCTION:COMP
+DTLSv1_method                           273     EXIST::FUNCTION:
+SSL_get_current_expansion               274     EXIST::FUNCTION:COMP
+DTLSv1_server_method                    275     EXIST::FUNCTION:
+SSL_COMP_get_compression_methods        276     EXIST:!VMS:FUNCTION:COMP
+SSL_COMP_get_compress_methods           276     EXIST:VMS:FUNCTION:COMP
+SSL_SESSION_get_id                      277     EXIST::FUNCTION:
+SSL_CTX_sess_set_new_cb                 278     EXIST::FUNCTION:
+SSL_CTX_sess_get_get_cb                 279     EXIST::FUNCTION:
+SSL_CTX_sess_set_get_cb                 280     EXIST::FUNCTION:
+SSL_CTX_set_cookie_verify_cb            281     EXIST::FUNCTION:
+SSL_CTX_get_info_callback               282     EXIST::FUNCTION:
+SSL_CTX_set_cookie_generate_cb          283     EXIST::FUNCTION:
+SSL_CTX_set_client_cert_cb              284     EXIST::FUNCTION:
+SSL_CTX_sess_set_remove_cb              285     EXIST::FUNCTION:
+SSL_CTX_set_info_callback               286     EXIST::FUNCTION:
+SSL_CTX_sess_get_new_cb                 287     EXIST::FUNCTION:
+SSL_CTX_get_client_cert_cb              288     EXIST::FUNCTION:
+SSL_CTX_sess_get_remove_cb              289     EXIST::FUNCTION:
+SSL_set_SSL_CTX                         290     EXIST::FUNCTION:
+SSL_get_servername                      291     EXIST::FUNCTION:TLSEXT
+SSL_get_servername_type                 292     EXIST::FUNCTION:TLSEXT