Recent changes from 0.9.6-stable.

diff --git a/CHANGES b/CHANGES
index a18af513955d5da096c99c50beff0ebfe319be38..8b947b8518ad2965311c91a44b2aa7dc561acaf8 100644 (file)
--- 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 2ea9cd7203af84af20645e4323cdf739a846915d..03bae9b95004438b96bff2952b747a7ec87c377b 100644 (file)
--- 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 41fdf6e7b2cce48af08d77dc90dcfaf99e39106f..76f2e05f5080b9394d72fd2bee4171f3211cba23 100644 (file)
--- 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 54390dedb9a4365353ce77d865a3ac74a9afd720..7d2836478d3ee732a8e6715ad95b00fee7d63baa 100644 (file)
--- 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 5f91ed19c73705c108623eb32fd8fef4237a5e59..c752d0b01b636d393ac0b137f42f88f70760ea28 100644 (file)
--- 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 2e6ab2814d8f91e3e88123bed15f0d57ccd63eb0..86bf9735aa6ed025a2d0a87e744c0cd00b80e6e7 100644 (file)
--- 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 3b66f2e0d0614f5de4ac0a88b01094c8d69eda03..c24fa388c06a01fddb705e3676bf294513fe352f 100644 (file)
--- 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 9e345937c6e59e6e83ce53c47534cb3944ccaec6..047834fba42f62fc054491395a5124a59c344e1d 100644 (file)
--- 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 7d4f8794a4cbd0172d2b76a9e462672e376ead4e..193bb72137e33b2a4a204ffc04bf2218dc3ae27b 100644 (file)
--- 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 22c22c3aa9e48af6037c63d404c7e2dcc380fbce..5524e485ba3d9fa54bf3522f8f690c11ee1da0e1 100644 (file)
--- 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 6b6c318e2b53125ecd3ab1f157e0e334ab519362..6dbe59ef644fd24151e206dbb0309a8862ad84e8 100644 (file)
--- 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 bde23f9bb973770d05c7a62dba0bfba5544d23e1..abd1d4d7376c662094e0ce8599f927fb07efce39 100644 (file)
--- 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 985969c566f24d24d77d5e8f482a9774b12e8ea6..7b2592f7732059221a5aa3b1c5a3411374244009 100644 (file)
--- 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