diff options
| author | Richard Levitte <levitte@openssl.org> | 2004-05-06 09:55:18 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2004-05-06 09:55:18 +0000 |
| commit | 46e9a491650c5cafe2dc2844fd03e5bf87a6ab55 (patch) | |
| tree | 14f9e500e9a7663ebda2ff38462df0c6afbe3188 | |
| parent | df257306e3f4e9bd2523994258218d60441219a2 (diff) | |
| download | openssl-new-46e9a491650c5cafe2dc2844fd03e5bf87a6ab55.tar.gz | |
Recent changes from 0.9.6-stable.
| -rw-r--r-- | Makefile.org | 3 | ||||
| -rw-r--r-- | crypto/conf/conf_def.c | 5 |
2 files changed, 6 insertions, 2 deletions
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 |