From: Richard Levitte <levitte@openssl.org>
Date: Thu, 6 May 2004 09:55:18 +0000 (+0000)
Subject: Recent changes from 0.9.6-stable.
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=46e9a491650c5cafe2dc2844fd03e5bf87a6ab55;p=oweals%2Fopenssl.git

Recent changes from 0.9.6-stable.
---

diff --git a/Makefile.org b/Makefile.org
index a549c91406..bf5f634f49 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -642,8 +642,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 adc28eebff..aba2c9fd84 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -599,6 +599,11 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
 			BUF_MEM_grow(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