commit 7259f2fd08745f3796dadfd7144fcb3ad93ec286
author Steven Valdez <svaldez@google.com> Tue Aug 02 16:55:05 2016 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Aug 02 23:13:29 2016 +0000
tree 374010b377da223c7affde1f4882450e13710796
parent 7b689f6b9ea4d8c1d0827a0c2bcbdd7c52ffde91

Prefix ext_key_share methods.

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>

ssl/internal.h

diff --git a/ssl/internal.h b/ssl/internal.h
index 010c1c2..22b5566 100644
--- a/ssl/internal.h
+++ b/ssl/internal.h
@@ -926,14 +926,14 @@
     SSL *ssl, int is_first_run);
 int tls13_prepare_finished(SSL *ssl);
 
-int ext_key_share_parse_serverhello(SSL *ssl, uint8_t **out_secret,
-                                    size_t *out_secret_len, uint8_t *out_alert,
-                                    CBS *contents);
-int ext_key_share_parse_clienthello(SSL *ssl,
-                                    int *out_found, uint8_t **out_secret,
-                                    size_t *out_secret_len, uint8_t *out_alert,
-                                    CBS *contents);
-int ext_key_share_add_serverhello(SSL *ssl, CBB *out);
+int ssl_ext_key_share_parse_serverhello(SSL *ssl, uint8_t **out_secret,
+                                        size_t *out_secret_len,
+                                        uint8_t *out_alert, CBS *contents);
+int ssl_ext_key_share_parse_clienthello(SSL *ssl, int *out_found,
+                                        uint8_t **out_secret,
+                                        size_t *out_secret_len,
+                                        uint8_t *out_alert, CBS *contents);
+int ssl_ext_key_share_add_serverhello(SSL *ssl, CBB *out);
 
 int ssl_add_client_hello_body(SSL *ssl, CBB *body);
 

ssl/t1_lib.c

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index c6697f6..b524d8a 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2031,9 +2031,9 @@
   return CBB_flush(out);
 }
 
-int ext_key_share_parse_serverhello(SSL *ssl, uint8_t **out_secret,
-                                    size_t *out_secret_len, uint8_t *out_alert,
-                                    CBS *contents) {
+int ssl_ext_key_share_parse_serverhello(SSL *ssl, uint8_t **out_secret,
+                                        size_t *out_secret_len,
+                                        uint8_t *out_alert, CBS *contents) {
   CBS peer_key;
   uint16_t group;
   if (!CBS_get_u16(contents, &group) ||
@@ -2067,10 +2067,10 @@
   return 1;
 }
 
-int ext_key_share_parse_clienthello(SSL *ssl, int *out_found,
-                                    uint8_t **out_secret,
-                                    size_t *out_secret_len, uint8_t *out_alert,
-                                    CBS *contents) {
+int ssl_ext_key_share_parse_clienthello(SSL *ssl, int *out_found,
+                                        uint8_t **out_secret,
+                                        size_t *out_secret_len,
+                                        uint8_t *out_alert, CBS *contents) {
   uint16_t group_id;
   CBS key_shares;
   if (!tls1_get_shared_group(ssl, &group_id) ||
@@ -2114,7 +2114,7 @@
   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) {
     return 1;
   }

ssl/tls13_client.c

diff --git a/ssl/tls13_client.c b/ssl/tls13_client.c
index b1e06d9..1ad1780 100644
--- a/ssl/tls13_client.c
+++ b/ssl/tls13_client.c
@@ -238,8 +238,8 @@
     uint8_t *dhe_secret;
     size_t dhe_secret_len;
     uint8_t alert = SSL_AD_DECODE_ERROR;
-    if (!ext_key_share_parse_serverhello(ssl, &dhe_secret, &dhe_secret_len,
-                                         &alert, &key_share)) {
+    if (!ssl_ext_key_share_parse_serverhello(ssl, &dhe_secret, &dhe_secret_len,
+                                             &alert, &key_share)) {
       ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
       return ssl_hs_error;
     }

ssl/tls13_server.c

diff --git a/ssl/tls13_server.c b/ssl/tls13_server.c
index 15e3332..d844338 100644
--- a/ssl/tls13_server.c
+++ b/ssl/tls13_server.c
@@ -84,8 +84,9 @@
   uint8_t *dhe_secret;
   size_t dhe_secret_len;
   uint8_t alert;
-  if (!ext_key_share_parse_clienthello(ssl, &found_key_share, &dhe_secret,
-                                       &dhe_secret_len, &alert, &key_share)) {
+  if (!ssl_ext_key_share_parse_clienthello(ssl, &found_key_share, &dhe_secret,
+                                           &dhe_secret_len, &alert,
+                                           &key_share)) {
     ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
     return 0;
   }
@@ -311,7 +312,7 @@
       !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_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)) {
     CBB_cleanup(&cbb);
     return ssl_hs_error;