Commit 5eda213e authored by Ben Laurie's avatar Ben Laurie
Browse files

More cleanup.

parent a6a48e87
Loading
Loading
Loading
Loading
+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;
					}
				}
			}
+6 −11
Original line number Diff line number Diff line
@@ -2434,18 +2434,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;
	}
@@ -2487,7 +2481,8 @@ static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
	unsigned char *result;
	if (c_auth && server_provided_client_authz && server_provided_server_authz)
		{
		if (!c_auth_require_reneg || (c_auth_require_reneg && SSL_num_renegotiations(s)))
		if (!c_auth_require_reneg
		    || (c_auth_require_reneg && SSL_num_renegotiations(s)))
			{
			result = OPENSSL_malloc(10);
			memcpy(result, "5432154321", 10);
+11 −17
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
@@ -3569,18 +3567,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;
	}
@@ -3591,7 +3583,8 @@ static int authz_tlsext_generate_cb(SSL *s, unsigned short ext_type,
	{
	if (c_auth && client_provided_client_authz && client_provided_server_authz)
		{
		if (!c_auth_require_reneg || (c_auth_require_reneg && SSL_num_renegotiations(s)))
		if (!c_auth_require_reneg
		    || (c_auth_require_reneg && SSL_num_renegotiations(s)))
			{
			*out = auth_ext_data;
			*outlen = 1;
@@ -3622,7 +3615,8 @@ static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
	unsigned char *result;
	if (c_auth && client_provided_client_authz && client_provided_server_authz)
		{
		if (!c_auth_require_reneg || (c_auth_require_reneg && SSL_num_renegotiations(s)))
		if (!c_auth_require_reneg
		    || (c_auth_require_reneg && SSL_num_renegotiations(s)))
			{
			result = OPENSSL_malloc(10);
			memcpy(result, "1234512345", 10);
+7 −7
Original line number Diff line number Diff line
@@ -3564,9 +3564,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,
@@ -3577,9 +3579,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;
+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)
		{
+5 −5

File changed.

Contains only whitespace changes.

+2 −2

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

Loading