diff options
| author | Zoltan Arpadffy <zoli@polarhome.com> | 2014-02-25 15:16:03 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-02-25 15:16:03 +0000 |
| commit | dabd4f19868519ef3532d9c4a4f5127446e0290a (patch) | |
| tree | 06a1d64aedf5651dc96eac890ed9ca67c59fbc89 | |
| parent | 251c47001b951ec10dcd08b7d727e103560f8f25 (diff) | |
OpenVMS fixes.
| -rw-r--r-- | apps/makeapps.com | 2 | ||||
| -rw-r--r-- | crypto/crypto-lib.com | 2 | ||||
| -rw-r--r-- | crypto/symhacks.h | 2 | ||||
| -rw-r--r-- | engines/makeengines.com | 2 | ||||
| -rwxr-xr-x | makevms.com | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/apps/makeapps.com b/apps/makeapps.com index efc213c8ee..e7cf92562b 100644 --- a/apps/makeapps.com +++ b/apps/makeapps.com @@ -773,7 +773,7 @@ $ CCDEFS = "MONOLITH" $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS $ CCEXTRAFLAGS = "" $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS -$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" +$ CCDISABLEWARNINGS = "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN - CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS $! diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com index a409fefaa8..01598c21a4 100644 --- a/crypto/crypto-lib.com +++ b/crypto/crypto-lib.com @@ -293,7 +293,7 @@ $ LIB_EVP_2 = "m_null,m_md2,m_md4,m_md5,m_sha,m_sha1,m_wp," + - "c_all,c_allc,c_alld,evp_lib,bio_ok,"+- "evp_pkey,evp_pbe,p5_crpt,p5_crpt2" $ LIB_EVP_3 = "e_old,pmeth_lib,pmeth_fn,pmeth_gn,m_sigver,evp_fips,"+ - - "e_aes_cbc_hmac_sha1,e_rc4_hmac_md5" + "e_aes_cbc_hmac_sha1,e_aes_cbc_hmac_sha256,e_rc4_hmac_md5" $ LIB_ASN1 = "a_object,a_bitstr,a_utctm,a_gentm,a_time,a_int,a_octet,"+ - "a_print,a_type,a_set,a_dup,a_d2i_fp,a_i2d_fp,"+ - "a_enum,a_utf8,a_sign,a_digest,a_verify,a_mbstr,a_strex,"+ - diff --git a/crypto/symhacks.h b/crypto/symhacks.h index 5774d24561..c603cac64a 100644 --- a/crypto/symhacks.h +++ b/crypto/symhacks.h @@ -176,6 +176,8 @@ #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 +#undef SSL_COMP_set0_compression_methods +#define SSL_COMP_set0_compression_methods SSL_COMP_set0_compress_methods #undef ssl_add_clienthello_renegotiate_ext #define ssl_add_clienthello_renegotiate_ext ssl_add_clienthello_reneg_ext #undef ssl_add_serverhello_renegotiate_ext diff --git a/engines/makeengines.com b/engines/makeengines.com index 6329fbbf03..48a0c2e9f7 100644 --- a/engines/makeengines.com +++ b/engines/makeengines.com @@ -756,7 +756,7 @@ $ CCDEFS = "TCPIP_TYPE_''OPT_TCPIP_LIB',DSO_VMS" $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS $ CCEXTRAFLAGS = "" $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS -$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX" +$ CCDISABLEWARNINGS = "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX" $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN - CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS $! diff --git a/makevms.com b/makevms.com index b554cabab4..688a2e0146 100755 --- a/makevms.com +++ b/makevms.com @@ -1010,9 +1010,9 @@ $! $! Tell The User We Don't Know What They Want. $! $ WRITE SYS$OUTPUT "" -$ WRITE SYS$OUTPUT "USAGE: @MAKEVMS.COM [Target] [Pointer size] [Debug option] <Compiler>" +$ WRITE SYS$OUTPUT "USAGE: @MAKEVMS.COM [Target] [Pointer size] [Debug option] <Compiler> <TCP/IP library>" $ WRITE SYS$OUTPUT "" -$ WRITE SYS$OUTPUT "Example: @MAKEVMS.COM ALL """" NODEBUG " +$ WRITE SYS$OUTPUT "Example: @MAKEVMS.COM ALL """" NODEBUG DECC TCPIP" $ WRITE SYS$OUTPUT "" $ WRITE SYS$OUTPUT "The Target ",P1," Is Invalid. The Valid Target Options Are:" $ WRITE SYS$OUTPUT "" |