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

Re-add alert variables removed during rebase 

Whitespace fixes
parent 519531e9

ssl/s23_clnt.c

+3 −2
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ static int ssl23_client_hello(SSL *s) 
	unsigned long l;

	int ssl2_compat;

	int version = 0, version_major, version_minor;

	int al = 0;

#ifndef OPENSSL_NO_COMP

	int j;

	SSL_COMP *comp;

ssl/s3_clnt.c

+28 −25
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ int ssl3_client_hello(SSL *s) 
	unsigned char *p,*d;

	int i;

	unsigned long l;

	int al = 0;

#ifndef OPENSSL_NO_COMP

	int j;

	SSL_COMP *comp;
@@ -3750,9 +3751,11 @@ int tls1_get_server_supplemental_data(SSL *s) 
		/* if there is a callback for this supp data type, send it */

		for (i=0; i < s->ctx->cli_supp_data_records_count; i++)

			{

			if (s->ctx->cli_supp_data_records[i].supp_data_type == supp_data_entry_type && s->ctx->cli_supp_data_records[i].fn1)

			if (s->ctx->cli_supp_data_records[i].supp_data_type == supp_data_entry_type &&

				s->ctx->cli_supp_data_records[i].fn1)

				{

				cb_retval = s->ctx->cli_supp_data_records[i].fn1(s, supp_data_entry_type, p, supp_data_entry_len, &al, s->ctx->cli_supp_data_records[i].arg);

				cb_retval = s->ctx->cli_supp_data_records[i].fn1(s, supp_data_entry_type, p,

				supp_data_entry_len, &al, s->ctx->cli_supp_data_records[i].arg);

				if (cb_retval == 0)

					{

					SSLerr(SSL_F_TLS1_GET_SERVER_SUPPLEMENTAL_DATA, ERR_R_SSL_LIB);

ssl/s3_srvr.c

+15 −14
Original line number Diff line number Diff line
@@ -1504,7 +1504,8 @@ int ssl3_send_server_hello(SSL *s) 
	{

	unsigned char *buf;

	unsigned char *p,*d;

        int i,sl,al;

	int i,sl;

	int al = 0;

	unsigned long l;



	if (s->state == SSL3_ST_SW_SRVR_HELLO_A)

ssl/s3_lib.c

+6 −6

File changed.

Contains only whitespace changes.

ssl/ssl.h

+16 −16

File changed.

Contains only whitespace changes.

ssl/ssl_rsa.c

+45 −45

File changed.

Contains only whitespace changes.

ssl/ssltest.c

+66 −66

File changed.

Contains only whitespace changes.

ssl/t1_lib.c

+31 −31

File changed.

Contains only whitespace changes.

apps/s_client.c

+20 −20

File changed.

Contains only whitespace changes.

apps/s_server.c

+20 −20

File changed.

Contains only whitespace changes.