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

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

Issue 2137193002: Update token binding code to latest drafts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary cast 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') | no next file with comments »
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 const char kDefaultSupportedNPNProtocol[] = "http/1.1"; 74 const char kDefaultSupportedNPNProtocol[] = "http/1.1";
75 75
76 // Default size of the internal BoringSSL buffers. 76 // Default size of the internal BoringSSL buffers.
77 const int KDefaultOpenSSLBufferSize = 17 * 1024; 77 const int KDefaultOpenSSLBufferSize = 17 * 1024;
78 78
79 // TLS extension number use for Token Binding. 79 // TLS extension number use for Token Binding.
80 const unsigned int kTbExtNum = 24; 80 const unsigned int kTbExtNum = 24;
81 81
82 // Token Binding ProtocolVersions supported. 82 // Token Binding ProtocolVersions supported.
83 const uint8_t kTbProtocolVersionMajor = 0; 83 const uint8_t kTbProtocolVersionMajor = 0;
84 const uint8_t kTbProtocolVersionMinor = 6; 84 const uint8_t kTbProtocolVersionMinor = 8;
85 const uint8_t kTbMinProtocolVersionMajor = 0; 85 const uint8_t kTbMinProtocolVersionMajor = 0;
86 const uint8_t kTbMinProtocolVersionMinor = 6; 86 const uint8_t kTbMinProtocolVersionMinor = 6;
87 87
88 #if !defined(OS_NACL) 88 #if !defined(OS_NACL)
89 const base::Feature kPostQuantumExperiment{"SSLPostQuantumExperiment", 89 const base::Feature kPostQuantumExperiment{"SSLPostQuantumExperiment",
90 base::FEATURE_DISABLED_BY_DEFAULT}; 90 base::FEATURE_DISABLED_BY_DEFAULT};
91 #endif 91 #endif
92 92
93 bool EVP_MDToPrivateKeyHash(const EVP_MD* md, SSLPrivateKey::Hash* hash) { 93 bool EVP_MDToPrivateKeyHash(const EVP_MD* md, SSLPrivateKey::Hash* hash) {
94 switch (EVP_MD_type(md)) { 94 switch (EVP_MD_type(md)) {
(...skipping 2222 matching lines...) Expand 10 before | Expand all | Expand 10 after
2317 if (rv != OK) { 2317 if (rv != OK) {
2318 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv); 2318 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_SSL_CONNECT, rv);
2319 return; 2319 return;
2320 } 2320 }
2321 2321
2322 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT, 2322 net_log_.EndEvent(NetLog::TYPE_SSL_CONNECT,
2323 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this))); 2323 base::Bind(&NetLogSSLInfoCallback, base::Unretained(this)));
2324 } 2324 }
2325 2325
2326 } // namespace net 2326 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/ssl/token_binding.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698