commit 8baf9635236802032cb4889ecf7b8049d916728f
author David Benjamin <davidben@google.com> Thu Nov 17 17:11:16 2016 +0900
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Tue Dec 06 19:53:25 2016 +0000
tree db3a5172c85f086c44469648c95e0a609b9a1ce9
parent 6773972ff69742f7805139729dd327e266ad10c6

Pass explicit hs parameters to ssl_ext_*.

Change-Id: I84a8ff1d717f3291403f6fc49668c84f89b910da
Reviewed-on: https://boringssl-review.googlesource.com/12342
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/tls13_server.c

diff --git a/ssl/tls13_server.c b/ssl/tls13_server.c
index c1af999..9778610 100644
--- a/ssl/tls13_server.c
+++ b/ssl/tls13_server.c
@@ -71,7 +71,7 @@
   uint8_t *dhe_secret;
   size_t dhe_secret_len;
   uint8_t alert = SSL_AD_DECODE_ERROR;
-  if (!ssl_ext_key_share_parse_clienthello(ssl, &found_key_share, &dhe_secret,
+  if (!ssl_ext_key_share_parse_clienthello(hs, &found_key_share, &dhe_secret,
                                            &dhe_secret_len, &alert,
                                            &key_share)) {
     ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
@@ -223,7 +223,7 @@
       return ssl_hs_error;
     }
 
-    if (!ssl_ext_pre_shared_key_parse_clienthello(ssl, &session, &binders,
+    if (!ssl_ext_pre_shared_key_parse_clienthello(hs, &session, &binders,
                                                   &alert, &pre_shared_key)) {
       ssl3_send_alert(ssl, SSL3_AL_FATAL, alert);
       return ssl_hs_error;
@@ -388,8 +388,8 @@
       !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) ||
-      !ssl_ext_pre_shared_key_add_serverhello(ssl, &extensions) ||
-      !ssl_ext_key_share_add_serverhello(ssl, &extensions) ||
+      !ssl_ext_pre_shared_key_add_serverhello(hs, &extensions) ||
+      !ssl_ext_key_share_add_serverhello(hs, &extensions) ||
       !ssl_complete_message(ssl, &cbb)) {
     goto err;
   }