Commit 6525ced5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Let VMS catch up.

parent 32d0ad41

crypto/crypto-lib.com

+4 −30
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ $ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey" 
$ LIB_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64"

$ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64"

$ LIB_BN_ASM = "[.asm]vms.mar,vms-helper"

$ IF F$TRNLNM("OPENSSL_NO_ASM").OR.ARCH.EQS."AXP" THEN LIB_BN_ASM = "bn_asm"

$ IF F$TRNLNM("OPENSSL_NO_ASM") THEN LIB_BN_ASM = "bn_asm"

$ LIB_BN = "bn_add,bn_div,bn_exp,bn_lib,bn_ctx,bn_mul,bn_mod,"+ -

	"bn_print,bn_rand,bn_shift,bn_word,bn_blind,"+ -

	"bn_kron,bn_sqrt,bn_gcd,bn_prime,bn_err,bn_sqr,"+LIB_BN_ASM+","+ -
@@ -237,12 +237,10 @@ $ LIB_ASN1 = "a_object,a_bitstr,a_utctm,a_gentm,a_time,a_int,a_octet,"+ - 
	"a_print,a_type,a_set,a_dup,a_d2i_fp,a_i2d_fp,"+ -

	"a_enum,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_bignum,"+ -

	"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,"+ -

	"d2i_s_pr,i2d_s_pr,d2i_s_pu,i2d_s_pu,"+ -

	"x_long,x_name,x_x509,x_x509a,x_crl,x_info,x_spki,nsseq,"+ -

	"d2i_pu,d2i_pr,i2d_pu,i2d_pr"

$ LIB_ASN1_2 = "t_req,t_x509,t_x509a,t_crl,t_pkey,t_spki,t_bitst,"+ -

	"tasn_new,tasn_free,tasn_enc,tasn_dec,tasn_utl,tasn_typ,"+ -

	"tasn_new,tasn_fre,tasn_enc,tasn_dec,tasn_utl,tasn_typ,"+ -

	"f_int,f_string,n_pkey,"+ -

	"f_enum,a_hdr,x_pkey,a_bool,x_exten,"+ -

	"asn1_par,asn1_lib,asn1_err,a_meth,a_bytes,a_strnid,"+ -
@@ -1147,31 +1145,7 @@ $ ENDIF 
$!

$! Set Up Initial CC Definitions, Possibly With User Ones

$!

$ CCDEFS = "VMS=1,TCPIP_TYPE_''P5',DSO_VMS"

$ IF F$TRNLNM("OPENSSL_NO_ASM") THEN CCDEFS = CCDEFS + ",NO_ASM"

$ IF F$TRNLNM("OPENSSL_NO_RSA") THEN CCDEFS = CCDEFS + ",NO_RSA"

$ IF F$TRNLNM("OPENSSL_NO_DSA") THEN CCDEFS = CCDEFS + ",NO_DSA"

$ IF F$TRNLNM("OPENSSL_NO_DH") THEN CCDEFS = CCDEFS + ",NO_DH"

$ IF F$TRNLNM("OPENSSL_NO_MD2") THEN CCDEFS = CCDEFS + ",NO_MD2"

$ IF F$TRNLNM("OPENSSL_NO_MD5") THEN CCDEFS = CCDEFS + ",NO_MD5"

$ IF F$TRNLNM("OPENSSL_NO_RIPEMD") THEN CCDEFS = CCDEFS + ",NO_RIPEMD"

$ IF F$TRNLNM("OPENSSL_NO_SHA") THEN CCDEFS = CCDEFS + ",NO_SHA"

$ IF F$TRNLNM("OPENSSL_NO_SHA0") THEN CCDEFS = CCDEFS + ",NO_SHA0"

$ IF F$TRNLNM("OPENSSL_NO_SHA1") THEN CCDEFS = CCDEFS + ",NO_SHA1"

$ IF F$TRNLNM("OPENSSL_NO_DES")

$ THEN

$   CCDEFS = CCDEFS + ",NO_DES,NO_MDC2"

$ ELSE

$   IF F$TRNLNM("OPENSSL_NO_MDC2") THEN CCDEFS = CCDEFS + ",NO_MDC2"

$ ENDIF

$ IF F$TRNLNM("OPENSSL_NO_RC2") THEN CCDEFS = CCDEFS + ",NO_RC2"

$ IF F$TRNLNM("OPENSSL_NO_RC4") THEN CCDEFS = CCDEFS + ",NO_RC4"

$ IF F$TRNLNM("OPENSSL_NO_RC5") THEN CCDEFS = CCDEFS + ",NO_RC5"

$ IF F$TRNLNM("OPENSSL_NO_IDEA") THEN CCDEFS = CCDEFS + ",NO_IDEA"

$ IF F$TRNLNM("OPENSSL_NO_BF") THEN CCDEFS = CCDEFS + ",NO_BF"

$ IF F$TRNLNM("OPENSSL_NO_CAST") THEN CCDEFS = CCDEFS + ",NO_CAST"

$ IF F$TRNLNM("OPENSSL_NO_HMAC") THEN CCDEFS = CCDEFS + ",NO_HMAC"

$ IF F$TRNLNM("OPENSSL_NO_SSL2") THEN CCDEFS = CCDEFS + ",NO_SSL2"

$ CCDEFS = "TCPIP_TYPE_''P5',DSO_VMS"

$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS

$ CCEXTRAFLAGS = ""

$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS

crypto/install.com

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ $ SDIRS := ,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,- 
		 DES,RC2,RC4,RC5,IDEA,BF,CAST,-

		 BN,RSA,DSA,DH,DSO,ENGINE,RIJNDAEL,-

		 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,OCSP

$	EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h

$	EXHEADER_MD2 := md2.h

$	EXHEADER_MD4 := md4.h
@@ -76,6 +76,7 @@ $ EXHEADER_TXT_DB := txt_db.h 
$	EXHEADER_PKCS7 := pkcs7.h

$	EXHEADER_PKCS12 := pkcs12.h

$	EXHEADER_COMP := comp.h

$	EXHEADER_OCSP := ocsp.h

$	LIBS := LIBCRYPTO

$

$	VEXE_DIR := [-.VAX.EXE.CRYPTO]

makevms.com

+55 −2
Original line number Diff line number Diff line
@@ -187,6 +187,59 @@ $! 
$ WRITE H_FILE "/* This file was automatically built using makevms.com */"

$ WRITE H_FILE "/* and [.CRYPTO]OPENSSLCONF.H_IN */"

$

$!

$! Write a few macros that indicate how this system was built.

$!

$ WRITE H_FILE ""

$ WRITE H_FILE "#ifndef OPENSSL_SYS_VMS"

$ WRITE H_FILE "# define OPENSSL_SYS_VMS"

$ WRITE H_FILE "#endif"

$ CONFIG_LOGICALS := NO_ASM,NO_RSA,NO_DSA,NO_DH,NO_MD2,NO_MD5,NO_RIPEMD,-

	NO_SHA,NO_SHA0,NO_SHA1,NO_DES/NO_MDC2;NO_MDC2,NO_RC2,NO_RC4,NO_RC5,-

	NO_IDEA,NO_BF,NO_CAST,NO_HMAC,NO_SSL2

$ CONFIG_LOG_I = 0

$ CONFIG_LOG_LOOP:

$   CONFIG_LOG_E1 = F$ELEMENT(CONFIG_LOG_I,",",CONFIG_LOGICALS)

$   CONFIG_LOG_I = CONFIG_LOG_I + 1

$   IF CONFIG_LOG_E1 .EQS. "" THEN GOTO CONFIG_LOG_LOOP

$   IF CONFIG_LOG_E1 .EQS. "," THEN GOTO CONFIG_LOG_LOOP_END

$   CONFIG_LOG_E2 = F$EDIT(CONFIG_LOG_E1,"TRIM")

$   CONFIG_LOG_E1 = F$ELEMENT(0,";",CONFIG_LOG_E2)

$   CONFIG_LOG_E2 = F$ELEMENT(1,";",CONFIG_LOG_E2)

$   CONFIG_LOG_E0 = F$ELEMENT(0,"/",CONFIG_LOG_E1)

$   CONFIG_LOG_E1 = F$ELEMENT(1,"/",CONFIG_LOG_E1)

$   IF F$TRNLNM("OPENSSL_"+CONFIG_LOG_E0)

$   THEN

$     WRITE H_FILE "#ifndef OPENSSL_",CONFIG_LOG_E0

$     WRITE H_FILE "# define OPENSSL_",CONFIG_LOG_E0

$     WRITE H_FILE "#endif"

$     IF CONFIG_LOG_E1 .NES. "/"

$     THEN

$       WRITE H_FILE "#ifndef OPENSSL_",CONFIG_LOG_E1

$       WRITE H_FILE "# define OPENSSL_",CONFIG_LOG_E1

$       WRITE H_FILE "#endif"

$     ENDIF

$   ELSE

$     IF CONFIG_LOG_E2 .NES. ";"

$     THEN

$       IF F$TRNLNM("OPENSSL_"+CONFIG_LOG_E2)

$       THEN

$         WRITE H_FILE "#ifndef OPENSSL_",CONFIG_LOG_E2

$         WRITE H_FILE "# define OPENSSL_",CONFIG_LOG_E2

$         WRITE H_FILE "#endif"

$       ENDIF

$     ENDIF

$   ENDIF

$   GOTO CONFIG_LOG_LOOP

$ CONFIG_LOG_LOOP_END:

$ WRITE H_FILE "#ifndef OPENSSL_THREADS"

$ WRITE H_FILE "# define OPENSSL_THREADS"

$ WRITE H_FILE "#endif"

$ WRITE H_FILE "#ifndef OPENSSL_NO_KRB5"

$ WRITE H_FILE "# define OPENSSL_NO_KRB5"

$ WRITE H_FILE "#endif"

$ WRITE H_FILE ""

$!

$! Different tar version may have named the file differently

$ IF F$SEARCH("[.CRYPTO]OPENSSLCONF.H_IN") .NES. ""

$ THEN
@@ -200,7 +253,6 @@ $ WRITE SYS$ERROR "Couldn't find a [.CRYPTO]OPENSSLCONF.H_IN. Exiting!" 
$     EXIT 0

$   ENDIF

$ ENDIF

$!

$ IF ARCH .EQS. "AXP"

$ THEN

$!
@@ -367,7 +419,7 @@ $ SDIRS := ,MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,- 
   DES,RC2,RC4,RC5,IDEA,BF,CAST,-

   BN,RSA,DSA,DH,DSO,ENGINE,RIJNDAEL,-

   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,OCSP

$ EXHEADER_ := crypto.h,tmdiff.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h

$ EXHEADER_MD2 := md2.h

$ EXHEADER_MD4 := md4.h
@@ -407,6 +459,7 @@ $ EXHEADER_TXT_DB := txt_db.h 
$ EXHEADER_PKCS7 := pkcs7.h

$ EXHEADER_PKCS12 := pkcs12.h

$ EXHEADER_COMP := comp.h

$ EXHEADER_OCSP := ocsp.h

$

$ I = 0

$ LOOP_SDIRS:

ssl/ssl-lib.com

+1 −26
Original line number Diff line number Diff line
@@ -897,32 +897,7 @@ $ ENDIF 
$!

$! Set Up Initial CC Definitions, Possibly With User Ones

$!

$ CCDEFS = "VMS=1,TCPIP_TYPE_''P5'"

$ IF F$TRNLNM("OPENSSL_NO_KRB5") .OR. 1 THEN CCDEFS = CCDEFS + ",NO_KRB5"

$ IF F$TRNLNM("OPENSSL_NO_ASM") THEN CCDEFS = CCDEFS + ",NO_ASM"

$ IF F$TRNLNM("OPENSSL_NO_RSA") THEN CCDEFS = CCDEFS + ",NO_RSA"

$ IF F$TRNLNM("OPENSSL_NO_DSA") THEN CCDEFS = CCDEFS + ",NO_DSA"

$ IF F$TRNLNM("OPENSSL_NO_DH") THEN CCDEFS = CCDEFS + ",NO_DH"

$ IF F$TRNLNM("OPENSSL_NO_MD2") THEN CCDEFS = CCDEFS + ",NO_MD2"

$ IF F$TRNLNM("OPENSSL_NO_MD5") THEN CCDEFS = CCDEFS + ",NO_MD5"

$ IF F$TRNLNM("OPENSSL_NO_RIPEMD") THEN CCDEFS = CCDEFS + ",NO_RIPEMD"

$ IF F$TRNLNM("OPENSSL_NO_SHA") THEN CCDEFS = CCDEFS + ",NO_SHA"

$ IF F$TRNLNM("OPENSSL_NO_SHA0") THEN CCDEFS = CCDEFS + ",NO_SHA0"

$ IF F$TRNLNM("OPENSSL_NO_SHA1") THEN CCDEFS = CCDEFS + ",NO_SHA1"

$ IF F$TRNLNM("OPENSSL_NO_DES")

$ THEN

$   CCDEFS = CCDEFS + ",NO_DES,NO_MDC2"

$ ELSE

$   IF F$TRNLNM("OPENSSL_NO_MDC2") THEN CCDEFS = CCDEFS + ",NO_MDC2"

$ ENDIF

$ IF F$TRNLNM("OPENSSL_NO_RC2") THEN CCDEFS = CCDEFS + ",NO_RC2"

$ IF F$TRNLNM("OPENSSL_NO_RC4") THEN CCDEFS = CCDEFS + ",NO_RC4"

$ IF F$TRNLNM("OPENSSL_NO_RC5") THEN CCDEFS = CCDEFS + ",NO_RC5"

$ IF F$TRNLNM("OPENSSL_NO_IDEA") THEN CCDEFS = CCDEFS + ",NO_IDEA"

$ IF F$TRNLNM("OPENSSL_NO_BF") THEN CCDEFS = CCDEFS + ",NO_BF"

$ IF F$TRNLNM("OPENSSL_NO_CAST") THEN CCDEFS = CCDEFS + ",NO_CAST"

$ IF F$TRNLNM("OPENSSL_NO_HMAC") THEN CCDEFS = CCDEFS + ",NO_HMAC"

$ IF F$TRNLNM("OPENSSL_NO_SSL2") THEN CCDEFS = CCDEFS + ",NO_SSL2"

$ CCDEFS = "TCPIP_TYPE_''P5'"

$ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS

$ CCEXTRAFLAGS = ""

$ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS