PR: 2652

Submitted by: Arpadffy Zoltan <Zoltan.Arpadffy@scientificgames.se>

OpenVMS fixes.

diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index fffc98d59ad9ef24ce82335fe67d596080c41ead..403f592dcd69f029c5a8a9438e313095a458de61 100644 (file)
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -192,6 +192,18 @@
 #define SSL_CTX_set_srp_verify_param_callback  SSL_CTX_set_srp_vfy_param_cb
 #undef SSL_CTX_set_srp_username_callback
 #define SSL_CTX_set_srp_username_callback      SSL_CTX_set_srp_un_cb
+#undef ssl_add_clienthello_use_srtp_ext
+#define ssl_add_clienthello_use_srtp_ext ssl_add_clihello_use_srtp_ext
+#undef ssl_add_serverhello_use_srtp_ext
+#define ssl_add_serverhello_use_srtp_ext ssl_add_serhello_use_srtp_ext
+#undef ssl_parse_clienthello_use_srtp_ext
+#define ssl_parse_clienthello_use_srtp_ext ssl_parse_clihello_use_srtp_ext
+#undef ssl_parse_serverhello_use_srtp_ext
+#define ssl_parse_serverhello_use_srtp_ext ssl_parse_serhello_use_srtp_ext
+#undef SSL_CTX_set_next_protos_advertised_cb
+#define SSL_CTX_set_next_protos_advertised_cb SSL_CTX_set_next_protos_adv_cb
+#undef SSL_CTX_set_next_proto_select_cb
+#define SSL_CTX_set_next_proto_select_cb SSL_CTX_set_next_proto_sel_cb
 
 /* Hack some long ENGINE names */
 #undef ENGINE_get_default_BN_mod_exp_crt

diff --git a/makevms.com b/makevms.com
index 19e3407b0554a6eaf47d86ac1dec1c43c982fb2d..4797b928bce1855193ba70eea7c0bb88f46026a4 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -784,7 +784,7 @@ $!
 $! Copy All The ".H" Files From The [.SSL] Directory.
 $!
 $! (keep these in the same order as ssl/Makefile)
-$ EXHEADER := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, kssl.h
+$ EXHEADER := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, kssl.h, srtp.h
 $ copy sys$disk:[.ssl]'exheader' sys$disk:[.include.openssl]
 $!
 $! Purge the [.include.openssl] header files.

diff --git a/ssl/ssl-lib.com b/ssl/ssl-lib.com
index 288c7b525be1d627f4a531757665c2f627794015..a77f7707f279f0ddedf8dd7e730d9d2f84d8a19d 100644 (file)
--- a/ssl/ssl-lib.com
+++ b/ssl/ssl-lib.com
@@ -218,7 +218,7 @@ $ LIB_SSL = "s2_meth,s2_srvr,s2_clnt,s2_lib,s2_enc,s2_pkt,"+ -
            "s23_meth,s23_srvr,s23_clnt,s23_lib,s23_pkt,"+ -
            "t1_meth,t1_srvr,t1_clnt,t1_lib,t1_enc,"+ -
            "d1_meth,d1_srvr,d1_clnt,d1_lib,d1_pkt,"+ -
-           "d1_both,d1_enc,"+ -
+           "d1_both,d1_enc,d1_srtp,"+ -
            "ssl_lib,ssl_err2,ssl_cert,ssl_sess,"+ -
            "ssl_ciph,ssl_stat,ssl_rsa,"+ -
            "ssl_asn1,ssl_txt,ssl_algs,"+ -

diff --git a/util/ssleay.num b/util/ssleay.num
index b26d4be9ecb63ff911962b83b2780f49aa6a7410..37655bc40a8395432657204f738f8871371e3ea8 100755 (executable)
--- a/util/ssleay.num
+++ b/util/ssleay.num
@@ -310,11 +310,13 @@ SSL_SESSION_get_id_len                  351       NOEXIST::FUNCTION:
 kssl_ctx_get0_client_princ              352    EXIST::FUNCTION:KRB5
 SSL_export_keying_material              353    EXIST::FUNCTION:TLSEXT
 SSL_set_tlsext_use_srtp                 354    EXIST::FUNCTION:
-SSL_CTX_set_next_protos_advertised_cb   355    EXIST::FUNCTION:NEXTPROTONEG
+SSL_CTX_set_next_protos_advertised_cb   355    EXIST:!VMS:FUNCTION:NEXTPROTONEG
+SSL_CTX_set_next_protos_adv_cb          355    EXIST:VMS:FUNCTION:NEXTPROTONEG
 SSL_get0_next_proto_negotiated          356    EXIST::FUNCTION:NEXTPROTONEG
 SSL_get_selected_srtp_profile           357    EXIST::FUNCTION:
 SSL_CTX_set_tlsext_use_srtp             358    EXIST::FUNCTION:
 SSL_select_next_proto                   359    EXIST::FUNCTION:NEXTPROTONEG
 SSL_get_srtp_profiles                   360    EXIST::FUNCTION:
-SSL_CTX_set_next_proto_select_cb        361    EXIST::FUNCTION:NEXTPROTONEG
+SSL_CTX_set_next_proto_select_cb        361    EXIST:!VMS:FUNCTION:NEXTPROTONEG
+SSL_CTX_set_next_proto_sel_cb           361    EXIST:VMS:FUNCTION:NEXTPROTONEG
 SSL_SESSION_get_compress_id             362    EXIST::FUNCTION: