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

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

Issue 10823084: Add a new GetTlsUniqueChannelBinding method to SSLSocket, and implement nss version. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix typos in _win and _mac. Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_openssl.h ('k') | net/socket/ssl_client_socket_win.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 // OpenSSL binding for SSLClientSocket. The class layout and general principle 5 // OpenSSL binding for SSLClientSocket. The class layout and general principle
6 // of operation is derived from SSLClientSocketNSS. 6 // of operation is derived from SSLClientSocketNSS.
7 7
8 #include "net/socket/ssl_client_socket_openssl.h" 8 #include "net/socket/ssl_client_socket_openssl.h"
9 9
10 #include <openssl/ssl.h> 10 #include <openssl/ssl.h>
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 if (rv != 1) { 656 if (rv != 1) {
657 int ssl_error = SSL_get_error(ssl_, rv); 657 int ssl_error = SSL_get_error(ssl_, rv);
658 LOG(ERROR) << "Failed to export keying material;" 658 LOG(ERROR) << "Failed to export keying material;"
659 << " returned " << rv 659 << " returned " << rv
660 << ", SSL error code " << ssl_error; 660 << ", SSL error code " << ssl_error;
661 return MapOpenSSLError(ssl_error, err_tracer); 661 return MapOpenSSLError(ssl_error, err_tracer);
662 } 662 }
663 return OK; 663 return OK;
664 } 664 }
665 665
666 int SSLClientSocketOpenSSL::GetTLSUniqueChannelBinding(std::string* out) {
667 return ERR_NOT_IMPLEMENTED;
668 }
669
666 SSLClientSocket::NextProtoStatus SSLClientSocketOpenSSL::GetNextProto( 670 SSLClientSocket::NextProtoStatus SSLClientSocketOpenSSL::GetNextProto(
667 std::string* proto, std::string* server_protos) { 671 std::string* proto, std::string* server_protos) {
668 *proto = npn_proto_; 672 *proto = npn_proto_;
669 *server_protos = server_protos_; 673 *server_protos = server_protos_;
670 return npn_status_; 674 return npn_status_;
671 } 675 }
672 676
673 ServerBoundCertService* 677 ServerBoundCertService*
674 SSLClientSocketOpenSSL::GetServerBoundCertService() const { 678 SSLClientSocketOpenSSL::GetServerBoundCertService() const {
675 return NULL; 679 return NULL;
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1317 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv, 1321 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv,
1318 user_write_buf_->data()); 1322 user_write_buf_->data());
1319 return rv; 1323 return rv;
1320 } 1324 }
1321 1325
1322 int err = SSL_get_error(ssl_, rv); 1326 int err = SSL_get_error(ssl_, rv);
1323 return MapOpenSSLError(err, err_tracer); 1327 return MapOpenSSLError(err, err_tracer);
1324 } 1328 }
1325 1329
1326 } // namespace net 1330 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.h ('k') | net/socket/ssl_client_socket_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698