Commit 46e9a491 authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable.

parent df257306

Makefile.org

+1 −2
Original line number Diff line number Diff line
@@ -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; \

crypto/conf/conf_def.c

+5 −0
Original line number Diff line number Diff line
@@ -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