From 582ef3dbdbd0a633f614d37791226a2fe1558e53 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 31 Oct 2008 12:09:18 +0000 Subject: [PATCH] Fix from HEAD. --- CHANGES | 6 ++++++ crypto/jpake/Makefile | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/CHANGES b/CHANGES index 9e9f94dace..6ec26e04f9 100644 --- a/CHANGES +++ b/CHANGES @@ -4,10 +4,16 @@ 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 s_server. [Ben Laurie] +>>>>>>> 1.1238.2.123 *) Set the comparison function in v3_addr_canonize(). [Rob Austein ] diff --git a/crypto/jpake/Makefile b/crypto/jpake/Makefile index 0ed56306f2..a4a1402f2e 100644 --- a/crypto/jpake/Makefile +++ b/crypto/jpake/Makefile @@ -24,6 +24,14 @@ links: @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) @$(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: @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) -- 2.25.1