diff options
| author | Richard Levitte <levitte@openssl.org> | 2004-05-06 09:54:50 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2004-05-06 09:54:50 +0000 |
| commit | 9227a5912f0a64ca29a0424ed799d5a1d3df428e (patch) | |
| tree | 10a956eea1cdfe41aa8f4e760a0dcd7445aa889c | |
| parent | f7376e8ebca77e6ed7486cdb50faf58de8d1ed7f (diff) | |
| download | openssl-new-9227a5912f0a64ca29a0424ed799d5a1d3df428e.tar.gz | |
Recent changes from 0.9.7-stable.
| -rw-r--r-- | CHANGES | 16 | ||||
| -rw-r--r-- | Makefile.org | 3 | ||||
| -rw-r--r-- | crypto/conf/conf_def.c | 5 |
3 files changed, 21 insertions, 3 deletions
@@ -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 802fbeab60..c22d57dbcf 100644 --- 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 2e9f52f1fd..b5a876ae68 100644 --- 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 |