10 files changed, 28 insertions, 11 deletions

diff --git a/src/lib/libssl/test/dummytest.c b/src/lib/libssl/test/dummytest.c
index f98f003ef9..5b4467e042 100644
--- a/src/lib/libssl/test/dummytest.c
+++ b/src/lib/libssl/test/dummytest.c
@@ -8,7 +8,7 @@
 
 int main(int argc, char *argv[])
         {
-        char *p, *q, *program;
+        char *p, *q = 0, *program;
 
         p = strrchr(argv[0], '/');
         if (!p) p = strrchr(argv[0], '\\');
@@ -34,7 +34,8 @@ int main(int argc, char *argv[])
                 }
 
         for(p = program; *p; p++)
-                if (islower(*p)) *p = toupper(*p);
+                if (islower((unsigned char)(*p)))
+                        *p = toupper((unsigned char)(*p));
 
         q = strstr(program, "TEST");
         if (q > p && q[-1] == '_') q--;
diff --git a/src/lib/libssl/test/maketests.com b/src/lib/libssl/test/maketests.com
index b3bf8bb837..91e859deab 100644
--- a/src/lib/libssl/test/maketests.com
+++ b/src/lib/libssl/test/maketests.com
@@ -887,7 +887,7 @@ $   CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
 $!
 $!  Show user the result
 $!
-$   WRITE SYS$OUTPUT "Main Compiling Command: ",CC
+$   WRITE/SYMBOL SYS$OUTPUT "Main Compiling Command: ",CC
 $!
 $!  Else The User Entered An Invalid Arguement.
 $!
diff --git a/src/lib/libssl/test/tcrl.com b/src/lib/libssl/test/tcrl.com
index 2e6ab2814d..86bf9735aa 100644
--- a/src/lib/libssl/test/tcrl.com
+++ b/src/lib/libssl/test/tcrl.com
@@ -13,7 +13,9 @@ $	write sys$output "testing CRL conversions"
 $       if f$search("fff.*") .nes "" then delete fff.*;*
 $       if f$search("ff.*") .nes "" then delete ff.*;*
 $       if f$search("f.*") .nes "" then delete f.*;*
-$       copy 't' fff.p
+$       convert/fdl=sys$input: 't' fff.p
+RECORD
+        FORMAT STREAM_LF
 $
 $       write sys$output "p -> d"
 $       'cmd' -in fff.p -inform p -outform d -out f.d
diff --git a/src/lib/libssl/test/testenc.com b/src/lib/libssl/test/testenc.com
index 3b66f2e0d0..c24fa388c0 100644
--- a/src/lib/libssl/test/testenc.com
+++ b/src/lib/libssl/test/testenc.com
@@ -9,7 +9,9 @@ $	test := p.txt
 $       cmd := mcr 'exe_dir'openssl
 $
 $       if f$search(test) .nes. "" then delete 'test';*
-$       copy 'testsrc' 'test'
+$       convert/fdl=sys$input: 'testsrc' 'test'
+RECORD
+        FORMAT STREAM_LF
 $
 $       if f$search(test+"-cipher") .nes. "" then delete 'test'-cipher;*
 $       if f$search(test+"-clear") .nes. "" then delete 'test'-clear;*
diff --git a/src/lib/libssl/test/tpkcs7.com b/src/lib/libssl/test/tpkcs7.com
index 9e345937c6..047834fba4 100644
--- a/src/lib/libssl/test/tpkcs7.com
+++ b/src/lib/libssl/test/tpkcs7.com
@@ -13,7 +13,9 @@ $	write sys$output "testing PKCS7 conversions"
 $       if f$search("fff.*") .nes "" then delete fff.*;*
 $       if f$search("ff.*") .nes "" then delete ff.*;*
 $       if f$search("f.*") .nes "" then delete f.*;*
-$       copy 't' fff.p
+$       convert/fdl=sys$input: 't' fff.p
+RECORD
+        FORMAT STREAM_LF
 $
 $       write sys$output "p -> d"
 $       'cmd' -in fff.p -inform p -outform d -out f.d
diff --git a/src/lib/libssl/test/tpkcs7d.com b/src/lib/libssl/test/tpkcs7d.com
index 7d4f8794a4..193bb72137 100644
--- a/src/lib/libssl/test/tpkcs7d.com
+++ b/src/lib/libssl/test/tpkcs7d.com
@@ -13,7 +13,9 @@ $	write sys$output "testing PKCS7 conversions (2)"
 $       if f$search("fff.*") .nes "" then delete fff.*;*
 $       if f$search("ff.*") .nes "" then delete ff.*;*
 $       if f$search("f.*") .nes "" then delete f.*;*
-$       copy 't' fff.p
+$       convert/fdl=sys$input: 't' fff.p
+RECORD
+        FORMAT STREAM_LF
 $
 $       write sys$output "p -> d"
 $       'cmd' -in fff.p -inform p -outform d -out f.d
diff --git a/src/lib/libssl/test/treq.com b/src/lib/libssl/test/treq.com
index 22c22c3aa9..5524e485ba 100644
--- a/src/lib/libssl/test/treq.com
+++ b/src/lib/libssl/test/treq.com
@@ -13,7 +13,9 @@ $	write sys$output "testing req conversions"
 $       if f$search("fff.*") .nes "" then delete fff.*;*
 $       if f$search("ff.*") .nes "" then delete ff.*;*
 $       if f$search("f.*") .nes "" then delete f.*;*
-$       copy 't' fff.p
+$       convert/fdl=sys$input: 't' fff.p
+RECORD
+        FORMAT STREAM_LF
 $
 $       write sys$output "p -> d"
 $       'cmd' -in fff.p -inform p -outform d -out f.d
diff --git a/src/lib/libssl/test/trsa.com b/src/lib/libssl/test/trsa.com
index 6b6c318e2b..6dbe59ef64 100644
--- a/src/lib/libssl/test/trsa.com
+++ b/src/lib/libssl/test/trsa.com
@@ -24,7 +24,9 @@ $	write sys$output "testing RSA conversions"
 $       if f$search("fff.*") .nes "" then delete fff.*;*
 $       if f$search("ff.*") .nes "" then delete ff.*;*
 $       if f$search("f.*") .nes "" then delete f.*;*
-$       copy 't' fff.p
+$       convert/fdl=sys$input: 't' fff.p
+RECORD
+        FORMAT STREAM_LF
 $
 $       write sys$output "p -> d"
 $       'cmd' -in fff.p -inform p -outform d -out f.d
diff --git a/src/lib/libssl/test/tsid.com b/src/lib/libssl/test/tsid.com
index bde23f9bb9..abd1d4d737 100644
--- a/src/lib/libssl/test/tsid.com
+++ b/src/lib/libssl/test/tsid.com
@@ -13,7 +13,9 @@ $	write sys$output "testing session-id conversions"
 $       if f$search("fff.*") .nes "" then delete fff.*;*
 $       if f$search("ff.*") .nes "" then delete ff.*;*
 $       if f$search("f.*") .nes "" then delete f.*;*
-$       copy 't' fff.p
+$       convert/fdl=sys$input: 't' fff.p
+RECORD
+        FORMAT STREAM_LF
 $
 $       write sys$output "p -> d"
 $       'cmd' -in fff.p -inform p -outform d -out f.d
diff --git a/src/lib/libssl/test/tx509.com b/src/lib/libssl/test/tx509.com
index 985969c566..7b2592f773 100644
--- a/src/lib/libssl/test/tx509.com
+++ b/src/lib/libssl/test/tx509.com
@@ -13,7 +13,9 @@ $	write sys$output "testing X509 conversions"
 $       if f$search("fff.*") .nes "" then delete fff.*;*
 $       if f$search("ff.*") .nes "" then delete ff.*;*
 $       if f$search("f.*") .nes "" then delete f.*;*
-$       copy 't' fff.p
+$       convert/fdl=sys$input: 't' fff.p
+RECORD
+        FORMAT STREAM_LF
 $
 $       write sys$output "p -> d"
 $       'cmd' -in fff.p -inform p -outform d -out f.d