mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename some functions

Browse Source 
The _clienthello_ in the extensions parsing functions is overly specific.
Better to keep the convention to just _client_

Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-11-25 10:34:35 +00:00
parent 7da160b0f4
commit e56c33b98b
5 changed files with 67 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/openssl/ssl.h
View File

@ -2293,10 +2293,10 @@ int ERR_load_SSL_strings(void);
# define SSL_F_TLS_CONSTRUCT_SERVER_USE_SRTP 462 # define SSL_F_TLS_CONSTRUCT_SERVER_USE_SRTP 462
# define SSL_F_TLS_GET_MESSAGE_BODY 351 # define SSL_F_TLS_GET_MESSAGE_BODY 351
# define SSL_F_TLS_GET_MESSAGE_HEADER 387 # define SSL_F_TLS_GET_MESSAGE_HEADER 387
# define SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE 445
# define SSL_F_TLS_PARSE_CLIENTHELLO_RENEGOTIATE 448
# define SSL_F_TLS_PARSE_CLIENTHELLO_TLSEXT 449 # define SSL_F_TLS_PARSE_CLIENTHELLO_TLSEXT 449
# define SSL_F_TLS_PARSE_CLIENTHELLO_USE_SRTP 446 # define SSL_F_TLS_PARSE_CLIENT_KEY_SHARE 445
# define SSL_F_TLS_PARSE_CLIENT_RENEGOTIATE 448
# define SSL_F_TLS_PARSE_CLIENT_USE_SRTP 446
# define SSL_F_TLS_POST_PROCESS_CLIENT_HELLO 378 # define SSL_F_TLS_POST_PROCESS_CLIENT_HELLO 378
# define SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE 384 # define SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE 384
# define SSL_F_TLS_PREPARE_CLIENT_CERTIFICATE 360 # define SSL_F_TLS_PREPARE_CLIENT_CERTIFICATE 360

11
ssl/ssl_err.c
View File

@ -312,14 +312,13 @@ static ERR_STRING_DATA SSL_str_functs[] = {
"tls_construct_server_use_srtp"}, "tls_construct_server_use_srtp"},
{ERR_FUNC(SSL_F_TLS_GET_MESSAGE_BODY), "tls_get_message_body"}, {ERR_FUNC(SSL_F_TLS_GET_MESSAGE_BODY), "tls_get_message_body"},
{ERR_FUNC(SSL_F_TLS_GET_MESSAGE_HEADER), "tls_get_message_header"}, {ERR_FUNC(SSL_F_TLS_GET_MESSAGE_HEADER), "tls_get_message_header"},
{ERR_FUNC(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE),
"tls_parse_clienthello_key_share"},
{ERR_FUNC(SSL_F_TLS_PARSE_CLIENTHELLO_RENEGOTIATE),
"tls_parse_clienthello_renegotiate"},
{ERR_FUNC(SSL_F_TLS_PARSE_CLIENTHELLO_TLSEXT), {ERR_FUNC(SSL_F_TLS_PARSE_CLIENTHELLO_TLSEXT),
"tls_parse_clienthello_tlsext"}, "tls_parse_clienthello_tlsext"},
{ERR_FUNC(SSL_F_TLS_PARSE_CLIENTHELLO_USE_SRTP), {ERR_FUNC(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE),
"tls_parse_clienthello_use_srtp"}, "tls_parse_client_key_share"},
{ERR_FUNC(SSL_F_TLS_PARSE_CLIENT_RENEGOTIATE),
"tls_parse_client_renegotiate"},
{ERR_FUNC(SSL_F_TLS_PARSE_CLIENT_USE_SRTP), "tls_parse_client_use_srtp"},
{ERR_FUNC(SSL_F_TLS_POST_PROCESS_CLIENT_HELLO), {ERR_FUNC(SSL_F_TLS_POST_PROCESS_CLIENT_HELLO),
"tls_post_process_client_hello"}, "tls_post_process_client_hello"},
{ERR_FUNC(SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE), {ERR_FUNC(SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE),

28
ssl/statem/extensions.c
View File

@ -29,7 +29,7 @@ typedef struct {
static const EXTENSION_DEFINITION ext_defs[] = { static const EXTENSION_DEFINITION ext_defs[] = {
{ {
TLSEXT_TYPE_renegotiate, TLSEXT_TYPE_renegotiate,
tls_parse_clienthello_renegotiate, tls_parse_client_renegotiate,
NULL, NULL,
tls_construct_server_renegotiate, tls_construct_server_renegotiate,
NULL, NULL,
@ -38,7 +38,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
}, },
{ {
TLSEXT_TYPE_server_name, TLSEXT_TYPE_server_name,
tls_parse_clienthello_server_name, tls_parse_client_server_name,
NULL, NULL,
tls_construct_server_server_name, tls_construct_server_server_name,
NULL, NULL,
@ -48,7 +48,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
{ {
TLSEXT_TYPE_srp, TLSEXT_TYPE_srp,
tls_parse_clienthello_srp, tls_parse_client_srp,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -58,7 +58,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
{ {
TLSEXT_TYPE_ec_point_formats, TLSEXT_TYPE_ec_point_formats,
tls_parse_clienthello_ec_pt_formats, tls_parse_client_ec_pt_formats,
NULL, NULL,
tls_construct_server_ec_pt_formats, tls_construct_server_ec_pt_formats,
NULL, NULL,
@ -66,7 +66,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
}, },
{ {
TLSEXT_TYPE_supported_groups, TLSEXT_TYPE_supported_groups,
tls_parse_clienthello_supported_groups, tls_parse_client_supported_groups,
NULL, NULL,
NULL /* TODO(TLS1.3): Need to add this */, NULL /* TODO(TLS1.3): Need to add this */,
NULL, NULL,
@ -76,7 +76,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
#endif #endif
{ {
TLSEXT_TYPE_session_ticket, TLSEXT_TYPE_session_ticket,
tls_parse_clienthello_session_ticket, tls_parse_client_session_ticket,
NULL, NULL,
tls_construct_server_session_ticket, tls_construct_server_session_ticket,
NULL, NULL,
@ -84,7 +84,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
}, },
{ {
TLSEXT_TYPE_signature_algorithms, TLSEXT_TYPE_signature_algorithms,
tls_parse_clienthello_sig_algs, tls_parse_client_sig_algs,
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -92,7 +92,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
}, },
{ {
TLSEXT_TYPE_status_request, TLSEXT_TYPE_status_request,
tls_parse_clienthello_status_request, tls_parse_client_status_request,
NULL, NULL,
tls_construct_server_status_request, tls_construct_server_status_request,
NULL, NULL,
@ -102,7 +102,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
#ifndef OPENSSL_NO_NEXTPROTONEG #ifndef OPENSSL_NO_NEXTPROTONEG
{ {
TLSEXT_TYPE_next_proto_neg, TLSEXT_TYPE_next_proto_neg,
tls_parse_clienthello_npn, tls_parse_client_npn,
NULL, NULL,
tls_construct_server_next_proto_neg, tls_construct_server_next_proto_neg,
NULL, NULL,
@ -111,7 +111,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
#endif #endif
{ {
TLSEXT_TYPE_application_layer_protocol_negotiation, TLSEXT_TYPE_application_layer_protocol_negotiation,
tls_parse_clienthello_alpn, tls_parse_client_alpn,
NULL, NULL,
tls_construct_server_alpn, tls_construct_server_alpn,
NULL, NULL,
@ -121,7 +121,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
#ifndef OPENSSL_NO_SRTP #ifndef OPENSSL_NO_SRTP
{ {
TLSEXT_TYPE_use_srtp, TLSEXT_TYPE_use_srtp,
tls_parse_clienthello_use_srtp, tls_parse_client_use_srtp,
NULL, NULL,
tls_construct_server_use_srtp, tls_construct_server_use_srtp,
NULL, NULL,
@ -131,7 +131,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
#endif #endif
{ {
TLSEXT_TYPE_encrypt_then_mac, TLSEXT_TYPE_encrypt_then_mac,
tls_parse_clienthello_etm, tls_parse_client_etm,
NULL, NULL,
tls_construct_server_etm, tls_construct_server_etm,
NULL, NULL,
@ -153,7 +153,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
}, },
{ {
TLSEXT_TYPE_extended_master_secret, TLSEXT_TYPE_extended_master_secret,
tls_parse_clienthello_ems, tls_parse_client_ems,
NULL, NULL,
tls_construct_server_ems, tls_construct_server_ems,
NULL, NULL,
@ -179,7 +179,7 @@ static const EXTENSION_DEFINITION ext_defs[] = {
}, },
{ {
TLSEXT_TYPE_key_share, TLSEXT_TYPE_key_share,
tls_parse_clienthello_key_share, tls_parse_client_key_share,
NULL, NULL,
tls_construct_server_key_share, tls_construct_server_key_share,
NULL, NULL,

62
ssl/statem/extensions_srvr.c
View File

@ -14,7 +14,7 @@
/* /*
* Parse the client's renegotiation binding and abort if it's not right * Parse the client's renegotiation binding and abort if it's not right
*/ */
int tls_parse_clienthello_renegotiate(SSL *s, PACKET *pkt, int *al) int tls_parse_client_renegotiate(SSL *s, PACKET *pkt, int *al)
{ {
unsigned int ilen; unsigned int ilen;
const unsigned char *data; const unsigned char *data;
@ -22,7 +22,7 @@ int tls_parse_clienthello_renegotiate(SSL *s, PACKET *pkt, int *al)
/* Parse the length byte */ /* Parse the length byte */
if (!PACKET_get_1(pkt, &ilen) if (!PACKET_get_1(pkt, &ilen)
|| !PACKET_get_bytes(pkt, &data, ilen)) { || !PACKET_get_bytes(pkt, &data, ilen)) {
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_RENEGOTIATE, SSLerr(SSL_F_TLS_PARSE_CLIENT_RENEGOTIATE,
SSL_R_RENEGOTIATION_ENCODING_ERR); SSL_R_RENEGOTIATION_ENCODING_ERR);
*al = SSL_AD_ILLEGAL_PARAMETER; *al = SSL_AD_ILLEGAL_PARAMETER;
return 0; return 0;
@ -30,7 +30,7 @@ int tls_parse_clienthello_renegotiate(SSL *s, PACKET *pkt, int *al)
/* Check that the extension matches */ /* Check that the extension matches */
if (ilen != s->s3->previous_client_finished_len) { if (ilen != s->s3->previous_client_finished_len) {
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_RENEGOTIATE, SSLerr(SSL_F_TLS_PARSE_CLIENT_RENEGOTIATE,
SSL_R_RENEGOTIATION_MISMATCH); SSL_R_RENEGOTIATION_MISMATCH);
*al = SSL_AD_HANDSHAKE_FAILURE; *al = SSL_AD_HANDSHAKE_FAILURE;
return 0; return 0;
@ -38,7 +38,7 @@ int tls_parse_clienthello_renegotiate(SSL *s, PACKET *pkt, int *al)
if (memcmp(data, s->s3->previous_client_finished, if (memcmp(data, s->s3->previous_client_finished,
s->s3->previous_client_finished_len)) { s->s3->previous_client_finished_len)) {
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_RENEGOTIATE, SSLerr(SSL_F_TLS_PARSE_CLIENT_RENEGOTIATE,
SSL_R_RENEGOTIATION_MISMATCH); SSL_R_RENEGOTIATION_MISMATCH);
*al = SSL_AD_HANDSHAKE_FAILURE; *al = SSL_AD_HANDSHAKE_FAILURE;
return 0; return 0;
@ -49,7 +49,7 @@ int tls_parse_clienthello_renegotiate(SSL *s, PACKET *pkt, int *al)
return 1; return 1;
} }
int tls_parse_clienthello_server_name(SSL *s, PACKET *pkt, int *al) int tls_parse_client_server_name(SSL *s, PACKET *pkt, int *al)
{ {
unsigned int servname_type; unsigned int servname_type;
PACKET sni, hostname; PACKET sni, hostname;
@ -135,7 +135,7 @@ int tls_parse_clienthello_server_name(SSL *s, PACKET *pkt, int *al)
} }
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
int tls_parse_clienthello_srp(SSL *s, PACKET *pkt, int *al) int tls_parse_client_srp(SSL *s, PACKET *pkt, int *al)
{ {
PACKET srp_I; PACKET srp_I;
@ -159,7 +159,7 @@ int tls_parse_clienthello_srp(SSL *s, PACKET *pkt, int *al)
#endif #endif
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
int tls_parse_clienthello_ec_pt_formats(SSL *s, PACKET *pkt, int *al) int tls_parse_client_ec_pt_formats(SSL *s, PACKET *pkt, int *al)
{ {
PACKET ec_point_format_list; PACKET ec_point_format_list;
@ -182,7 +182,7 @@ int tls_parse_clienthello_ec_pt_formats(SSL *s, PACKET *pkt, int *al)
} }
#endif /* OPENSSL_NO_EC */ #endif /* OPENSSL_NO_EC */
int tls_parse_clienthello_session_ticket(SSL *s, PACKET *pkt, int *al) int tls_parse_client_session_ticket(SSL *s, PACKET *pkt, int *al)
{ {
if (s->tls_session_ticket_ext_cb && if (s->tls_session_ticket_ext_cb &&
!s->tls_session_ticket_ext_cb(s, PACKET_data(pkt), !s->tls_session_ticket_ext_cb(s, PACKET_data(pkt),
@ -195,7 +195,7 @@ int tls_parse_clienthello_session_ticket(SSL *s, PACKET *pkt, int *al)
return 1; return 1;
} }
int tls_parse_clienthello_sig_algs(SSL *s, PACKET *pkt, int *al) int tls_parse_client_sig_algs(SSL *s, PACKET *pkt, int *al)
{ {
PACKET supported_sig_algs; PACKET supported_sig_algs;
@ -215,7 +215,7 @@ int tls_parse_clienthello_sig_algs(SSL *s, PACKET *pkt, int *al)
return 1; return 1;
} }
int tls_parse_clienthello_status_request(SSL *s, PACKET *pkt, int *al) int tls_parse_client_status_request(SSL *s, PACKET *pkt, int *al)
{ {
if (!PACKET_get_1(pkt, (unsigned int *)&s->tlsext_status_type)) { if (!PACKET_get_1(pkt, (unsigned int *)&s->tlsext_status_type)) {
*al = SSL_AD_DECODE_ERROR; *al = SSL_AD_DECODE_ERROR;
@ -310,7 +310,7 @@ int tls_parse_clienthello_status_request(SSL *s, PACKET *pkt, int *al)
} }
#ifndef OPENSSL_NO_NEXTPROTONEG #ifndef OPENSSL_NO_NEXTPROTONEG
int tls_parse_clienthello_npn(SSL *s, PACKET *pkt, int *al) int tls_parse_client_npn(SSL *s, PACKET *pkt, int *al)
{ {
if (s->s3->tmp.finish_md_len == 0) { if (s->s3->tmp.finish_md_len == 0) {
/*- /*-
@ -343,7 +343,7 @@ int tls_parse_clienthello_npn(SSL *s, PACKET *pkt, int *al)
* al: a pointer to the alert value to send in the event of a failure. * al: a pointer to the alert value to send in the event of a failure.
* returns: 1 on success, 0 on error. * returns: 1 on success, 0 on error.
*/ */
int tls_parse_clienthello_alpn(SSL *s, PACKET *pkt, int *al) int tls_parse_client_alpn(SSL *s, PACKET *pkt, int *al)
{ {
PACKET protocol_list, save_protocol_list, protocol; PACKET protocol_list, save_protocol_list, protocol;
@ -376,7 +376,7 @@ int tls_parse_clienthello_alpn(SSL *s, PACKET *pkt, int *al)
} }
#ifndef OPENSSL_NO_SRTP #ifndef OPENSSL_NO_SRTP
int tls_parse_clienthello_use_srtp(SSL *s, PACKET *pkt, int *al) int tls_parse_client_use_srtp(SSL *s, PACKET *pkt, int *al)
{ {
SRTP_PROTECTION_PROFILE *sprof; SRTP_PROTECTION_PROFILE *sprof;
STACK_OF(SRTP_PROTECTION_PROFILE) *srvr; STACK_OF(SRTP_PROTECTION_PROFILE) *srvr;
@ -391,7 +391,7 @@ int tls_parse_clienthello_use_srtp(SSL *s, PACKET *pkt, int *al)
/* Pull off the length of the cipher suite list and check it is even */ /* Pull off the length of the cipher suite list and check it is even */
if (!PACKET_get_net_2(pkt, &ct) if (!PACKET_get_net_2(pkt, &ct)
|| (ct & 1) != 0 || !PACKET_get_sub_packet(pkt, &subpkt, ct)) { || (ct & 1) != 0 || !PACKET_get_sub_packet(pkt, &subpkt, ct)) {
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_USE_SRTP, SSLerr(SSL_F_TLS_PARSE_CLIENT_USE_SRTP,
SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST); SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
*al = SSL_AD_DECODE_ERROR; *al = SSL_AD_DECODE_ERROR;
return 0; return 0;
@ -404,7 +404,7 @@ int tls_parse_clienthello_use_srtp(SSL *s, PACKET *pkt, int *al)
while (PACKET_remaining(&subpkt)) { while (PACKET_remaining(&subpkt)) {
if (!PACKET_get_net_2(&subpkt, &id)) { if (!PACKET_get_net_2(&subpkt, &id)) {
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_USE_SRTP, SSLerr(SSL_F_TLS_PARSE_CLIENT_USE_SRTP,
SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST); SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
*al = SSL_AD_DECODE_ERROR; *al = SSL_AD_DECODE_ERROR;
return 0; return 0;
@ -430,7 +430,7 @@ int tls_parse_clienthello_use_srtp(SSL *s, PACKET *pkt, int *al)
* Now extract the MKI value as a sanity check, but discard it for now * Now extract the MKI value as a sanity check, but discard it for now
*/ */
if (!PACKET_get_1(pkt, &mki_len)) { if (!PACKET_get_1(pkt, &mki_len)) {
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_USE_SRTP, SSLerr(SSL_F_TLS_PARSE_CLIENT_USE_SRTP,
SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST); SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST);
*al = SSL_AD_DECODE_ERROR; *al = SSL_AD_DECODE_ERROR;
return 0; return 0;
@ -438,7 +438,7 @@ int tls_parse_clienthello_use_srtp(SSL *s, PACKET *pkt, int *al)
if (!PACKET_forward(pkt, mki_len) if (!PACKET_forward(pkt, mki_len)
|| PACKET_remaining(pkt)) { || PACKET_remaining(pkt)) {
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_USE_SRTP, SSL_R_BAD_SRTP_MKI_VALUE); SSLerr(SSL_F_TLS_PARSE_CLIENT_USE_SRTP, SSL_R_BAD_SRTP_MKI_VALUE);
*al = SSL_AD_DECODE_ERROR; *al = SSL_AD_DECODE_ERROR;
return 0; return 0;
} }
@ -447,7 +447,7 @@ int tls_parse_clienthello_use_srtp(SSL *s, PACKET *pkt, int *al)
} }
#endif #endif
int tls_parse_clienthello_etm(SSL *s, PACKET *pkt, int *al) int tls_parse_client_etm(SSL *s, PACKET *pkt, int *al)
{ {
if (!(s->options & SSL_OP_NO_ENCRYPT_THEN_MAC)) if (!(s->options & SSL_OP_NO_ENCRYPT_THEN_MAC))
s->s3->flags |= TLS1_FLAGS_ENCRYPT_THEN_MAC; s->s3->flags |= TLS1_FLAGS_ENCRYPT_THEN_MAC;
@ -489,7 +489,7 @@ static int check_in_list(SSL *s, unsigned int group_id,
* the raw PACKET data for the extension. Returns 1 on success or 0 on failure. * the raw PACKET data for the extension. Returns 1 on success or 0 on failure.
* If a failure occurs then |*al| is set to an appropriate alert value. * If a failure occurs then |*al| is set to an appropriate alert value.
*/ */
int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al) int tls_parse_client_key_share(SSL *s, PACKET *pkt, int *al)
{ {
unsigned int group_id; unsigned int group_id;
PACKET key_share_list, encoded_pt; PACKET key_share_list, encoded_pt;
@ -504,27 +504,27 @@ int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al)
/* Sanity check */ /* Sanity check */
if (s->s3->peer_tmp != NULL) { if (s->s3->peer_tmp != NULL) {
*al = SSL_AD_INTERNAL_ERROR; *al = SSL_AD_INTERNAL_ERROR;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE, ERR_R_INTERNAL_ERROR);
return 0; return 0;
} }
if (!PACKET_as_length_prefixed_2(pkt, &key_share_list)) { if (!PACKET_as_length_prefixed_2(pkt, &key_share_list)) {
*al = SSL_AD_HANDSHAKE_FAILURE; *al = SSL_AD_HANDSHAKE_FAILURE;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, SSL_R_LENGTH_MISMATCH); SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE, SSL_R_LENGTH_MISMATCH);
return 0; return 0;
} }
/* Get our list of supported curves */ /* Get our list of supported curves */
if (!tls1_get_curvelist(s, 0, &srvrcurves, &srvr_num_curves)) { if (!tls1_get_curvelist(s, 0, &srvrcurves, &srvr_num_curves)) {
*al = SSL_AD_INTERNAL_ERROR; *al = SSL_AD_INTERNAL_ERROR;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE, ERR_R_INTERNAL_ERROR);
return 0; return 0;
} }
/* Get the clients list of supported curves */ /* Get the clients list of supported curves */
if (!tls1_get_curvelist(s, 1, &clntcurves, &clnt_num_curves)) { if (!tls1_get_curvelist(s, 1, &clntcurves, &clnt_num_curves)) {
*al = SSL_AD_INTERNAL_ERROR; *al = SSL_AD_INTERNAL_ERROR;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE, ERR_R_INTERNAL_ERROR);
return 0; return 0;
} }
@ -533,7 +533,7 @@ int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al)
|| !PACKET_get_length_prefixed_2(&key_share_list, &encoded_pt) || !PACKET_get_length_prefixed_2(&key_share_list, &encoded_pt)
|| PACKET_remaining(&encoded_pt) == 0) { || PACKET_remaining(&encoded_pt) == 0) {
*al = SSL_AD_HANDSHAKE_FAILURE; *al = SSL_AD_HANDSHAKE_FAILURE;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE,
SSL_R_LENGTH_MISMATCH); SSL_R_LENGTH_MISMATCH);
return 0; return 0;
} }
@ -548,7 +548,7 @@ int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al)
/* Check if this share is in supported_groups sent from client */ /* Check if this share is in supported_groups sent from client */
if (!check_in_list(s, group_id, clntcurves, clnt_num_curves, 0)) { if (!check_in_list(s, group_id, clntcurves, clnt_num_curves, 0)) {
*al = SSL_AD_HANDSHAKE_FAILURE; *al = SSL_AD_HANDSHAKE_FAILURE;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, SSL_R_BAD_KEY_SHARE); SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE, SSL_R_BAD_KEY_SHARE);
return 0; return 0;
} }
@ -562,7 +562,7 @@ int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al)
if (group_nid == 0) { if (group_nid == 0) {
*al = SSL_AD_INTERNAL_ERROR; *al = SSL_AD_INTERNAL_ERROR;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE,
SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS); SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS);
return 0; return 0;
} }
@ -573,7 +573,7 @@ int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al)
if (key == NULL || !EVP_PKEY_set_type(key, group_nid)) { if (key == NULL || !EVP_PKEY_set_type(key, group_nid)) {
*al = SSL_AD_INTERNAL_ERROR; *al = SSL_AD_INTERNAL_ERROR;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, ERR_R_EVP_LIB); SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE, ERR_R_EVP_LIB);
EVP_PKEY_free(key); EVP_PKEY_free(key);
return 0; return 0;
} }
@ -587,7 +587,7 @@ int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al)
group_nid) <= 0 group_nid) <= 0
|| EVP_PKEY_paramgen(pctx, &s->s3->peer_tmp) <= 0) { || EVP_PKEY_paramgen(pctx, &s->s3->peer_tmp) <= 0) {
*al = SSL_AD_INTERNAL_ERROR; *al = SSL_AD_INTERNAL_ERROR;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, ERR_R_EVP_LIB); SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE, ERR_R_EVP_LIB);
EVP_PKEY_CTX_free(pctx); EVP_PKEY_CTX_free(pctx);
return 0; return 0;
} }
@ -600,7 +600,7 @@ int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al)
PACKET_data(&encoded_pt), PACKET_data(&encoded_pt),
PACKET_remaining(&encoded_pt))) { PACKET_remaining(&encoded_pt))) {
*al = SSL_AD_DECODE_ERROR; *al = SSL_AD_DECODE_ERROR;
SSLerr(SSL_F_TLS_PARSE_CLIENTHELLO_KEY_SHARE, SSL_R_BAD_ECPOINT); SSLerr(SSL_F_TLS_PARSE_CLIENT_KEY_SHARE, SSL_R_BAD_ECPOINT);
return 0; return 0;
} }
@ -611,7 +611,7 @@ int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al)
} }
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
int tls_parse_clienthello_supported_groups(SSL *s, PACKET *pkt, int *al) int tls_parse_client_supported_groups(SSL *s, PACKET *pkt, int *al)
{ {
PACKET supported_groups_list; PACKET supported_groups_list;
@ -635,7 +635,7 @@ int tls_parse_clienthello_supported_groups(SSL *s, PACKET *pkt, int *al)
} }
#endif #endif
int tls_parse_clienthello_ems(SSL *s, PACKET *pkt, int *al) int tls_parse_client_ems(SSL *s, PACKET *pkt, int *al)
{ {
/* The extension must always be empty */ /* The extension must always be empty */
if (PACKET_remaining(pkt) != 0) { if (PACKET_remaining(pkt) != 0) {

28
ssl/statem/statem_locl.h
View File

@ -157,28 +157,28 @@ __owur int tls_construct_extensions(SSL *s, WPACKET *pkt, unsigned int context,
int *al); int *al);
/* Server Extension processing */ /* Server Extension processing */
int tls_parse_clienthello_renegotiate(SSL *s, PACKET *pkt, int *al); int tls_parse_client_renegotiate(SSL *s, PACKET *pkt, int *al);
int tls_parse_clienthello_server_name(SSL *s, PACKET *pkt, int *al); int tls_parse_client_server_name(SSL *s, PACKET *pkt, int *al);
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
int tls_parse_clienthello_srp(SSL *s, PACKET *pkt, int *al); int tls_parse_client_srp(SSL *s, PACKET *pkt, int *al);
#endif #endif
#ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_EC
int tls_parse_clienthello_ec_pt_formats(SSL *s, PACKET *pkt, int *al); int tls_parse_client_ec_pt_formats(SSL *s, PACKET *pkt, int *al);
int tls_parse_clienthello_supported_groups(SSL *s, PACKET *pkt, int *al); int tls_parse_client_supported_groups(SSL *s, PACKET *pkt, int *al);
#endif #endif
int tls_parse_clienthello_session_ticket(SSL *s, PACKET *pkt, int *al); int tls_parse_client_session_ticket(SSL *s, PACKET *pkt, int *al);
int tls_parse_clienthello_sig_algs(SSL *s, PACKET *pkt, int *al); int tls_parse_client_sig_algs(SSL *s, PACKET *pkt, int *al);
int tls_parse_clienthello_status_request(SSL *s, PACKET *pkt, int *al); int tls_parse_client_status_request(SSL *s, PACKET *pkt, int *al);
#ifndef OPENSSL_NO_NEXTPROTONEG #ifndef OPENSSL_NO_NEXTPROTONEG
int tls_parse_clienthello_npn(SSL *s, PACKET *pkt, int *al); int tls_parse_client_npn(SSL *s, PACKET *pkt, int *al);
#endif #endif
int tls_parse_clienthello_alpn(SSL *s, PACKET *pkt, int *al); int tls_parse_client_alpn(SSL *s, PACKET *pkt, int *al);
#ifndef OPENSSL_NO_SRTP #ifndef OPENSSL_NO_SRTP
int tls_parse_clienthello_use_srtp(SSL *s, PACKET *pkt, int *al); int tls_parse_client_use_srtp(SSL *s, PACKET *pkt, int *al);
#endif #endif
int tls_parse_clienthello_etm(SSL *s, PACKET *pkt, int *al); int tls_parse_client_etm(SSL *s, PACKET *pkt, int *al);
int tls_parse_clienthello_key_share(SSL *s, PACKET *pkt, int *al); int tls_parse_client_key_share(SSL *s, PACKET *pkt, int *al);
int tls_parse_clienthello_ems(SSL *s, PACKET *pkt, int *al); int tls_parse_client_ems(SSL *s, PACKET *pkt, int *al);
int tls_construct_server_renegotiate(SSL *s, WPACKET *pkt, int *al); int tls_construct_server_renegotiate(SSL *s, WPACKET *pkt, int *al);
int tls_construct_server_server_name(SSL *s, WPACKET *pkt, int *al); int tls_construct_server_server_name(SSL *s, WPACKET *pkt, int *al);