commit 4685376b2b67fe5d2bfb13f31ef23844daea7288
author David Benjamin <davidben@google.com> Tue Jul 03 14:01:26 2018 -0400
committer Adam Langley <agl@google.com> Fri Jul 06 19:49:13 2018 +0000
tree e3aaa5d1020ae0d5eb54f117a509743a14018985
parent 7bb0fbf77bc447d523199fd62ee8b419bb1c321b

Remove other unnecessary tlsext_ prefixes.

Change-Id: Ib31a12527006ff57beb99bcfd0bf1f906773e1ca
Reviewed-on: https://boringssl-review.googlesource.com/29593
Reviewed-by: Adam Langley <agl@google.com>

ssl/tls13_server.cc

diff --git a/ssl/tls13_server.cc b/ssl/tls13_server.cc
index a113504..67aa5d0 100644
--- a/ssl/tls13_server.cc
+++ b/ssl/tls13_server.cc
@@ -389,7 +389,7 @@
           // The client must have offered early data.
           hs->early_data_offered &&
           // Channel ID is incompatible with 0-RTT.
-          !ssl->s3->tlsext_channel_id_valid &&
+          !ssl->s3->channel_id_valid &&
           // If Token Binding is negotiated, reject 0-RTT.
           !ssl->s3->token_binding_negotiated &&
           // Custom extensions is incompatible with 0-RTT.
@@ -596,7 +596,7 @@
     hs->cert_request = !!(hs->config->verify_mode & SSL_VERIFY_PEER);
     // Only request a certificate if Channel ID isn't negotiated.
     if ((hs->config->verify_mode & SSL_VERIFY_PEER_IF_NO_OBC) &&
-        ssl->s3->tlsext_channel_id_valid) {
+        ssl->s3->channel_id_valid) {
       hs->cert_request = false;
     }
   }
@@ -852,7 +852,7 @@
 
 static enum ssl_hs_wait_t do_read_channel_id(SSL_HANDSHAKE *hs) {
   SSL *const ssl = hs->ssl;
-  if (!ssl->s3->tlsext_channel_id_valid) {
+  if (!ssl->s3->channel_id_valid) {
     hs->tls13_state = state_read_client_finished;
     return ssl_hs_ok;
   }