Commit 949fbf07 authored by Ben Laurie's avatar Ben Laurie
Browse files

Disable renegotiation.

parent 6156be4d

CHANGES

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


 Changes between 0.9.8k and 0.9.8l  [xx XXX xxxx]



  *) Disable renegotiation completely - this fixes a severe security

     problem at the cost of breaking all renegotiation. Renegotiation

     can be re-enabled by setting

     OPENSSL_ENABLE_UNSAFE_LEGACY_SESSION_RENEGOTATION at

     compile-time. This is really not recommended.

     [Ben Laurie]



  *) Fixes to stateless session resumption handling. Use initial_ctx when

     issuing and attempting to decrypt tickets in case it has changed during

     servername handling. Use a non-zero length session ID when attempting

ssl/s3_srvr.c

+9 −0
Original line number Diff line number Diff line
@@ -718,6 +718,15 @@ int ssl3_get_client_hello(SSL *s) 
#endif

	STACK_OF(SSL_CIPHER) *ciphers=NULL;



#ifndef OPENSSL_ENABLE_UNSAFE_LEGACY_SESSION_RENEGOTATION

	if (s->new_session)

		{

		al=SSL_AD_HANDSHAKE_FAILURE;

		SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_NO_RENEGOTIATION);

		goto f_err;

		}

#endif  /* ndef OPENSSL_ENABLE_UNSAFE_LEGACY_SESSION_RENEGOTATION */



	/* We do this so that we will respond with our native type.

	 * If we are TLSv1 and we get SSLv3, we will respond with TLSv1,

	 * This down switching should be handled by a different method.

ssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -1969,6 +1969,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_NO_PRIVATE_KEY_ASSIGNED			 190

#define SSL_R_NO_PROTOCOLS_AVAILABLE			 191

#define SSL_R_NO_PUBLICKEY				 192

#define SSL_R_NO_RENEGOTIATION				 319

#define SSL_R_NO_SHARED_CIPHER				 193

#define SSL_R_NO_VERIFY_CALLBACK			 194

#define SSL_R_NULL_SSL_CTX				 195

ssl/ssl_err.c

+1 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= 
{ERR_REASON(SSL_R_NO_PRIVATE_KEY_ASSIGNED),"no private key assigned"},

{ERR_REASON(SSL_R_NO_PROTOCOLS_AVAILABLE),"no protocols available"},

{ERR_REASON(SSL_R_NO_PUBLICKEY)          ,"no publickey"},

{ERR_REASON(SSL_R_NO_RENEGOTIATION)      ,"no renegotiation"},

{ERR_REASON(SSL_R_NO_SHARED_CIPHER)      ,"no shared cipher"},

{ERR_REASON(SSL_R_NO_VERIFY_CALLBACK)    ,"no verify callback"},

{ERR_REASON(SSL_R_NULL_SSL_CTX)          ,"null ssl ctx"},