Keep file references in the VMS build files in the same order as they

are in the Unix Makefiles, and add SRP tests.

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index f437dc41147a065feefbae07a1d93e8f153c7a13..a4dffe9160f636005b821c5071aae95f05de8c03 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -228,7 +228,7 @@ $ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64"
 $ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ -
        "cmll_cfb,cmll_ctr"
 $ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb"
-$ LIB_MODES = "cbc128,ctr128,cfb128,ofb128,cts128"
+$ LIB_MODES = "cbc128,ctr128,cts128,cfb128,ofb128"
 $ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"
 $ IF F$TRNLNM("OPENSSL_NO_ASM") .OR. ARCH .NES. "VAX" THEN -
      LIB_BN_ASM = "bn_asm"

diff --git a/makevms.com b/makevms.com
index bcffb69c42f9a9d1dfb626af39f4afb50f07528e..2800760c670b3b87aeabdd8f74c194f9fa1ba986 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -292,6 +292,7 @@ $ CONFIG_LOGICALS := AES,-
                     SHA256,-
                     SHA512,-
                     SOCK,-
+                    SRP,-
                     SSL2,-
                     STACK,-
                     STATIC_ENGINE,-
@@ -740,7 +741,7 @@ $ EXHEADER_LHASH := lhash.h
 $ EXHEADER_RAND := rand.h
 $ EXHEADER_ERR := err.h
 $ EXHEADER_EVP := evp.h
-$ EXHEADER_ASN1 := asn1.h, asn1t.h, asn1_mac.h
+$ EXHEADER_ASN1 := asn1.h, asn1_mac.h, asn1t.h
 $ EXHEADER_PEM := pem.h, pem2.h
 $ EXHEADER_X509 := x509.h, x509_vfy.h
 $ EXHEADER_X509V3 := x509v3.h
@@ -773,7 +774,8 @@ $ loop_sdirs_end:
 $!
 $! Copy All The ".H" Files From The [.SSL] Directory.
 $!
-$ EXHEADER := dtls1.h, kssl.h, ssl.h, ssl2.h, ssl23.h, ssl3.h, tls1.h
+$! (keep these in the same order as ssl/Makefile)
+$ EXHEADER := ssl.h, ssl2.h, ssl3.h, ssl23.h, tls1.h, dtls1.h, kssl.h
 $ copy sys$disk:[.ssl]'exheader' sys$disk:[.include.openssl]
 $!
 $! Purge the [.include.openssl] header files.

diff --git a/test/maketests.com b/test/maketests.com
index 1afeb4dd244d44cea02c3bd11d6a1e75be43e681..e4e5d3349514a78d5e9acbfe00edc89a49d15890 100644 (file)
--- a/test/maketests.com
+++ b/test/maketests.com
@@ -142,7 +142,8 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ -
               "MDC2TEST,RMDTEST,"+ -
               "RANDTEST,DHTEST,ENGINETEST,"+ -
               "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ -
-              "EVP_TEST,IGETEST,JPAKETEST,ASN1TEST"
+              "EVP_TEST,IGETEST,JPAKETEST,SRPTEST,"+ -
+              "ASN1TEST"
 $! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well?
 $!
 $! Additional directory information.
@@ -178,6 +179,7 @@ $ T_D_RSA_TEST   := [-.crypto.rsa]
 $ T_D_EVP_TEST   := [-.crypto.evp]
 $ T_D_IGETEST    := [-.test]
 $ T_D_JPAKETEST  := [-.crypto.jpake]
+$ T_D_SRPTEST    := [-.crypto.srp]
 $ T_D_ASN1TEST   := [-.test]
 $!
 $ TCPIP_PROGRAMS = ",,"

diff --git a/test/tests.com b/test/tests.com
index 373dd16eacbadff846a8ec9c939a5036511a0b26..257fb8ad5ee25641528894d1aa3f340a23496a31 100644 (file)
--- a/test/tests.com
+++ b/test/tests.com
@@ -56,7 +56,7 @@ $         tests := -
        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_cms
+       test_jpake,test_srp,test_cms
 $      endif
 $      tests = f$edit(tests,"COLLAPSE")
 $
@@ -91,6 +91,7 @@ $     ENGINETEST :=   enginetest
 $      EVPTEST :=      evp_test
 $      IGETEST :=      igetest
 $      JPAKETEST :=    jpaketest
+$      SRPTEST :=      srptest
 $      ASN1TEST :=     asn1test
 $!
 $      tests_i = 0
@@ -357,6 +358,10 @@ $  ! Define the logical name used to find openssl.exe in the perl script.
 $      define /user_mode osslx 'exe_dir'
 $      perl CMS-TEST.PL
 $      return
+$ test_srp: 
+$      write sys$output "Test SRP"
+$      mcr 'texe_dir''srptest'
+$      return
 $
 $
 $ exit: