SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_UNKNOWN_CIPHER_RETURNED);
goto f_err;
}
+ /* Set version disabled mask now we know version */
+ if (!SSL_USE_TLS1_2_CIPHERS(s))
+ ct->mask_ssl = SSL_TLSV1_2;
+ else
+ ct->mask_ssl = 0;
/* If it is a disabled cipher we didn't send it in client hello,
* so return an error.
*/
{
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,
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;
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))
}
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;
}
}
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_CW_SUPPLEMENTAL_DATA_B;
s->init_num = length;
}
}
- //no supp data message sent
+ /* no supp data message sent */
*skip = 1;
s->init_num = 0;
s->init_off = 0;
goto f_err;
}
n2l3(p, supp_data_len);
- while (p<d+supp_data_len)
+ while (p < d+supp_data_len)
{
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->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)
}
}
}
- p+=supp_data_entry_len;
+ p += supp_data_entry_len;
}
return 1;
f_err: