VMS fixups for 1.0.2
authorRichard Levitte <levitte@openssl.org>
Wed, 7 Jan 2015 01:15:35 +0000 (02:15 +0100)
committerRichard Levitte <levitte@openssl.org>
Wed, 7 Jan 2015 01:15:35 +0000 (02:15 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
makevms.com
ssl/ssl-lib.com
test/cms-test.pl

index f1183ef..9624ef2 100755 (executable)
@@ -651,9 +651,10 @@ $   if (CFLAGS .nes. "") then CFLAGS = CFLAGS+ " "
 $   CFLAGS = CFLAGS+ "/DEFINE=ZLIB"
 $ endif
 $! 
-$ WRITE H_FILE "#define CFLAGS ""''CFLAGS'"""
-$ WRITE H_FILE "#define PLATFORM ""VMS ''ARCHD' ''VMS_VERSION'"""
-$ WRITE H_FILE "#define DATE ""''TIME'"" "
+$ WRITE H_FILE "#define CFLAGS"
+$ WRITE H_FILE "static const char cflags[] = ""compiler: ''CFLAGS'"";"
+$ WRITE H_FILE "#define PLATFORM ""platform: VMS ''ARCHD' ''VMS_VERSION'"""
+$ WRITE H_FILE "#define DATE ""built on: ''TIME'"" "
 $!
 $! Close The [.CRYPTO._xxx]BUILDINF.H File.
 $!
index 31ebb6b..43fea17 100644 (file)
@@ -218,7 +218,7 @@ $ LIB_SSL = "s2_meth, s2_srvr, s2_clnt, s2_lib, s2_enc, s2_pkt,"+ -
            "s23_meth,s23_srvr,s23_clnt,s23_lib,        s23_pkt,"+ -
            "t1_meth, t1_srvr, t1_clnt, t1_lib, t1_enc, t1_ext,"+ -
            "d1_meth, d1_srvr, d1_clnt, d1_lib, d1_pkt,"+ -
-           "d1_both,d1_enc,d1_srtp,"+ -
+           "d1_both,d1_srtp,"+ -
            "ssl_lib,ssl_err2,ssl_cert,ssl_sess,"+ -
            "ssl_ciph,ssl_stat,ssl_rsa,"+ -
            "ssl_asn1,ssl_txt,ssl_algs,ssl_conf,"+ -
index acd9315..f55fd69 100644 (file)
@@ -106,7 +106,7 @@ else
        die "Error checking for EC support\n";
        }
     
-system ("$ossl_path no-ec2m >/dev/null");
+system ("$ossl_path no-ec2m > $null_path");
 if ($? == 0)
        {
        $no_ec2m = 1;
@@ -120,7 +120,7 @@ else
        die "Error checking for EC2M support\n";
        }
 
-system ("$ossl_path no-ecdh >/dev/null");
+system ("$ossl_path no-ecdh > $null_path");
 if ($? == 0)
        {
        $no_ecdh = 1;