Recent changes from 0.9.6-stable.

diff --git a/Makefile.org b/Makefile.org
index a549c91406e5a1047a9c236f8bf0f8b9898dec42..bf5f634f49da18326932500f17daa272f121822a 100644 (file)
--- 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 adc28eebff130e08baa32a410554c6562828192c..aba2c9fd8495a3d93cab9ec89ac658e12c5b4a1a 100644 (file)
--- 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