Refactor file writing - arrange for use of bundled Perl modules as fallback

[openssl.git] / makevms.com

diff --git a/makevms.com b/makevms.com
index 37efdc804111fe83a552e0ca86b7b87937001a32..ed0ac0486039d6c27495e96e82d5779bc5406ef9 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -240,7 +240,7 @@ $ WRITE H_FILE "#endif"
 $
 $!
 $! Defined the full SDIRS here.  It will be pruned depending on configuration.
-$! This is an exact copy of what's found in Makefile.org, with spaces replaced
+$! This is an exact copy of what's found in Makefile.in, with spaces replaced
 $! with commas.
 $!
 $ SDIRS := -
@@ -292,8 +292,11 @@ $ CONFIG_LOGICALS := AES,-
                     RC2,-
                     RC4,-
                     RC5,-
+                    RFC3779,-
                     RMD160,-
                     RSA,-
+                    SCT,-
+                     SCRYPT,-
                     SCTP,-
                     SEED,-
                     SOCK,-
@@ -304,7 +307,6 @@ $ CONFIG_LOGICALS := AES,-
                     STATIC_ENGINE,-
                     STDIO,-
                     STORE,-
-                    TLSEXT,-
                     UNIT_TEST,-
                     WHIRLPOOL
 $ CONFIG_EXPERIMENTAL := JPAKE,-
@@ -332,11 +334,9 @@ $ CONFIG_DISABLE_RULES := RIJNDAEL/AES;-
                          SHA/SSL3,TLS1;-
                          RSA,DSA/SSL3,TLS1;-
                          DH/SSL3,TLS1;-
-                         TLS1/TLSEXT;-
                          EC/GOST;-
                          DSA/GOST;-
                          DH/GOST;-
-                         TLSEXT/SRP,HEARTBEAT;-
                          /STATIC_ENGINE;-
                          /DEPRECATED;-
                          /EC_NISTP_64_GCC_128;-
@@ -585,8 +585,8 @@ $   WRITE H_FILE "#define RC4_CHUNK unsigned long long"
 $   WRITE H_FILE "#endif"
 $!
 $   WRITE H_FILE "#if defined(HEADER_DES_LOCL_H)"
-$   WRITE H_FILE "#undef DES_LONG"
-$   WRITE H_FILE "#define DES_LONG unsigned int"
+$   WRITE H_FILE "#undef OSSL_DES_LONG"
+$   WRITE H_FILE "#define OSSL_DES_LONG unsigned int"
 $   WRITE H_FILE "#undef DES_PTR"
 $   WRITE H_FILE "#define DES_PTR"
 $   WRITE H_FILE "#undef DES_RISC1"
@@ -622,8 +622,8 @@ $   WRITE H_FILE "#define RC4_CHUNK unsigned long"
 $   WRITE H_FILE "#endif"
 $!
 $   WRITE H_FILE "#if defined(HEADER_DES_LOCL_H)"
-$   WRITE H_FILE "#undef DES_LONG"
-$   WRITE H_FILE "#define DES_LONG unsigned long"
+$   WRITE H_FILE "#undef OSSL_DES_LONG"
+$   WRITE H_FILE "#define OSSL_DES_LONG unsigned long"
 $   WRITE H_FILE "#undef DES_PTR"
 $   WRITE H_FILE "#define DES_PTR"
 $   WRITE H_FILE "#undef DES_RISC1"