Commit 582ef3db authored Oct 31, 2008 by Dr. Stephen Henson

Fix from HEAD.

parent 6a933782

CHANGES

+6 −0

Original line number	Diff line number	Diff line
		@@ -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 <sra@hactrn.net>]

crypto/jpake/Makefile

+8 −0

Original line number	Diff line number	Diff line
		@@ -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)