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

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

Issue 1807063002: Remove GetTLSUniqueChannelBinding. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « net/socket/ssl_server_socket_nss.cc ('k') | net/socket/ssl_socket.h » ('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_server_socket_openssl.h" 5 #include "net/socket/ssl_server_socket_openssl.h"
6 6
7 #include <openssl/err.h> 7 #include <openssl/err.h>
8 #include <openssl/ssl.h> 8 #include <openssl/ssl.h>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 // SSLServerSocket interface. 61 // SSLServerSocket interface.
62 int Handshake(const CompletionCallback& callback) override; 62 int Handshake(const CompletionCallback& callback) override;
63 63
64 // SSLSocket interface. 64 // SSLSocket interface.
65 int ExportKeyingMaterial(const base::StringPiece& label, 65 int ExportKeyingMaterial(const base::StringPiece& label,
66 bool has_context, 66 bool has_context,
67 const base::StringPiece& context, 67 const base::StringPiece& context,
68 unsigned char* out, 68 unsigned char* out,
69 unsigned int outlen) override; 69 unsigned int outlen) override;
70 int GetTLSUniqueChannelBinding(std::string* out) override;
71 70
72 // Socket interface (via StreamSocket). 71 // Socket interface (via StreamSocket).
73 int Read(IOBuffer* buf, 72 int Read(IOBuffer* buf,
74 int buf_len, 73 int buf_len,
75 const CompletionCallback& callback) override; 74 const CompletionCallback& callback) override;
76 int Write(IOBuffer* buf, 75 int Write(IOBuffer* buf,
77 int buf_len, 76 int buf_len,
78 const CompletionCallback& callback) override; 77 const CompletionCallback& callback) override;
79 int SetReceiveBufferSize(int32_t size) override; 78 int SetReceiveBufferSize(int32_t size) override;
80 int SetSendBufferSize(int32_t size) override; 79 int SetSendBufferSize(int32_t size) override;
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 if (rv != 1) { 245 if (rv != 1) {
247 int ssl_error = SSL_get_error(ssl_, rv); 246 int ssl_error = SSL_get_error(ssl_, rv);
248 LOG(ERROR) << "Failed to export keying material;" 247 LOG(ERROR) << "Failed to export keying material;"
249 << " returned " << rv 248 << " returned " << rv
250 << ", SSL error code " << ssl_error; 249 << ", SSL error code " << ssl_error;
251 return MapOpenSSLError(ssl_error, err_tracer); 250 return MapOpenSSLError(ssl_error, err_tracer);
252 } 251 }
253 return OK; 252 return OK;
254 } 253 }
255 254
256 int SSLServerSocketOpenSSL::GetTLSUniqueChannelBinding(std::string* out) {
257 NOTIMPLEMENTED();
258 return ERR_NOT_IMPLEMENTED;
259 }
260
261 int SSLServerSocketOpenSSL::Read(IOBuffer* buf, 255 int SSLServerSocketOpenSSL::Read(IOBuffer* buf,
262 int buf_len, 256 int buf_len,
263 const CompletionCallback& callback) { 257 const CompletionCallback& callback) {
264 DCHECK(user_read_callback_.is_null()); 258 DCHECK(user_read_callback_.is_null());
265 DCHECK(user_handshake_callback_.is_null()); 259 DCHECK(user_handshake_callback_.is_null());
266 DCHECK(!user_read_buf_); 260 DCHECK(!user_read_buf_);
267 DCHECK(!callback.is_null()); 261 DCHECK(!callback.is_null());
268 262
269 user_read_buf_ = buf; 263 user_read_buf_ = buf;
270 user_read_buf_len_ = buf_len; 264 user_read_buf_len_ = buf_len;
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
959 SSL* ssl = SSL_new(ssl_ctx_.get()); 953 SSL* ssl = SSL_new(ssl_ctx_.get());
960 return scoped_ptr<SSLServerSocket>( 954 return scoped_ptr<SSLServerSocket>(
961 new SSLServerSocketOpenSSL(std::move(socket), ssl)); 955 new SSLServerSocketOpenSSL(std::move(socket), ssl));
962 } 956 }
963 957
964 void EnableSSLServerSockets() { 958 void EnableSSLServerSockets() {
965 // No-op because CreateSSLServerSocket() calls crypto::EnsureOpenSSLInit(). 959 // No-op because CreateSSLServerSocket() calls crypto::EnsureOpenSSLInit().
966 } 960 }
967 961
968 } // namespace net 962 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_server_socket_nss.cc ('k') | net/socket/ssl_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698