Commit b98a9842 authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge in changes from the 0.9.6-stable branch.

parent dac70984

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ 


 Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]



  *) Fix bug in SSL_clear(): bad sessions were not removed (found by

     Yoram Zahavi <YoramZ@gilian.com>).

     [Lutz Jaenicke]



  *) Add information about CygWin 1.3 and on, and preserve proper

     configuration for the versions before that.

     [Corinna Vinschen <vinschen@redhat.com> and Richard Levitte]

apps/Makefile.ssl

+0 −740

File changed.

Preview size limit exceeded, changes collapsed.

crypto/err/Makefile.ssl

+0 −23
Original line number Diff line number Diff line
@@ -91,26 +91,3 @@ err_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h 
err_all.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

err_all.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h

err_all.o: ../../include/openssl/des.h ../../include/openssl/dh.h
 
err_all.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h

err_all.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h

err_all.o: ../../include/openssl/err.h ../../include/openssl/evp.h

err_all.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h

err_all.o: ../../include/openssl/md2.h ../../include/openssl/md4.h

err_all.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

err_all.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

err_all.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

err_all.o: ../../include/openssl/pem2.h ../../include/openssl/pkcs12.h

err_all.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h

err_all.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

err_all.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

err_all.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

err_all.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

err_all.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h

err_prn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h

err_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h

err_prn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h

err_prn.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

err_prn.o: ../cryptlib.h

doc/ssl/SSL_clear.pod

+19 −0
Original line number Diff line number Diff line
@@ -25,6 +25,25 @@ if L<SSL_shutdown(3)|SSL_shutdown(3)> was not called for the connection 
or at least L<SSL_set_shutdown(3)|SSL_set_shutdown(3)> was used to

set the SSL_SENT_SHUTDOWN state.



If a session was closed cleanly, the session object will be kept and all

settings corresponding. This explicitly means, that e.g. the special method

used during the session will be kept for the next handshake. So if the

session was a TLSv1 session, a SSL client object will use a TLSv1 client

method for the next handshake and a SSL server object will use a TLSv1

server method, even if SSLv23_*_methods were chosen on startup. This

will might lead to connection failures (see L<SSL_new(3)|SSL_new(3)>)

for a description of the method's properties.



=head1 WARNINGS



SSL_clear() resets the SSL object to allow for another connection. The

reset operation however keeps several settings of the last sessions

(some of these settings were made automatically during the last

handshake). It only makes sense when opening a new session (or reusing

an old one) with the same peer that shares these settings.

SSL_clear() is not a short form for the sequence

L<SSL_free(3)|SSL_free(3)>; L<SSL_new(3)|SSL_new(3)>; .



=head1 RETURN VALUES



The following return values can occur:

ssl/ssl_lib.c

+6 −8
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ OPENSSL_GLOBAL SSL3_ENC_METHOD ssl3_undef_enc_method={ 


int SSL_clear(SSL *s)

	{

	int state;



	if (s->method == NULL)

		{
@@ -93,6 +92,12 @@ int SSL_clear(SSL *s) 
		return(0);

		}



	if (ssl_clear_bad_session(s))

		{

		SSL_SESSION_free(s->session);

		s->session=NULL;

		}



	s->error=0;

	s->hit=0;

	s->shutdown=0;
@@ -110,7 +115,6 @@ int SSL_clear(SSL *s) 
		}

#endif



	state=s->state; /* Keep to check if we throw away the session-id */

	s->type=0;



	s->state=SSL_ST_BEFORE|((s->server)?SSL_ST_ACCEPT:SSL_ST_CONNECT);
@@ -131,12 +135,6 @@ int SSL_clear(SSL *s) 


	ssl_clear_cipher_ctx(s);



	if (ssl_clear_bad_session(s))

		{

		SSL_SESSION_free(s->session);

		s->session=NULL;

		}



	s->first_packet=0;



#if 1