generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-add alert variables removed during rebase

Browse Source 
Whitespace fixes
This commit is contained in:
Scott Deboy 2014-02-04 13:08:43 -08:00 committed by Ben Laurie
parent 519531e97e
commit e9add063b5
10 changed files with 249 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ssl/s23_clnt.c
View File

@ -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;

13
ssl/s3_clnt.c
View File

@ -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;
@ -3706,10 +3707,10 @@ int tls1_send_client_supplemental_data(SSL *s, int *skip)
s->init_off = 0;
return 1;
f_err:
f_err:
ssl3_send_alert(s,SSL3_AL_FATAL,al);
return 0;
}
}
int tls1_get_server_supplemental_data(SSL *s)
{
@ -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);
@ -3763,7 +3766,7 @@ int tls1_get_server_supplemental_data(SSL *s)
p += supp_data_entry_len;
}
return 1;
f_err:
f_err:
ssl3_send_alert(s,SSL3_AL_FATAL,al);
return -1;
}

3
ssl/s3_srvr.c
View File

@ -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)