kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prefix ext_key_share methods.

Browse Source 
Change-Id: Id6a7443246479c62cbe0024e2131a2013959e21e
Reviewed-on: https://boringssl-review.googlesource.com/9078
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
Steven Valdez 2016-08-02 16:55:05 -04:00 committed by CQ bot account: commit-bot@chromium.org
parent 7b689f6b9e
commit 7259f2fd08
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ssl/internal.h
View File

@ -926,14 +926,14 @@ enum ssl_private_key_result_t tls13_prepare_certificate_verify(
SSL *ssl, int is_first_run); SSL *ssl, int is_first_run);
int tls13_prepare_finished(SSL *ssl); int tls13_prepare_finished(SSL *ssl);
int ext_key_share_parse_serverhello(SSL *ssl, uint8_t **out_secret, int ssl_ext_key_share_parse_serverhello(SSL *ssl, uint8_t **out_secret,
size_t *out_secret_len, uint8_t *out_alert, size_t *out_secret_len,
CBS *contents); uint8_t *out_alert, CBS *contents);
int ext_key_share_parse_clienthello(SSL *ssl, int ssl_ext_key_share_parse_clienthello(SSL *ssl, int *out_found,
int *out_found, uint8_t **out_secret, uint8_t **out_secret,
size_t *out_secret_len, uint8_t *out_alert, size_t *out_secret_len,
CBS *contents); uint8_t *out_alert, CBS *contents);
int ext_key_share_add_serverhello(SSL *ssl, CBB *out); int ssl_ext_key_share_add_serverhello(SSL *ssl, CBB *out);
int ssl_add_client_hello_body(SSL *ssl, CBB *body); int ssl_add_client_hello_body(SSL *ssl, CBB *body);

14
ssl/t1_lib.c
View File

@ -2031,9 +2031,9 @@ static int ext_key_share_add_clienthello(SSL *ssl, CBB *out) {
return CBB_flush(out); return CBB_flush(out);
} }
int ext_key_share_parse_serverhello(SSL *ssl, uint8_t **out_secret, int ssl_ext_key_share_parse_serverhello(SSL *ssl, uint8_t **out_secret,
size_t *out_secret_len, uint8_t *out_alert, size_t *out_secret_len,
CBS *contents) { uint8_t *out_alert, CBS *contents) {
CBS peer_key; CBS peer_key;
uint16_t group; uint16_t group;
if (!CBS_get_u16(contents, &group) || if (!CBS_get_u16(contents, &group) ||
@ -2067,10 +2067,10 @@ int ext_key_share_parse_serverhello(SSL *ssl, uint8_t **out_secret,
return 1; return 1;
} }
int ext_key_share_parse_clienthello(SSL *ssl, int *out_found, int ssl_ext_key_share_parse_clienthello(SSL *ssl, int *out_found,
uint8_t **out_secret, uint8_t **out_secret,
size_t *out_secret_len, uint8_t *out_alert, size_t *out_secret_len,
CBS *contents) { uint8_t *out_alert, CBS *contents) {
uint16_t group_id; uint16_t group_id;
CBS key_shares; CBS key_shares;
if (!tls1_get_shared_group(ssl, &group_id) || if (!tls1_get_shared_group(ssl, &group_id) ||
@ -2114,7 +2114,7 @@ int ext_key_share_parse_clienthello(SSL *ssl, int *out_found,
return 1; return 1;
} }
int ext_key_share_add_serverhello(SSL *ssl, CBB *out) { int ssl_ext_key_share_add_serverhello(SSL *ssl, CBB *out) {
if (ssl->s3->tmp.new_cipher->algorithm_mkey != SSL_kECDHE) { if (ssl->s3->tmp.new_cipher->algorithm_mkey != SSL_kECDHE) {
return 1; return 1;
} }

2
ssl/tls13_client.c
View File

@ -238,7 +238,7 @@ static enum ssl_hs_wait_t do_process_server_hello(SSL *ssl, SSL_HANDSHAKE *hs) {
uint8_t *dhe_secret; uint8_t *dhe_secret;
size_t dhe_secret_len; size_t dhe_secret_len;
uint8_t alert = SSL_AD_DECODE_ERROR; uint8_t alert = SSL_AD_DECODE_ERROR;
if (!ext_key_share_parse_serverhello(ssl, &dhe_secret, &dhe_secret_len, if (!ssl_ext_key_share_parse_serverhello(ssl, &dhe_secret, &dhe_secret_len,
&alert, &key_share)) { &alert, &key_share)) {
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert); ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
return ssl_hs_error; return ssl_hs_error;

7
ssl/tls13_server.c
View File

@ -84,8 +84,9 @@ static int resolve_ecdhe_secret(SSL *ssl, int *out_need_retry,
uint8_t *dhe_secret; uint8_t *dhe_secret;
size_t dhe_secret_len; size_t dhe_secret_len;
uint8_t alert; uint8_t alert;
if (!ext_key_share_parse_clienthello(ssl, &found_key_share, &dhe_secret, if (!ssl_ext_key_share_parse_clienthello(ssl, &found_key_share, &dhe_secret,
&dhe_secret_len, &alert, &key_share)) { &dhe_secret_len, &alert,
&key_share)) {
ssl3_send_alert(ssl, SSL3_AL_FATAL, alert); ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
return 0; return 0;
} }
@ -311,7 +312,7 @@ static enum ssl_hs_wait_t do_send_server_hello(SSL *ssl, SSL_HANDSHAKE *hs) {
!CBB_add_bytes(&body, ssl->s3->server_random, SSL3_RANDOM_SIZE) || !CBB_add_bytes(&body, ssl->s3->server_random, SSL3_RANDOM_SIZE) ||
!CBB_add_u16(&body, ssl_cipher_get_value(ssl->s3->tmp.new_cipher)) || !CBB_add_u16(&body, ssl_cipher_get_value(ssl->s3->tmp.new_cipher)) ||
!CBB_add_u16_length_prefixed(&body, &extensions) || !CBB_add_u16_length_prefixed(&body, &extensions) ||
!ext_key_share_add_serverhello(ssl, &extensions) || !ssl_ext_key_share_add_serverhello(ssl, &extensions) ||
!ssl->method->finish_message(ssl, &cbb)) { !ssl->method->finish_message(ssl, &cbb)) {
CBB_cleanup(&cbb); CBB_cleanup(&cbb);
return ssl_hs_error; return ssl_hs_error;