Synchronise the VMS build with the Unix one.
authorRichard Levitte <levitte@openssl.org>
Fri, 8 Sep 2000 20:25:49 +0000 (20:25 +0000)
committerRichard Levitte <levitte@openssl.org>
Fri, 8 Sep 2000 20:25:49 +0000 (20:25 +0000)
apps/makeapps.com
crypto/crypto-lib.com
crypto/install.com
makevms.com
test/maketests.com
test/tests.com

index 94acbf8..7e9d0ac 100644 (file)
@@ -154,13 +154,13 @@ $! Define The Application Files.
 $!
 $ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
              "CA;PKCS7;CRL2P7;CRL;"+-
-             "RSA;DSA;DSAPARAM;"+-
+             "RSA;RSAUTL;DSA;DSAPARAM;"+-
              "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
              "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
              "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND"
 $ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,-
               CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,-
-              RSA.OBJ,DSA.OBJ,DSAPARAM.OBJ,-
+              RSA.OBJ,RSAUTL.OBJ,DSA.OBJ,DSAPARAM.OBJ,-
               X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
               S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,-
               CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ
index 031d7f0..024474d 100644 (file)
@@ -204,7 +204,7 @@ $ LIB_RSA = "rsa_eay,rsa_gen,rsa_lib,rsa_sign,rsa_saos,rsa_err,"+ -
        "rsa_pk1,rsa_ssl,rsa_none,rsa_oaep,rsa_chk,rsa_null"
 $ LIB_DSA = "dsa_gen,dsa_key,dsa_lib,dsa_asn1,dsa_vrf,dsa_sign,dsa_err,dsa_ossl"
 $ LIB_DH = "dh_gen,dh_key,dh_lib,dh_check,dh_err"
-$ LIB_DSO = "dso_err,dso_lib,dso_null,dso_openssl,dso_vms"
+$ LIB_DSO = "dso_err,dso_lib,dso_null,dso_openssl" ! + ",dso_vms"
 $ LIB_BUFFER = "buffer,buf_err"
 $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ -
        "bss_mem,bss_null,bss_fd,"+ -
@@ -220,15 +220,15 @@ $ LIB_EVP = "encode,digest,evp_enc,evp_key,"+ -
        "e_des,e_bf,e_idea,e_des3,"+ -
        "e_rc4,names,"+ -
        "e_xcbc_d,e_rc2,e_cast,e_rc5,"
-$ LIB_EVP_2 = "m_null,m_md2,m_md5,m_sha,m_sha1,m_dss,m_dss1,m_mdc2,"+ -
-       "m_ripemd,"+ -
+$ LIB_EVP_2 = "m_null,m_md2,m_md4,m_md5,m_sha,m_sha1," + -
+       "m_dss,m_dss1,m_mdc2,m_ripemd,"+ -
        "p_open,p_seal,p_sign,p_verify,p_lib,p_enc,p_dec,"+ -
        "bio_md,bio_b64,bio_enc,evp_err,e_null,"+ -
        "c_all,c_allc,c_alld,evp_lib,bio_ok,"+-
        "evp_pkey,evp_pbe,p5_crpt,p5_crpt2"
 $ LIB_ASN1 = "a_object,a_bitstr,a_utctm,a_gentm,a_time,a_int,a_octet,"+ -
        "a_null,a_print,a_type,a_set,a_dup,a_d2i_fp,a_i2d_fp,a_bmp,"+ -
-       "a_enum,a_vis,a_utf8,a_sign,a_digest,a_verify,a_mbstr,"+ -
+       "a_enum,a_vis,a_utf8,a_sign,a_digest,a_verify,a_mbstr,a_strex,"+ -
        "x_algor,x_val,x_pubkey,x_sig,x_req,x_attrib,"+ -
        "x_name,x_cinf,x_x509,x_x509a,x_crl,x_info,x_spki,nsseq,"+ -
        "d2i_r_pr,i2d_r_pr,d2i_r_pu,i2d_r_pu,"+ -
index b0fca36..ea97665 100644 (file)
@@ -32,14 +32,14 @@ $   IF F$PARSE("WRK_SSLALIB:") .EQS. "" THEN -
 $      IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
           CREATE/DIR/LOG WRK_SSLINCLUDE:
 $
-$      SDIRS := ,MD2,MD5,SHA,MDC2,HMAC,RIPEMD,-
+$      SDIRS := ,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,-
                 DES,RC2,RC4,RC5,IDEA,BF,CAST,-
-                BN,RSA,DSA,DH,-
+                BN,RSA,DSA,DH,DSO,ENGINE,-
                 BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,-
-                EVP,ASN1,PEM,X509,X509V3,-
-                CONF,TXT_DB,PKCS7,PKCS12,COMP
+                EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP
 $      EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h
 $      EXHEADER_MD2 := md2.h
+$      EXHEADER_MD4 := md4.h
 $      EXHEADER_MD5 := md5.h
 $      EXHEADER_SHA := sha.h
 $      EXHEADER_MDC2 := mdc2.h
@@ -56,13 +56,15 @@ $   EXHEADER_BN := bn.h
 $      EXHEADER_RSA := rsa.h
 $      EXHEADER_DSA := dsa.h
 $      EXHEADER_DH := dh.h
+$      EXHEADER_DSO := dso.h
+$      EXHEADER_ENGINE := engine.h
 $      EXHEADER_BUFFER := buffer.h
 $      EXHEADER_BIO := bio.h
 $      EXHEADER_STACK := stack.h,safestack.h
 $      EXHEADER_LHASH := lhash.h
 $      EXHEADER_RAND := rand.h
 $      EXHEADER_ERR := err.h
-$      EXHEADER_OBJECTS := objects.h
+$      EXHEADER_OBJECTS := objects.h,obj_mac.h
 $      EXHEADER_EVP := evp.h
 $      EXHEADER_ASN1 := asn1.h,asn1_mac.h
 $      EXHEADER_PEM := pem.h,pem2.h
index d0194e7..f55231e 100755 (executable)
@@ -316,7 +316,11 @@ $! Tell The User We Are Partly Rebuilding The [.TEST] Directory.
 $!
 $ WRITE SYS$OUTPUT "Rebuilding The '[.APPS]MD5.C' And '[.APPS]RMD160.C' Files."
 $!
-$ DELETE SYS$DISK:[.APPS]MD5.C;*,RMD160.C;*
+$ DELETE SYS$DISK:[.APPS]MD4.C;*,MD5.C;*,RMD160.C;*
+$!
+$! Copy MD4.C from [.CRYPTO.MD4] into [.APPS]
+$!
+$ COPY SYS$DISK:[.CRYPTO.MD4]MD4.C SYS$DISK:[.APPS]
 $!
 $! Copy MD5.C from [.CRYPTO.MD5] into [.APPS]
 $!
@@ -359,14 +363,14 @@ $ COPY 'EXHEADER' SYS$DISK:[.INCLUDE.OPENSSL]
 $!
 $! Copy All The ".H" Files From The [.CRYPTO] Directory Tree.
 $!
-$ SDIRS := ,MD2,MD5,SHA,MDC2,HMAC,RIPEMD,-
+$ SDIRS := ,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,-
    DES,RC2,RC4,RC5,IDEA,BF,CAST,-
-   BN,RSA,DSA,DH,-
+   BN,RSA,DSA,DH,DSO,ENGINE,-
    BUFFER,BIO,STACK,LHASH,RAND,ERR,OBJECTS,-
-   EVP,ASN1,PEM,X509,X509V3,-
-   CONF,TXT_DB,PKCS7,PKCS12,COMP
+   EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP
 $ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h
 $ EXHEADER_MD2 := md2.h
+$ EXHEADER_MD4 := md4.h
 $ EXHEADER_MD5 := md5.h
 $ EXHEADER_SHA := sha.h
 $ EXHEADER_MDC2 := mdc2.h
@@ -383,13 +387,15 @@ $ EXHEADER_BN := bn.h
 $ EXHEADER_RSA := rsa.h
 $ EXHEADER_DSA := dsa.h
 $ EXHEADER_DH := dh.h
+$ EXHEADER_DSO := dso.h
+$ EXHEADER_ENGINE := engine.h
 $ EXHEADER_BUFFER := buffer.h
 $ EXHEADER_BIO := bio.h
 $ EXHEADER_STACK := stack.h,safestack.h
 $ EXHEADER_LHASH := lhash.h
 $ EXHEADER_RAND := rand.h
 $ EXHEADER_ERR := err.h
-$ EXHEADER_OBJECTS := objects.h
+$ EXHEADER_OBJECTS := objects.h,obj_mac.h
 $ EXHEADER_EVP := evp.h
 $ EXHEADER_ASN1 := asn1.h,asn1_mac.h
 $ EXHEADER_PEM := pem.h,pem2.h
index 1246d9a..135e0bf 100644 (file)
@@ -143,7 +143,7 @@ $ GOSUB CHECK_OPT_FILE
 $!
 $! Define The TEST Files.
 $!
-$ TEST_FILES = "BNTEST,IDEATEST,MD2TEST,MD5TEST,HMACTEST,"+ -
+$ TEST_FILES = "BNTEST,IDEATEST,MD2TEST,MD4TEST,MD5TEST,HMACTEST,"+ -
               "RC2TEST,RC4TEST,RC5TEST,"+ -
               "DESTEST,SHATEST,SHA1TEST,MDC2TEST,RMDTEST,"+ -
               "RANDTEST,DHTEST,"+ -
index 4237b33..df8f46e 100644 (file)
@@ -19,7 +19,8 @@ $     then
 $          tests = p1
 $      else
 $          tests := -
-       test_des,test_idea,test_sha,test_md5,test_hmac,test_md2,test_mdc2,-
+       test_des,test_idea,test_sha,test_md4,test_md5,test_hmac,-
+       test_md2,test_mdc2,-
        test_rmd,test_rc2,test_rc4,test_rc5,test_bf,test_cast,-
        test_rand,test_bn,test_enc,test_x509,test_rsa,test_crl,test_sid,-
        test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,-
@@ -35,6 +36,7 @@ $     SHA1TEST :=     sha1test
 $      MDC2TEST :=     mdc2test
 $      RMDTEST :=      rmdtest
 $      MD2TEST :=      md2test
+$      MD4TEST :=      md4test
 $      MD5TEST :=      md5test
 $      HMACTEST :=     hmactest
 $      RC2TEST :=      rc2test
@@ -74,6 +76,9 @@ $     return
 $ test_md5:
 $      mcr 'texe_dir''md5test'
 $      return
+$ test_md4:
+$      mcr 'texe_dir''md4test'
+$      return
 $ test_hmac:
 $      mcr 'texe_dir''hmactest'
 $      return