Fix from HEAD.
This commit is contained in:
parent
6a933782fa
commit
582ef3dbdb
2 changed files with 14 additions and 0 deletions
6
CHANGES
6
CHANGES
|
@ -4,10 +4,16 @@
|
||||||
|
|
||||||
Changes between 0.9.8i and 0.9.8j [xx XXX xxxx]
|
Changes between 0.9.8i and 0.9.8j [xx XXX xxxx]
|
||||||
|
|
||||||
|
<<<<<<< CHANGES
|
||||||
|
*) Use correct exit code if there is an error in dgst command.
|
||||||
|
[Steve Henson; problem pointed out by Roland Dirlewanger]
|
||||||
|
|
||||||
|
=======
|
||||||
*) Add JPAKE support, including demo authentication in s_client and
|
*) Add JPAKE support, including demo authentication in s_client and
|
||||||
s_server.
|
s_server.
|
||||||
[Ben Laurie]
|
[Ben Laurie]
|
||||||
|
|
||||||
|
>>>>>>> 1.1238.2.123
|
||||||
*) Set the comparison function in v3_addr_canonize().
|
*) Set the comparison function in v3_addr_canonize().
|
||||||
[Rob Austein <sra@hactrn.net>]
|
[Rob Austein <sra@hactrn.net>]
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,14 @@ links:
|
||||||
@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
|
@$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
|
||||||
@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
|
@$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
|
||||||
|
|
||||||
|
install:
|
||||||
|
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
|
||||||
|
@headerlist="$(EXHEADER)"; for i in $$headerlist ; \
|
||||||
|
do \
|
||||||
|
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
|
||||||
|
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
|
||||||
|
done;
|
||||||
|
|
||||||
depend:
|
depend:
|
||||||
@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
|
@[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile...
|
||||||
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
|
$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
|
||||||
|
|
Loading…
Reference in a new issue