merge with openssl-0.9.7-stable-SNAP-20020911,

new minor for libcrypto (_X509_REQ_print_ex)
tested by miod@, pb@

10 files changed, 26 insertions, 10 deletions

diff --git a/lib/libssl/src/test/Makefile.ssl b/lib/libssl/src/test/Makefile.ssl
index c1408021baf..f489332a653 100644
--- a/lib/libssl/src/test/Makefile.ssl
+++ b/lib/libssl/src/test/Makefile.ssl
@@ -224,7 +224,7 @@ test_ec:
 test_verify:
 	@echo "The following command should have some OK's and some failures"
 	@echo "There are definitly a few expired certificates"
-	../apps/openssl verify -CApath ../certs ../certs/*.pem
+	-../apps/openssl verify -CApath ../certs ../certs/*.pem
 
 test_dh:
 	@echo "Generate a set of DH parameters"
diff --git a/lib/libssl/src/test/maketests.com b/lib/libssl/src/test/maketests.com
index b3bf8bb837d..91e859deabe 100644
--- a/lib/libssl/src/test/maketests.com
+++ b/lib/libssl/src/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/lib/libssl/src/test/tcrl.com b/lib/libssl/src/test/tcrl.com
index 2e6ab2814d8..86bf9735aa6 100644
--- a/lib/libssl/src/test/tcrl.com
+++ b/lib/libssl/src/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/lib/libssl/src/test/testenc.com b/lib/libssl/src/test/testenc.com
index 3b66f2e0d06..c24fa388c06 100644
--- a/lib/libssl/src/test/testenc.com
+++ b/lib/libssl/src/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/lib/libssl/src/test/tpkcs7.com b/lib/libssl/src/test/tpkcs7.com
index 9e345937c6e..047834fba42 100644
--- a/lib/libssl/src/test/tpkcs7.com
+++ b/lib/libssl/src/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/lib/libssl/src/test/tpkcs7d.com b/lib/libssl/src/test/tpkcs7d.com
index 7d4f8794a4c..193bb72137e 100644
--- a/lib/libssl/src/test/tpkcs7d.com
+++ b/lib/libssl/src/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/lib/libssl/src/test/treq.com b/lib/libssl/src/test/treq.com
index 22c22c3aa9e..5524e485ba3 100644
--- a/lib/libssl/src/test/treq.com
+++ b/lib/libssl/src/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/lib/libssl/src/test/trsa.com b/lib/libssl/src/test/trsa.com
index 6b6c318e2b5..6dbe59ef644 100644
--- a/lib/libssl/src/test/trsa.com
+++ b/lib/libssl/src/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/lib/libssl/src/test/tsid.com b/lib/libssl/src/test/tsid.com
index bde23f9bb97..abd1d4d7376 100644
--- a/lib/libssl/src/test/tsid.com
+++ b/lib/libssl/src/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/lib/libssl/src/test/tx509.com b/lib/libssl/src/test/tx509.com
index 985969c566f..7b2592f7732 100644
--- a/lib/libssl/src/test/tx509.com
+++ b/lib/libssl/src/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