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

Side by Side Diff: remoting/protocol/ssl_hmac_channel_authenticator.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 2 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
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 "remoting/protocol/ssl_hmac_channel_authenticator.h" 5 #include "remoting/protocol/ssl_hmac_channel_authenticator.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 class FailingCertVerifier : public net::CertVerifier { 51 class FailingCertVerifier : public net::CertVerifier {
52 public: 52 public:
53 FailingCertVerifier() {} 53 FailingCertVerifier() {}
54 ~FailingCertVerifier() override {} 54 ~FailingCertVerifier() override {}
55 55
56 int Verify(const RequestParams& params, 56 int Verify(const RequestParams& params,
57 net::CRLSet* crl_set, 57 net::CRLSet* crl_set,
58 net::CertVerifyResult* verify_result, 58 net::CertVerifyResult* verify_result,
59 const net::CompletionCallback& callback, 59 const net::CompletionCallback& callback,
60 std::unique_ptr<Request>* out_req, 60 std::unique_ptr<Request>* out_req,
61 const net::BoundNetLog& net_log) override { 61 const net::NetLogWithSource& net_log) override {
62 verify_result->verified_cert = params.certificate(); 62 verify_result->verified_cert = params.certificate();
63 verify_result->cert_status = net::CERT_STATUS_INVALID; 63 verify_result->cert_status = net::CERT_STATUS_INVALID;
64 return net::ERR_CERT_INVALID; 64 return net::ERR_CERT_INVALID;
65 } 65 }
66 }; 66 };
67 67
68 // A CTVerifier which ignores Certificate Transparency information. 68 // A CTVerifier which ignores Certificate Transparency information.
69 class IgnoresCTVerifier : public net::CTVerifier { 69 class IgnoresCTVerifier : public net::CTVerifier {
70 public: 70 public:
71 IgnoresCTVerifier() = default; 71 IgnoresCTVerifier() = default;
72 ~IgnoresCTVerifier() override = default; 72 ~IgnoresCTVerifier() override = default;
73 73
74 int Verify(net::X509Certificate* cert, 74 int Verify(net::X509Certificate* cert,
75 const std::string& stapled_ocsp_response, 75 const std::string& stapled_ocsp_response,
76 const std::string& sct_list_from_tls_extension, 76 const std::string& sct_list_from_tls_extension,
77 net::ct::CTVerifyResult* result, 77 net::ct::CTVerifyResult* result,
78 const net::BoundNetLog& net_log) override { 78 const net::NetLogWithSource& net_log) override {
79 return net::OK; 79 return net::OK;
80 } 80 }
81 81
82 void SetObserver(Observer* observer) override {} 82 void SetObserver(Observer* observer) override {}
83 }; 83 };
84 84
85 // A CTPolicyEnforcer that accepts all certificates. 85 // A CTPolicyEnforcer that accepts all certificates.
86 class IgnoresCTPolicyEnforcer : public net::CTPolicyEnforcer { 86 class IgnoresCTPolicyEnforcer : public net::CTPolicyEnforcer {
87 public: 87 public:
88 IgnoresCTPolicyEnforcer() = default; 88 IgnoresCTPolicyEnforcer() = default;
89 ~IgnoresCTPolicyEnforcer() override = default; 89 ~IgnoresCTPolicyEnforcer() override = default;
90 90
91 net::ct::CertPolicyCompliance DoesConformToCertPolicy( 91 net::ct::CertPolicyCompliance DoesConformToCertPolicy(
92 net::X509Certificate* cert, 92 net::X509Certificate* cert,
93 const net::SCTList& verified_scts, 93 const net::SCTList& verified_scts,
94 const net::BoundNetLog& net_log) override { 94 const net::NetLogWithSource& net_log) override {
95 return net::ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS; 95 return net::ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS;
96 } 96 }
97 97
98 net::ct::EVPolicyCompliance DoesConformToCTEVPolicy( 98 net::ct::EVPolicyCompliance DoesConformToCTEVPolicy(
99 net::X509Certificate* cert, 99 net::X509Certificate* cert,
100 const net::ct::EVCertsWhitelist* ev_whitelist, 100 const net::ct::EVCertsWhitelist* ev_whitelist,
101 const net::SCTList& verified_scts, 101 const net::SCTList& verified_scts,
102 const net::BoundNetLog& net_log) override { 102 const net::NetLogWithSource& net_log) override {
103 return net::ct::EVPolicyCompliance::EV_POLICY_DOES_NOT_APPLY; 103 return net::ct::EVPolicyCompliance::EV_POLICY_DOES_NOT_APPLY;
104 } 104 }
105 }; 105 };
106 106
107 // Implements net::StreamSocket interface on top of P2PStreamSocket to be passed 107 // Implements net::StreamSocket interface on top of P2PStreamSocket to be passed
108 // to net::SSLClientSocket and net::SSLServerSocket. 108 // to net::SSLClientSocket and net::SSLServerSocket.
109 class NetStreamSocketAdapter : public net::StreamSocket { 109 class NetStreamSocketAdapter : public net::StreamSocket {
110 public: 110 public:
111 NetStreamSocketAdapter(std::unique_ptr<P2PStreamSocket> socket) 111 NetStreamSocketAdapter(std::unique_ptr<P2PStreamSocket> socket)
112 : socket_(std::move(socket)) {} 112 : socket_(std::move(socket)) {}
(...skipping 27 matching lines...) Expand all
140 bool IsConnectedAndIdle() const override { return true; } 140 bool IsConnectedAndIdle() const override { return true; }
141 int GetPeerAddress(net::IPEndPoint* address) const override { 141 int GetPeerAddress(net::IPEndPoint* address) const override {
142 // SSL sockets call this function so it must return some result. 142 // SSL sockets call this function so it must return some result.
143 *address = net::IPEndPoint(net::IPAddress::IPv4AllZeros(), 0); 143 *address = net::IPEndPoint(net::IPAddress::IPv4AllZeros(), 0);
144 return net::OK; 144 return net::OK;
145 } 145 }
146 int GetLocalAddress(net::IPEndPoint* address) const override { 146 int GetLocalAddress(net::IPEndPoint* address) const override {
147 NOTREACHED(); 147 NOTREACHED();
148 return net::ERR_FAILED; 148 return net::ERR_FAILED;
149 } 149 }
150 const net::BoundNetLog& NetLog() const override { return net_log_; } 150 const net::NetLogWithSource& NetLog() const override { return net_log_; }
151 void SetSubresourceSpeculation() override { NOTREACHED(); } 151 void SetSubresourceSpeculation() override { NOTREACHED(); }
152 void SetOmniboxSpeculation() override { NOTREACHED(); } 152 void SetOmniboxSpeculation() override { NOTREACHED(); }
153 bool WasEverUsed() const override { 153 bool WasEverUsed() const override {
154 NOTREACHED(); 154 NOTREACHED();
155 return true; 155 return true;
156 } 156 }
157 void EnableTCPFastOpenIfSupported() override { NOTREACHED(); } 157 void EnableTCPFastOpenIfSupported() override { NOTREACHED(); }
158 bool WasNpnNegotiated() const override { 158 bool WasNpnNegotiated() const override {
159 NOTREACHED(); 159 NOTREACHED();
160 return false; 160 return false;
(...skipping 13 matching lines...) Expand all
174 void AddConnectionAttempts(const net::ConnectionAttempts& attempts) override { 174 void AddConnectionAttempts(const net::ConnectionAttempts& attempts) override {
175 NOTREACHED(); 175 NOTREACHED();
176 } 176 }
177 int64_t GetTotalReceivedBytes() const override { 177 int64_t GetTotalReceivedBytes() const override {
178 NOTIMPLEMENTED(); 178 NOTIMPLEMENTED();
179 return 0; 179 return 0;
180 } 180 }
181 181
182 private: 182 private:
183 std::unique_ptr<P2PStreamSocket> socket_; 183 std::unique_ptr<P2PStreamSocket> socket_;
184 net::BoundNetLog net_log_; 184 net::NetLogWithSource net_log_;
185 }; 185 };
186 186
187 // Implements P2PStreamSocket interface on top of net::StreamSocket. 187 // Implements P2PStreamSocket interface on top of net::StreamSocket.
188 class P2PStreamSocketAdapter : public P2PStreamSocket { 188 class P2PStreamSocketAdapter : public P2PStreamSocket {
189 public: 189 public:
190 P2PStreamSocketAdapter(std::unique_ptr<net::StreamSocket> socket, 190 P2PStreamSocketAdapter(std::unique_ptr<net::StreamSocket> socket,
191 std::unique_ptr<net::SSLServerContext> server_context) 191 std::unique_ptr<net::SSLServerContext> server_context)
192 : server_context_(std::move(server_context)), 192 : server_context_(std::move(server_context)),
193 socket_(std::move(socket)) {} 193 socket_(std::move(socket)) {}
194 ~P2PStreamSocketAdapter() override {} 194 ~P2PStreamSocketAdapter() override {}
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 std::move(socket_), std::move(server_context_))); 487 std::move(socket_), std::move(server_context_)));
488 } 488 }
489 } 489 }
490 490
491 void SslHmacChannelAuthenticator::NotifyError(int error) { 491 void SslHmacChannelAuthenticator::NotifyError(int error) {
492 base::ResetAndReturn(&done_callback_).Run(error, nullptr); 492 base::ResetAndReturn(&done_callback_).Run(error, nullptr);
493 } 493 }
494 494
495 } // namespace protocol 495 } // namespace protocol
496 } // namespace remoting 496 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698