Commit 8acf1ff4 authored by Ben Laurie's avatar Ben Laurie Committed by Scott Deboy
Browse files

More cleanup. 

(cherry picked from commit 5eda213e)
Conflicts:
	apps/s_client.c
	apps/s_server.c
parent 8b41df41

apps/s_cb.c

+3 −3
Original line number Diff line number Diff line
@@ -876,12 +876,12 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void * 
				case 16:

					str_details1 = ", ClientKeyExchange";

					break;

				case 23:

					str_details1 = ", SupplementalData";

					break;

				case 20:

					str_details1 = ", Finished";

					break;

				case 23:

					str_details1 = ", SupplementalData";

					break;

					}

				}

			}

apps/s_client.c

+4 −10
Original line number Diff line number Diff line
@@ -2440,18 +2440,12 @@ static int authz_tlsext_cb(SSL *s, unsigned short ext_type, 
			   void *arg)

	{

	if (TLSEXT_TYPE_server_authz == ext_type)

		{

		server_provided_server_authz = (memchr(in,

		TLSEXT_AUTHZDATAFORMAT_dtcp,

		inlen) != NULL);

		}

		server_provided_server_authz

		  = (memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL);



	if (TLSEXT_TYPE_client_authz == ext_type)

		{

		server_provided_client_authz = (memchr(in,

		TLSEXT_AUTHZDATAFORMAT_dtcp,

		inlen) != NULL);

		}

		server_provided_client_authz

		  = (memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL);



	return 1;

	}

apps/s_server.c

+7 −15
Original line number Diff line number Diff line
@@ -1962,9 +1962,7 @@ bad: 
#endif



	if (c_no_resumption_on_reneg)

        {

		SSL_CTX_set_options(ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);

        }

	if (!set_cert_key_stuff(ctx, s_cert, s_key, s_chain, build_chain))

		goto end;

#ifndef OPENSSL_NO_TLSEXT
@@ -3558,18 +3556,12 @@ static int authz_tlsext_cb(SSL *s, unsigned short ext_type, 
			   void *arg)

	{

	if (TLSEXT_TYPE_server_authz == ext_type)

		{

		client_provided_server_authz = (memchr(in,

		TLSEXT_AUTHZDATAFORMAT_dtcp,

		inlen) != NULL);

		}

		client_provided_server_authz

		  = memchr(in,	TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL;



	if (TLSEXT_TYPE_client_authz == ext_type)

		{

		client_provided_client_authz = (memchr(in,

		TLSEXT_AUTHZDATAFORMAT_dtcp,

		inlen) != NULL);

		}

		client_provided_client_authz

		  = memchr(in, TLSEXT_AUTHZDATAFORMAT_dtcp, inlen) != NULL;



	return 1;

	}

ssl/s3_clnt.c

+7 −7
Original line number Diff line number Diff line
@@ -3571,9 +3571,11 @@ int ssl3_check_finished(SSL *s) 
	{

	int ok;

	long n;

/*	Read the message to see if it is supplemental data, regardless if there is a session ticket

	this function is called when we really expect a Certificate

	message, so permit appropriate message length */



	/* Read the message to see if it is supplemental data,

	 * regardless if there is a session ticket this function is

	 * called when we really expect a Certificate message, so

	 * permit appropriate message length */

	n=s->method->ssl_get_message(s,

		SSL3_ST_CR_CERT_A,

		SSL3_ST_CR_CERT_B,
@@ -3584,9 +3586,7 @@ int ssl3_check_finished(SSL *s) 
	s->s3->tmp.reuse_message = 1;



	if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA)

		{

		return 3;

		}

	/* If we have no ticket it cannot be a resumed session. */

	if (!s->session->tlsext_tick)

		return 1;

ssl/s3_srvr.c

+0 −2
Original line number Diff line number Diff line
@@ -903,9 +903,7 @@ int ssl3_check_client_hello(SSL *s) 
	s->s3->tmp.reuse_message = 1;

#ifndef OPENSSL_NO_TLSEXT

	if (s->s3->tmp.message_type == SSL3_MT_SUPPLEMENTAL_DATA)

		{

		return 3;

		}

#endif

	if (s->s3->tmp.message_type == SSL3_MT_CLIENT_HELLO)

		{

ssl/ssltest.c

+1 −1

File changed.

Contains only whitespace changes.

ssl/ssl.h

+5 −5

File changed.

Contains only whitespace changes.

ssl/ssl_lib.c

+2 −2

File changed.

Contains only whitespace changes.