Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Side by Side Diff: net/socket/ssl_client_socket_impl.cc

Issue 2013303002: Update Token Binding code to draft 06 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | net/ssl/token_binding.cc » ('j') | net/ssl/token_binding.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/ssl_client_socket_impl.h" 5 #include "net/socket/ssl_client_socket_impl.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <openssl/bio.h> 8 #include <openssl/bio.h>
9 #include <openssl/bytestring.h> 9 #include <openssl/bytestring.h>
10 #include <openssl/err.h> 10 #include <openssl/err.h>
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 const char kDefaultSupportedNPNProtocol[] = "http/1.1"; 73 const char kDefaultSupportedNPNProtocol[] = "http/1.1";
74 74
75 // Default size of the internal BoringSSL buffers. 75 // Default size of the internal BoringSSL buffers.
76 const int KDefaultOpenSSLBufferSize = 17 * 1024; 76 const int KDefaultOpenSSLBufferSize = 17 * 1024;
77 77
78 // TLS extension number use for Token Binding. 78 // TLS extension number use for Token Binding.
79 const unsigned int kTbExtNum = 24; 79 const unsigned int kTbExtNum = 24;
80 80
81 // Token Binding ProtocolVersions supported. 81 // Token Binding ProtocolVersions supported.
82 const uint8_t kTbProtocolVersionMajor = 0; 82 const uint8_t kTbProtocolVersionMajor = 0;
83 const uint8_t kTbProtocolVersionMinor = 5; 83 const uint8_t kTbProtocolVersionMinor = 6;
84 const uint8_t kTbMinProtocolVersionMajor = 0; 84 const uint8_t kTbMinProtocolVersionMajor = 0;
85 const uint8_t kTbMinProtocolVersionMinor = 3; 85 const uint8_t kTbMinProtocolVersionMinor = 6;
davidben 2016/06/27 23:39:14 [I am assuming the signature format is the only ch
nharper 2016/06/27 23:58:30 None of the technical details changed, but the sig
86 86
87 bool EVP_MDToPrivateKeyHash(const EVP_MD* md, SSLPrivateKey::Hash* hash) { 87 bool EVP_MDToPrivateKeyHash(const EVP_MD* md, SSLPrivateKey::Hash* hash) {
88 switch (EVP_MD_type(md)) { 88 switch (EVP_MD_type(md)) {
89 case NID_md5_sha1: 89 case NID_md5_sha1:
90 *hash = SSLPrivateKey::Hash::MD5_SHA1; 90 *hash = SSLPrivateKey::Hash::MD5_SHA1;
91 return true; 91 return true;
92 case NID_sha1: 92 case NID_sha1:
93 *hash = SSLPrivateKey::Hash::SHA1; 93 *hash = SSLPrivateKey::Hash::SHA1;
94 return true; 94 return true;
95 case NID_sha256: 95 case NID_sha256:
(...skipping 2194 matching lines...) Expand 10 before | Expand all | Expand 10 after
2290 if (rv != OK) { 2290 if (rv != OK) {
2291 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv); 2291 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
2292 return; 2292 return;
2293 } 2293 }
2294 2294
2295 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, 2295 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT,
2296 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this))); 2296 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this)));
2297 } 2297 }
2298 2298
2299 } // namespace net 2299 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/ssl/token_binding.cc » ('j') | net/ssl/token_binding.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698