commit d89ec688f2296f41b4999b9db6e8bfba79c18050
author David Benjamin <davidben@google.com> Tue May 18 16:44:40 2021 -0400
committer Adam Langley <agl@google.com> Wed May 19 16:58:18 2021 +0000
tree d1230991901d79b904e1fb9b2fbb268e0b4191d1
parent aaecb82c6b805849a12c43f097959b265c0d977b

Remove draft tokbind implementation.

We didn't end up deploying this. We also never implemented the final
RFC, so what we do have isn't useful for someone who wishes to deploy
it anyway.

Update-Note: Token binding APIs are removed.
Change-Id: Iecea7c3dcf9d3e2644a3b7afaf61511310b45d5f
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/47584
Reviewed-by: Adam Langley <agl@google.com>

ssl/tls13_client.cc

diff --git a/ssl/tls13_client.cc b/ssl/tls13_client.cc
index 0fd6567..b4d56ea 100644
--- a/ssl/tls13_client.cc
+++ b/ssl/tls13_client.cc
@@ -501,9 +501,9 @@
       ssl_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);
       return ssl_hs_error;
     }
-    // Channel ID and Token Binding are incompatible with 0-RTT. The ALPS
-    // extension should be negotiated implicitly.
-    if (ssl->s3->channel_id_valid || ssl->s3->token_binding_negotiated ||
+    // Channel ID is incompatible with 0-RTT. The ALPS extension should be
+    // negotiated implicitly.
+    if (ssl->s3->channel_id_valid ||
         hs->new_session->has_application_settings) {
       OPENSSL_PUT_ERROR(SSL, SSL_R_UNEXPECTED_EXTENSION_ON_EARLY_DATA);
       ssl_send_alert(ssl, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER);