Update Token Binding code to the latest drafts

net/quic/chromium/quic_chromium_client_session.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/chromium/quic_chromium_client_session.h"
 
 #include <openssl/ssl.h>
 
 #include <utility>
 
@@ skipping 575 matching lines @@
   ssl_info->connection_status = ssl_connection_status;
   ssl_info->client_cert_sent = false;
   ssl_info->channel_id_sent = crypto_stream_->WasChannelIDSent();
   ssl_info->security_bits = security_bits;
   ssl_info->handshake_type = SSLInfo::HANDSHAKE_FULL;
   ssl_info->pinning_failure_log = pinning_failure_log_;
 
   ssl_info->UpdateCertificateTransparencyInfo(*ct_verify_result_);
 
   if (crypto_stream_->crypto_negotiated_params().token_binding_key_param ==
-      kP256) {
+      kTB10) {
     ssl_info->token_binding_negotiated = true;
     ssl_info->token_binding_key_param = TB_PARAM_ECDSAP256;
   }
 
   return true;
 }
 
 Error QuicChromiumClientSession::GetTokenBindingSignature(
     crypto::ECPrivateKey* key,
+    TokenBindingType tb_type,
     std::vector<uint8_t>* out) {
   // The same key will be used across multiple requests to sign the same value,
   // so the signature is cached.
   std::string raw_public_key;
   if (!key->ExportRawPublicKey(&raw_public_key))
     return ERR_FAILED;
   TokenBindingSignatureMap::iterator it =
-      token_binding_signatures_.Get(raw_public_key);
+      token_binding_signatures_.Get(std::make_pair(tb_type, raw_public_key));
   if (it != token_binding_signatures_.end()) {
     *out = it->second;
     return OK;
   }
 
   std::string key_material;
   if (!crypto_stream_->ExportTokenBindingKeyingMaterial(&key_material))
     return ERR_FAILED;
-  if (!SignTokenBindingEkm(key_material, key, out))
+  if (!CreateTokenBindingSignature(key_material, tb_type, key, out))
     return ERR_FAILED;
-  token_binding_signatures_.Put(raw_public_key, *out);
+  token_binding_signatures_.Put(std::make_pair(tb_type, raw_public_key), *out);
   return OK;
 }
 
 int QuicChromiumClientSession::CryptoConnect(
     bool require_confirmation,
     const CompletionCallback& callback) {
   require_confirmation_ = require_confirmation;
   connect_timing_.connect_start = base::TimeTicks::Now();
   RecordHandshakeState(STATE_STARTED);
   DCHECK(flow_controller());
@@ skipping 765 matching lines @@
 }
 
 const LoadTimingInfo::ConnectTiming&
 QuicChromiumClientSession::GetConnectTiming() {
   connect_timing_.ssl_start = connect_timing_.connect_start;
   connect_timing_.ssl_end = connect_timing_.connect_end;
   return connect_timing_;
 }
 
 }  // namespace net