[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  cdca82dcde1d233a648c18b2359f058f42dfe9ae (commit)
      from  31c2b6ee7a5bc69b9bfc7eb96f4fa30f3a2681bd (commit)


- Log -----------------------------------------------------------------
commit cdca82dcde1d233a648c18b2359f058f42dfe9ae
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 5 18:19:06 2015 +0100

    Catch up the VMS build.
    
    crypto/crypto-lib.com - catch up with the OCSP changes
    test/maketest.com and test/tests.com - catch up with the addition of test_evp_extra
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/crypto-lib.com | 4 ++--
 test/maketests.com    | 6 ++++--
 test/tests.com        | 8 ++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index bf01471..0514821 100644
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -328,7 +328,7 @@ $ LIB_X509 = "x509_def,x509_d2,x509_r2x,x509_cmp,"+ -
 $ LIB_X509V3 = "v3_bcons,v3_bitst,v3_conf,v3_extku,v3_ia5,v3_lib,"+ -
 	"v3_prn,v3_utl,v3err,v3_genn,v3_alt,v3_skey,v3_akey,v3_pku,"+ -
 	"v3_int,v3_enum,v3_sxnet,v3_cpols,v3_crld,v3_purp,v3_info,"+ -
-	"v3_ocsp,v3_akeya,v3_pmaps,v3_pcons,v3_ncons,v3_pcia,v3_pci,"+ -
+	"v3_akeya,v3_pmaps,v3_pcons,v3_ncons,v3_pcia,v3_pci,"+ -
 	"pcy_cache,pcy_node,pcy_data,pcy_map,pcy_tree,pcy_lib,"+ -
 	"v3_asid,v3_addr,v3_scts"
 $ LIB_CONF = "conf_err,conf_lib,conf_api,conf_def,conf_mod,conf_mall,conf_sap"
@@ -341,7 +341,7 @@ $ LIB_PKCS12 = "p12_add,p12_asn,p12_attr,p12_crpt,p12_crt,p12_decr,"+ -
 $ LIB_COMP = "comp_lib,comp_err,"+ -
 	"c_rle,c_zlib"
 $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
-	"ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err"
+	"ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err,v3_ocsp"
 $ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"
 $ LIB_KRB5 = "krb5_asn"
 $ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -
diff --git a/test/maketests.com b/test/maketests.com
index 5919374..b0ff39d 100644
--- a/test/maketests.com
+++ b/test/maketests.com
@@ -148,8 +148,9 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
 	       "GOST2814789TEST,"+ -
 	       "BFTEST,CASTTEST,SSLTEST,"+ -
 	       "EXPTEST,DSATEST,RSA_TEST,"+ -
-	       "EVP_TEST,IGETEST,JPAKETEST,SRPTEST,"+ -
-	       "V3NAMETEST,HEARTBEAT_TEST,P5_CRPT2_TEST,"+ -
+	       "EVP_TEST,EVP_EXTRA_TEST,IGETEST,"+ -
+	       "JPAKETEST,SRPTEST,V3NAMETEST,"+ -
+	       "HEARTBEAT_TEST,P5_CRPT2_TEST,"+ -
 	       "CONSTANT_TIME_TEST"
 $! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well?
 $!
@@ -185,6 +186,7 @@ $ T_D_EXPTEST            := [-.crypto.bn]
 $ T_D_DSATEST            := [-.crypto.dsa]
 $ T_D_RSA_TEST           := [-.crypto.rsa]
 $ T_D_EVP_TEST           := [-.crypto.evp]
+$ T_D_EVP_EXTRA_TEST     := [-.crypto.evp]
 $ T_D_IGETEST            := [-.test]
 $ T_D_JPAKETEST          := [-.crypto.jpake]
 $ T_D_SRPTEST            := [-.crypto.srp]
diff --git a/test/tests.com b/test/tests.com
index ba947be..f01d169 100644
--- a/test/tests.com
+++ b/test/tests.com
@@ -56,8 +56,8 @@ $	    tests := -
 	test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,-
 	test_enc,test_x509,test_rsa,test_crl,test_sid,-
 	test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-
-	test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,-
-	test_jpake,test_srp,test_cms,test_v3name,test_ocsp,-
+	test_ss,test_ca,test_engine,test_evp,test_evp_extra,test_ssl,test_tsa,-
+	test_ige,test_jpake,test_srp,test_cms,test_v3name,test_ocsp,-
 	test_gost2814789,test_heartbeat,test_p5_crpt2,-
 	test_constant_time
 $	endif
@@ -94,6 +94,7 @@ $	RSATEST :=		rsa_test
 $	ENGINETEST :=		enginetest
 $	GOST2814789TEST :=	gost2814789test
 $	EVPTEST :=		evp_test
+$	EVPEXTRATEST :=		evp_extra_test
 $	P5_CRPT2_TEST :=	p5_crpt2_test
 $	IGETEST :=		igetest
 $	JPAKETEST :=		jpaketest
@@ -114,6 +115,9 @@ $
 $ test_evp:
 $	mcr 'texe_dir''evptest' 'ROOT'.CRYPTO.EVP]evptests.txt
 $	return
+$ test_evp_extra:
+$	mcr 'texe_dir''evpextratest'
+$	return
 $ test_p5_crpt2:
 $	mcr 'texe_dir''p5_crpt2_test'
 $	return