Commit 7612511b authored by Scott Deboy's avatar Scott Deboy
Browse files

Re-add alert variables removed during rebase

Whitespace fixes

(cherry picked from commit e9add063)
Conflicts:
	ssl/s3_clnt.c
parent 19a28a8a
Loading
Loading
Loading
Loading
+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;
+31 −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;
@@ -3652,7 +3653,7 @@ int tls1_send_client_supplemental_data(SSL *s, int *skip)
				SSLerr(SSL_F_TLS1_SEND_CLIENT_SUPPLEMENTAL_DATA,ERR_R_BUF_LIB);
				return 0;
				}
			//if first entry, write handshake message type
			/* if first entry, write handshake message type */
			if (length == 0)
				{
				if (!BUF_MEM_grow_clean(s->init_buf, 4))
@@ -3662,9 +3663,12 @@ int tls1_send_client_supplemental_data(SSL *s, int *skip)
					}
				p = (unsigned char *)s->init_buf->data;
				*(p++) = SSL3_MT_SUPPLEMENTAL_DATA;
				//update message length when all callbacks complete
				/* update message length when all
				* callbacks complete */
				size_loc = p;
				//skip over handshake length field (3 bytes) and supp_data length field (3 bytes)
				/* skip over handshake length field (3
				* bytes) and supp_data length field
				* (3 bytes) */
				p += 3 + 3;
				length += 1 +3 +3;
				}
@@ -3742,9 +3746,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);
+15 −14
Original line number Diff line number Diff line
@@ -1500,7 +1500,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)
+20 −20

File changed.

Contains only whitespace changes.

+20 −20

File changed.

Contains only whitespace changes.

+6 −6

File changed.

Contains only whitespace changes.

+45 −45

File changed.

Contains only whitespace changes.

+66 −66

File changed.

Contains only whitespace changes.

+31 −31

File changed.

Contains only whitespace changes.

+16 −16

File changed.

Contains only whitespace changes.

Loading