Commit 6ef9d832 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in changes from the 0.9.6-stable branch.

parent 5a9c441c

CHANGES

+19 −0
Original line number Diff line number Diff line
@@ -2,6 +2,25 @@ 
 OpenSSL CHANGES

 _______________



 Changes between 0.9.6a and 0.9.6b  [XX xxx XXXX]



  *) Move 'if (!initialized) RAND_poll()' into regions protected by

     CRYPTO_LOCK_RAND.  This is not strictly necessary, but avoids

     having multiple threads call RAND_poll() concurrently.

     [Bodo Moeller]



  *) In crypto/rand/md_rand.c, replace 'add_do_not_lock' flag by a

     combination of a flag and a thread ID variable.

     Otherwise while one thread is in ssleay_rand_bytes (which sets the

     flag), *other* threads can enter ssleay_add_bytes without obeying

     the CRYPTO_LOCK_RAND lock (and may even illegaly release the lock

     that they do not hold after the first thread unsets add_do_not_lock).

     [Bodo Moeller]



  *) Change bctest again: '-x' expressions are not available in all

     versions of 'test'.

     [Bodo Moeller]



 Changes between 0.9.6 and 0.9.6a  [5 Apr 2001]



  *) Fix a couple of memory leaks in PKCS7_dataDecode()

FAQ

+8 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ OpenSSL - Frequently Asked Questions 
* Why do I get errors about unknown algorithms?

* Why can't the OpenSSH configure script detect OpenSSL?

* Can I use OpenSSL's SSL library with non-blocking I/O?

* Why doesn't my server application receive a client certificate?



===============================================================================
@@ -543,5 +544,12 @@ requiring a bi-directional message exchange; both SSL_read() and 
SSL_write() will try to continue any pending handshake.





* Why doesn't my server application receive a client certificate?



Due to the TLS protocol definition, a client will only send a certificate,

if explicitely asked by the server. Use the SSL_VERIFY_PEER flag of the

SSL_CTX_set_verify() function to enable the use of client certificates.





===============================================================================

Makefile.org

+4 −4
Original line number Diff line number Diff line
@@ -474,19 +474,19 @@ install_docs: 
		$(INSTALL_PREFIX)$(MANDIR)/man3 \

		$(INSTALL_PREFIX)$(MANDIR)/man5 \

		$(INSTALL_PREFIX)$(MANDIR)/man7

	@echo installing man 1 and man 5

	@for i in doc/apps/*.pod; do \

		fn=`basename $$i .pod`; \

		sec=`[ "$$fn" = "config" ] && echo 5 || echo 1`; \

		if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \

		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \

		(cd `dirname $$i`; \

		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \

			 --release=$(VERSION) `basename $$i`) \

			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \

	done

	@echo installing man 3 and man 7

	@for i in doc/crypto/*.pod doc/ssl/*.pod; do \

		fn=`basename $$i .pod`; \

		sec=`[ "$$fn" = "des_modes" ] && echo 7 || echo 3`; \

		if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \

		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \

		(cd `dirname $$i`; \

		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \

			--release=$(VERSION) `basename $$i`) \

README

+1 −1
Original line number Diff line number Diff line 


 OpenSSL 0.9.6a [engine] 5 Apr 2001

 OpenSSL 0.9.6b-dev [engine] XX xxx XXXX



 Copyright (c) 1998-2000 The OpenSSL Project

 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

apps/dgst.c

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
#undef PROG

#define PROG	dgst_main



void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout,

void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

		EVP_PKEY *key, unsigned char *sigin, int siglen);



int MAIN(int, char **);
@@ -95,7 +95,7 @@ int MAIN(int argc, char **argv) 
	int debug=0;

	const char *outfile = NULL, *keyfile = NULL;

	const char *sigfile = NULL, *randfile = NULL;

	char out_bin = -1, want_pub = 0, do_verify = 0;

	int out_bin = -1, want_pub = 0, do_verify = 0;

	EVP_PKEY *sigkey = NULL;

	unsigned char *sigbuf = NULL;

	int siglen = 0;
@@ -365,7 +365,7 @@ end: 
	EXIT(err);

	}



void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, char binout,

void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

			EVP_PKEY *key, unsigned char *sigin, int siglen)

	{

	int len;