From e32587d5a605f897c6683c280c792b3b21fbaa36 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 27 Sep 2001 16:07:36 +0000 Subject: [PATCH] Synchronise with Unixly build. --- crypto/crypto-lib.com | 10 +++++++--- makevms.com | 3 ++- test/maketests.com | 3 ++- test/tests.com | 6 +++++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com index 98a946e08a..7d18be777f 100644 --- a/crypto/crypto-lib.com +++ b/crypto/crypto-lib.com @@ -209,8 +209,12 @@ $ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,dsa_err,dsa_ossl" $ LIB_DH = "dh_asn1,dh_gen,dh_key,dh_lib,dh_check,dh_err" $ LIB_DSO = "dso_dl,dso_dlfcn,dso_err,dso_lib,dso_null,"+ - "dso_openssl,dso_win32,dso_vms" -$ LIB_ENGINE = "engine_err,engine_lib,engine_list,engine_all,engine_openssl,"+ - - "hw_atalla,hw_cswift,hw_ncipher,hw_nuron,hw_ubsec" +$ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ - + "eng_table,eng_pkey,eng_fat,eng_all,"+ - + "tb_rsa,tb_dsa,tb_dh,tb_rand,tb_cipher,tb_digest,"+ - + "eng_openssl,eng_dyn,"+ - + "hw_atalla,hw_cswift,hw_ncipher,hw_nuron,hw_ubsec,"+ - + "hw_openssl_dev_crypto" $ LIB_RIJNDAEL = "rd_fst" $ LIB_BUFFER = "buffer,buf_err" $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ - @@ -251,7 +255,7 @@ $ LIB_PEM = "pem_sign,pem_seal,pem_info,pem_lib,pem_all,pem_err,"+ - "pem_x509,pem_xaux,pem_oth,pem_pk8,pem_pkey" $ LIB_X509 = "x509_def,x509_d2,x509_r2x,x509_cmp,"+ - "x509_obj,x509_req,x509spki,x509_vfy,"+ - - "x509_set,x509rset,x509_err,"+ - + "x509_set,x509cset,x509rset,x509_err,"+ - "x509name,x509_v3,x509_ext,x509_att,"+ - "x509type,x509_lu,x_all,x509_txt,"+ - "x509_trs,by_file,by_dir" diff --git a/makevms.com b/makevms.com index 462ffbe726..9aa46b948d 100755 --- a/makevms.com +++ b/makevms.com @@ -425,7 +425,8 @@ $ SDIRS := ,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,- BN,EC,RSA,DSA,DH,DSO,ENGINE,RIJNDAEL,- BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,- EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI -$ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h +$ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h,- + types.h $ EXHEADER_MD2 := md2.h $ EXHEADER_MD4 := md4.h $ EXHEADER_MD5 := md5.h diff --git a/test/maketests.com b/test/maketests.com index 36905b6c29..e520775f58 100644 --- a/test/maketests.com +++ b/test/maketests.com @@ -147,7 +147,8 @@ $ TEST_FILES = "BNTEST,ECTEST,IDEATEST,MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ - "RC2TEST,RC4TEST,RC5TEST,"+ - "DESTEST,SHATEST,SHA1TEST,MDC2TEST,RMDTEST,"+ - "RANDTEST,DHTEST,ENGINETEST,"+ - - "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST" + "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST"+ - + "EVP_TEST" $ TCPIP_PROGRAMS = ",," $ IF COMPILER .EQS. "VAXC" THEN - TCPIP_PROGRAMS = ",SSLTEST," diff --git a/test/tests.com b/test/tests.com index a13c4d8e91..07a3c7f16d 100644 --- a/test/tests.com +++ b/test/tests.com @@ -24,7 +24,7 @@ $ tests := - test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,test_rd,- test_rand,test_bn,test_ec,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_ssl + test_ss,test_ca,test_engine,test_ssl,test_evp $ endif $ tests = f$edit(tests,"COLLAPSE") $ @@ -53,6 +53,7 @@ $ METHTEST := methtest $ SSLTEST := ssltest $ RSATEST := rsa_test $ ENGINETEST := enginetest +$ EVPTEST := evp_test $ $ tests_i = 0 $ loop_tests: @@ -62,6 +63,9 @@ $ if tests_e .eqs. "," then goto exit $ gosub 'tests_e' $ goto loop_tests $ +$ test_evp: +$ mcr 'texe_dir''evptest' evptests.txt +$ return $ test_des: $ mcr 'texe_dir''destest' $ return -- 2.25.1