commit 9f0e7cb314ae64234b928fd379381ae9760a9a5f
author David Benjamin <davidben@google.com> Thu Apr 12 15:36:30 2018 -0400
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Apr 13 18:10:44 2018 +0000
tree 09ba08adf9d76c9b8a567ed9d79b368bf39d15a5
parent b8b1a9d8de02c5b8ba7151a70c140a91877e9f6d

Move TB state to ssl->s3.

These are connection state, so they should be reset on SSL_clear.

Change-Id: I861fe52578836615d2719c9e1ff0911c798f336e
Reviewed-on: https://boringssl-review.googlesource.com/27384
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Steven Valdez <svaldez@google.com>

ssl/handshake_client.cc

diff --git a/ssl/handshake_client.cc b/ssl/handshake_client.cc
index 0b352c2..087645d 100644
--- a/ssl/handshake_client.cc
+++ b/ssl/handshake_client.cc
@@ -740,7 +740,7 @@
     return ssl_hs_error;
   }
 
-  if (ssl->token_binding_negotiated &&
+  if (ssl->s3->token_binding_negotiated &&
       (!hs->extended_master_secret || !ssl->s3->send_connection_binding)) {
     OPENSSL_PUT_ERROR(SSL, SSL_R_NEGOTIATED_TB_WITHOUT_EMS_OR_RI);
     ssl_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_UNSUPPORTED_EXTENSION);