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@openssl.org>
This commit is contained in:
Richard Levitte 2015-03-05 18:19:06 +01:00
parent 31c2b6ee7a
commit cdca82dcde
3 changed files with 12 additions and 6 deletions

View File

@ -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,"+ - $ 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_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_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,"+ - "pcy_cache,pcy_node,pcy_data,pcy_map,pcy_tree,pcy_lib,"+ -
"v3_asid,v3_addr,v3_scts" "v3_asid,v3_addr,v3_scts"
$ LIB_CONF = "conf_err,conf_lib,conf_api,conf_def,conf_mod,conf_mall,conf_sap" $ 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,"+ - $ LIB_COMP = "comp_lib,comp_err,"+ -
"c_rle,c_zlib" "c_rle,c_zlib"
$ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ - $ 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_UI = "ui_err,ui_lib,ui_openssl,ui_util"
$ LIB_KRB5 = "krb5_asn" $ LIB_KRB5 = "krb5_asn"
$ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ - $ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -

View File

@ -148,8 +148,9 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
"GOST2814789TEST,"+ - "GOST2814789TEST,"+ -
"BFTEST,CASTTEST,SSLTEST,"+ - "BFTEST,CASTTEST,SSLTEST,"+ -
"EXPTEST,DSATEST,RSA_TEST,"+ - "EXPTEST,DSATEST,RSA_TEST,"+ -
"EVP_TEST,IGETEST,JPAKETEST,SRPTEST,"+ - "EVP_TEST,EVP_EXTRA_TEST,IGETEST,"+ -
"V3NAMETEST,HEARTBEAT_TEST,P5_CRPT2_TEST,"+ - "JPAKETEST,SRPTEST,V3NAMETEST,"+ -
"HEARTBEAT_TEST,P5_CRPT2_TEST,"+ -
"CONSTANT_TIME_TEST" "CONSTANT_TIME_TEST"
$! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well? $! 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_DSATEST := [-.crypto.dsa]
$ T_D_RSA_TEST := [-.crypto.rsa] $ T_D_RSA_TEST := [-.crypto.rsa]
$ T_D_EVP_TEST := [-.crypto.evp] $ T_D_EVP_TEST := [-.crypto.evp]
$ T_D_EVP_EXTRA_TEST := [-.crypto.evp]
$ T_D_IGETEST := [-.test] $ T_D_IGETEST := [-.test]
$ T_D_JPAKETEST := [-.crypto.jpake] $ T_D_JPAKETEST := [-.crypto.jpake]
$ T_D_SRPTEST := [-.crypto.srp] $ T_D_SRPTEST := [-.crypto.srp]

View File

@ -56,8 +56,8 @@ $ tests := -
test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,- test_rand,test_bn,test_ec,test_ecdsa,test_ecdh,-
test_enc,test_x509,test_rsa,test_crl,test_sid,- test_enc,test_x509,test_rsa,test_crl,test_sid,-
test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,- 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_ss,test_ca,test_engine,test_evp,test_evp_extra,test_ssl,test_tsa,-
test_jpake,test_srp,test_cms,test_v3name,test_ocsp,- test_ige,test_jpake,test_srp,test_cms,test_v3name,test_ocsp,-
test_gost2814789,test_heartbeat,test_p5_crpt2,- test_gost2814789,test_heartbeat,test_p5_crpt2,-
test_constant_time test_constant_time
$ endif $ endif
@ -94,6 +94,7 @@ $ RSATEST := rsa_test
$ ENGINETEST := enginetest $ ENGINETEST := enginetest
$ GOST2814789TEST := gost2814789test $ GOST2814789TEST := gost2814789test
$ EVPTEST := evp_test $ EVPTEST := evp_test
$ EVPEXTRATEST := evp_extra_test
$ P5_CRPT2_TEST := p5_crpt2_test $ P5_CRPT2_TEST := p5_crpt2_test
$ IGETEST := igetest $ IGETEST := igetest
$ JPAKETEST := jpaketest $ JPAKETEST := jpaketest
@ -114,6 +115,9 @@ $
$ test_evp: $ test_evp:
$ mcr 'texe_dir''evptest' 'ROOT'.CRYPTO.EVP]evptests.txt $ mcr 'texe_dir''evptest' 'ROOT'.CRYPTO.EVP]evptests.txt
$ return $ return
$ test_evp_extra:
$ mcr 'texe_dir''evpextratest'
$ return
$ test_p5_crpt2: $ test_p5_crpt2:
$ mcr 'texe_dir''p5_crpt2_test' $ mcr 'texe_dir''p5_crpt2_test'
$ return $ return