Recent changes from 0.9.7-stable.

diff --git a/CHANGES b/CHANGES
index 713876a1e9464beb336bfb28cd35e18bfc0db33c..0675c6a6e803140f648b3202c64f0b9047166724 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,7 @@
  Changes between 0.9.7d and 0.9.7e  [XX xxx XXXX]
 
   *) Reduce the chances of duplicate issuer name and serial numbers (in
-     violation of RFC3280) using the OpenSSL certificate creation utilities. 
+     violation of RFC3280) using the OpenSSL certificate creation utilities.
      This is done by creating a random 64 bit value for the initial serial
      number when a serial number file is created or when a self signed
      certificate is created using 'openssl req -x509'. The initial serial
@@ -2048,6 +2048,20 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
   *) Clean old EAY MD5 hack from e_os.h.
      [Richard Levitte]
 
+ Changes between 0.9.6l and 0.9.6m  [17 Mar 2004]
+
+  *) Fix null-pointer assignment in do_change_cipher_spec() revealed
+     by using the Codenomicon TLS Test Tool (CAN-2004-0079)
+     [Joe Orton, Steve Henson]
+
+ Changes between 0.9.6k and 0.9.6l  [04 Nov 2003]
+
+  *) Fix additional bug revealed by the NISCC test suite:
+
+     Stop bug triggering large recursion when presented with
+     certain ASN.1 tags (CAN-2003-0851)
+     [Steve Henson]
+
  Changes between 0.9.6j and 0.9.6k  [30 Sep 2003]
 
   *) Fix various bugs revealed by running the NISCC test suite:

diff --git a/Makefile.org b/Makefile.org
index 802fbeab606b62104f51056acea3fbc020e35ac3..c22d57dbcf917390a4b915647822e146ecc2c0d6 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -798,8 +798,7 @@ install: all install_docs
                $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
                $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/private \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/lib
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/private
        @for i in $(EXHEADER) ;\
        do \
        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \

diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index 2e9f52f1fd503560abfec572ce7ed6016ce90a17..b5a876ae68a5a7959858ac877c1b5651396f1536 100644 (file)
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -632,6 +632,11 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
                        BUF_MEM_grow_clean(buf,(strlen(p)+len-(e-from)));
                        while (*p)
                                buf->data[to++]= *(p++);
+
+                       /* Since we change the pointer 'from', we also have
+                          to change the perceived length of the string it
+                          points at.  /RL */
+                       len -= e-from;
                        from=e;
                        }
                else