VMS build fix

Reviewed-by: Andy Polyakov <appro@openssl.org>

diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index 99d4b54581800030e622b104a336751f7e5fd9fc..b8a6ddf124ea3799204f634a72672d1c82113377 100644 (file)
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -197,6 +197,13 @@
 #  undef ssl_parse_serverhello_renegotiate_ext
 #  define ssl_parse_serverhello_renegotiate_ext   ssl_parse_serverhello_reneg_ext
 
+#  undef ssl3_cbc_record_digest_supported
+#  define ssl3_cbc_record_digest_supported        ssl3_cbc_record_digest_support
+#  undef ssl_check_clienthello_tlsext_late
+#  define ssl_check_clienthello_tlsext_late       ssl_check_clihello_tlsext_late
+#  undef ssl_check_clienthello_tlsext_early
+#  define ssl_check_clienthello_tlsext_early      ssl_check_clihello_tlsext_early
+
 /* Hack some long ENGINE names */
 #  undef ENGINE_get_default_BN_mod_exp_crt
 #  define ENGINE_get_default_BN_mod_exp_crt       ENGINE_get_def_BN_mod_exp_crt

diff --git a/ssl/ssl-lib.com b/ssl/ssl-lib.com
index 85ab2f61f2531aa532cbc206e76abec1dd118ce6..38efbb0fa5c2c94d7588abb3acc4e3fb57b137c2 100644 (file)
--- a/ssl/ssl-lib.com
+++ b/ssl/ssl-lib.com
@@ -171,11 +171,11 @@ $ ENDIF
 $!
 $! Define The Different SSL "library" Files.
 $!
-$ LIB_SSL = "s2_meth,s2_srvr,s2_clnt,s2_lib,s2_enc,s2_pkt,"+ -
-           "s3_meth,s3_srvr,s3_clnt,s3_lib,s3_enc,s3_pkt,s3_both,"+ -
-           "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,"+ -
+$ LIB_SSL = "s2_meth,  s2_srvr, s2_clnt, s2_lib, s2_enc, s2_pkt,"+ -
+           "s3_meth,  s3_srvr, s3_clnt, s3_lib, s3_enc, s3_pkt,s3_both,s3_cbc,"+ -
+           "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,"+ -
            "ssl_lib,ssl_err2,ssl_cert,ssl_sess,"+ -
            "ssl_ciph,ssl_stat,ssl_rsa,"+ -
@@ -196,7 +196,7 @@ $ NEXT_FILE:
 $!
 $! O.K, Extract The File Name From The File List.
 $!
-$ FILE_NAME = F$ELEMENT(FILE_COUNTER,",",LIB_SSL)
+$ FILE_NAME = F$EDIT(F$ELEMENT(FILE_COUNTER,",",LIB_SSL),"COLLAPSE")
 $!
 $! Check To See If We Are At The End Of The File List.
 $!