From: Richard Levitte <levitte@openssl.org>
Date: Wed, 14 Aug 2002 14:46:03 +0000 (+0000)
Subject: Recent changes from 0.9.6-stable.
X-Git-Tag: OpenSSL-engine-0_9_6h~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3bfe3f4cbd1307fc9d4002215b544ade67a0c6e;p=openssl

Recent changes from 0.9.6-stable.
---

diff --git a/CHANGES b/CHANGES
index a18af51395..8b947b8518 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,9 @@
 
  Changes between 0.9.6g and 0.9.6h  [xx XXX xxxx]
 
-  *)
+  *) Fix typo in OBJ_txt2obj which incorrectly passed the content
+     length, instead of the encoding length to d2i_ASN1_OBJECT.
+     [Steve Henson]
 
  Changes between 0.9.6f and 0.9.6g  [9 Aug 2002]
 
diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 2ea9cd7203..03bae9b950 100644
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -413,7 +413,7 @@ int BN_mod_mul_montgomery(BIGNUM *r,BIGNUM *a,BIGNUM *b,BN_MONT_CTX *mont,
 			  BN_CTX *ctx);
 int BN_from_montgomery(BIGNUM *r,BIGNUM *a,BN_MONT_CTX *mont,BN_CTX *ctx);
 void BN_MONT_CTX_free(BN_MONT_CTX *mont);
-int BN_MONT_CTX_set(BN_MONT_CTX *mont,const BIGNUM *modulus,BN_CTX *ctx);
+int BN_MONT_CTX_set(BN_MONT_CTX *mont,const BIGNUM *mod,BN_CTX *ctx);
 BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to,BN_MONT_CTX *from);
 
 BN_BLINDING *BN_BLINDING_new(BIGNUM *A,BIGNUM *Ai,BIGNUM *mod);
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 41fdf6e7b2..76f2e05f50 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -417,7 +417,7 @@ ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name)
 	a2d_ASN1_OBJECT(p,i,s,-1);
 	
 	p=buf;
-	op=d2i_ASN1_OBJECT(NULL,&p,i);
+	op=d2i_ASN1_OBJECT(NULL,&p,j);
 	OPENSSL_free(buf);
 	return op;
 	}
diff --git a/ssl/ssl-lib.com b/ssl/ssl-lib.com
index 54390dedb9..7d2836478d 100644
--- a/ssl/ssl-lib.com
+++ b/ssl/ssl-lib.com
@@ -313,7 +313,7 @@ $ WRITE SYS$OUTPUT "Creating SSL_TASK OSU HTTP SSL Engine."
 $!
 $! Compile The File.
 $!
-$ ON ERROR GOTO SSL_TASK_END
+$ ON ERROR THEN GOTO SSL_TASK_END
 $ CC5/OBJECT='OBJ_DIR'SSL_TASK.OBJ SYS$DISK:[]SSL_TASK.C
 $!
 $! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 5f91ed19c7..c752d0b01b 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -247,12 +247,22 @@ int main(int argc, char *argv[])
 			debug=1;
 		else if	(strcmp(*argv,"-reuse") == 0)
 			reuse=1;
-#ifndef NO_DH
 		else if	(strcmp(*argv,"-dhe1024") == 0)
+			{
+#ifndef NO_DH
 			dhe1024=1;
+#else
+			fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n";
+#endif
+			}
 		else if	(strcmp(*argv,"-dhe1024dsa") == 0)
+			{
+#ifndef NO_DH
 			dhe1024dsa=1;
+#else
+			fprintf(stderr,"ignoring -dhe1024, since I'm compiled without DH\n";
 #endif
+			}
 		else if	(strcmp(*argv,"-no_dhe") == 0)
 			no_dhe=1;
 		else if	(strcmp(*argv,"-ssl2") == 0)
diff --git a/test/tcrl.com b/test/tcrl.com
index 2e6ab2814d..86bf9735aa 100644
--- a/test/tcrl.com
+++ b/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/test/testenc.com b/test/testenc.com
index 3b66f2e0d0..c24fa388c0 100644
--- a/test/testenc.com
+++ b/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/test/tpkcs7.com b/test/tpkcs7.com
index 9e345937c6..047834fba4 100644
--- a/test/tpkcs7.com
+++ b/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/test/tpkcs7d.com b/test/tpkcs7d.com
index 7d4f8794a4..193bb72137 100644
--- a/test/tpkcs7d.com
+++ b/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/test/treq.com b/test/treq.com
index 22c22c3aa9..5524e485ba 100644
--- a/test/treq.com
+++ b/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/test/trsa.com b/test/trsa.com
index 6b6c318e2b..6dbe59ef64 100644
--- a/test/trsa.com
+++ b/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/test/tsid.com b/test/tsid.com
index bde23f9bb9..abd1d4d737 100644
--- a/test/tsid.com
+++ b/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/test/tx509.com b/test/tx509.com
index 985969c566..7b2592f773 100644
--- a/test/tx509.com
+++ b/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