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

Make it build.

Browse Source
This commit is contained in:
Ben Laurie
2013-08-01 11:14:23 +01:00
parent 36086186a9
commit a6a48e87bc
6 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ssl/s3_srvr.c
View File

@@ -3734,12 +3734,13 @@ int tls1_send_server_supplemental_data(SSL *s, int *skip)
SSLerr(SSL_F_TLS1_SEND_SERVER_SUPPLEMENTAL_DATA,ERR_R_BUF_LIB);
return 0;
}
//write supp data entry...
//if first entry, write handshake message type
//jump back to write length at end
/* write supp data entry...
* if first entry, write handshake message type
* jump back to write length at end */
if (length == 0)
{
//1 byte message type + 3 bytes for message length
/* 1 byte message type + 3 bytes for
* message length */
if (!BUF_MEM_grow_clean(s->init_buf, 4))
{
SSLerr(SSL_F_TLS1_SEND_SERVER_SUPPLEMENTAL_DATA,ERR_R_BUF_LIB);
@@ -3747,13 +3748,15 @@ int tls1_send_server_supplemental_data(SSL *s, int *skip)
}
p = (unsigned char *)s->init_buf->data;
*(p++) = SSL3_MT_SUPPLEMENTAL_DATA;
//hold on to length field to update later
/* hold on to length field to update later */
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;
}
//2 byte supp data type + 2 byte length + outlen
/* 2 byte supp data type + 2 byte length + outlen */
if (!BUF_MEM_grow(s->init_buf, outlen + 4))
{
SSLerr(SSL_F_TLS1_SEND_SERVER_SUPPLEMENTAL_DATA,ERR_R_BUF_LIB);
@@ -3762,15 +3765,16 @@ int tls1_send_server_supplemental_data(SSL *s, int *skip)
s2n(record->supp_data_type, p);
s2n(outlen, p);
memcpy(p, out, outlen);
//update length to supp data type (2 bytes) + supp data length (2 bytes) + supp data
/* update length to supp data type (2 bytes) +
* supp data length (2 bytes) + supp data */
length += (outlen + 4);
p += outlen;
}
if (length > 0)
{
//write handshake length
/* write handshake length */
l2n3(length - 4, size_loc);
//supp_data length
/* supp_data length */
l2n3(length - 7, size_loc);
s->state = SSL3_ST_SW_SUPPLEMENTAL_DATA_B;
s->init_num = length;
@@ -3780,7 +3784,7 @@ int tls1_send_server_supplemental_data(SSL *s, int *skip)
}
}
//no supp data message sent
/* no supp data message sent */
*skip = 1;
s->init_num = 0;
s->init_off = 0;
@@ -3824,7 +3828,7 @@ int tls1_get_client_supplemental_data(SSL *s)
{
n2s(p, supp_data_entry_type);
n2s(p, supp_data_entry_len);
//if there is a callback for this supp data type, send it
/* if there is a callback for this supp data type, send it */
for (i=0; i < s->ctx->srv_supp_data_records_count; i++)
{
if (s->ctx->srv_supp_data_records[i].supp_data_type == supp_data_entry_type && s->ctx->srv_supp_data_records[i].fn2)