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

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

Issue 8787011: Log server advertised protos and the selected (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_mac.h" 5 #include "net/socket/ssl_client_socket_mac.h"
6 6
7 #include <CoreServices/CoreServices.h> 7 #include <CoreServices/CoreServices.h>
8 #include <netdb.h> 8 #include <netdb.h>
9 #include <sys/socket.h> 9 #include <sys/socket.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 } 785 }
786 786
787 int SSLClientSocketMac::ExportKeyingMaterial(const base::StringPiece& label, 787 int SSLClientSocketMac::ExportKeyingMaterial(const base::StringPiece& label,
788 const base::StringPiece& context, 788 const base::StringPiece& context,
789 unsigned char *out, 789 unsigned char *out,
790 unsigned int outlen) { 790 unsigned int outlen) {
791 return ERR_NOT_IMPLEMENTED; 791 return ERR_NOT_IMPLEMENTED;
792 } 792 }
793 793
794 SSLClientSocket::NextProtoStatus 794 SSLClientSocket::NextProtoStatus
795 SSLClientSocketMac::GetNextProto(std::string* proto) { 795 SSLClientSocketMac::GetNextProto(std::string* proto,
796 std::string* server_proto) {
agl 2011/12/05 16:38:10 s
ramant (doing other things) 2011/12/05 19:03:28 Done.
796 proto->clear(); 797 proto->clear();
798 server_proto->clear();
agl 2011/12/05 16:38:10 s
ramant (doing other things) 2011/12/05 19:03:28 Done.
797 return kNextProtoUnsupported; 799 return kNextProtoUnsupported;
798 } 800 }
799 801
800 int SSLClientSocketMac::InitializeSSLContext() { 802 int SSLClientSocketMac::InitializeSSLContext() {
801 VLOG(1) << "----- InitializeSSLContext"; 803 VLOG(1) << "----- InitializeSSLContext";
802 OSStatus status = noErr; 804 OSStatus status = noErr;
803 805
804 status = SSLNewContext(false, &ssl_context_); 806 status = SSLNewContext(false, &ssl_context_);
805 if (status) 807 if (status)
806 return NetErrorFromOSStatus(status); 808 return NetErrorFromOSStatus(status);
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
1427 if (rv < 0 && rv != ERR_IO_PENDING) { 1429 if (rv < 0 && rv != ERR_IO_PENDING) {
1428 us->write_io_buf_ = NULL; 1430 us->write_io_buf_ = NULL;
1429 return OSStatusFromNetError(rv); 1431 return OSStatusFromNetError(rv);
1430 } 1432 }
1431 1433
1432 // always lie to our caller 1434 // always lie to our caller
1433 return noErr; 1435 return noErr;
1434 } 1436 }
1435 1437
1436 } // namespace net 1438 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698