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

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

Issue 9663043: Add a boolean |had_context| argument to the TLS ExportKeyingMaterial (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
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/socket_test_util.h" 5 #include "net/socket/socket_test_util.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 681
682 void MockClientSocket::GetSSLInfo(SSLInfo* ssl_info) { 682 void MockClientSocket::GetSSLInfo(SSLInfo* ssl_info) {
683 NOTREACHED(); 683 NOTREACHED();
684 } 684 }
685 685
686 void MockClientSocket::GetSSLCertRequestInfo( 686 void MockClientSocket::GetSSLCertRequestInfo(
687 SSLCertRequestInfo* cert_request_info) { 687 SSLCertRequestInfo* cert_request_info) {
688 } 688 }
689 689
690 int MockClientSocket::ExportKeyingMaterial(const base::StringPiece& label, 690 int MockClientSocket::ExportKeyingMaterial(const base::StringPiece& label,
691 bool has_context,
691 const base::StringPiece& context, 692 const base::StringPiece& context,
692 unsigned char *out, 693 unsigned char *out,
Ryan Sleevi 2012/03/10 04:23:31 nit: "unsigned char *" -> "unsigned char* "
693 unsigned int outlen) { 694 unsigned int outlen) {
694 memset(out, 'A', outlen); 695 memset(out, 'A', outlen);
695 return OK; 696 return OK;
696 } 697 }
697 698
698 OriginBoundCertService* MockClientSocket::GetOriginBoundCertService() const { 699 OriginBoundCertService* MockClientSocket::GetOriginBoundCertService() const {
699 NOTREACHED(); 700 NOTREACHED();
700 return NULL; 701 return NULL;
701 } 702 }
702 703
(...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after
1619 1620
1620 const char kSOCKS5OkRequest[] = 1621 const char kSOCKS5OkRequest[] =
1621 { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 }; 1622 { 0x05, 0x01, 0x00, 0x03, 0x04, 'h', 'o', 's', 't', 0x00, 0x50 };
1622 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest); 1623 const int kSOCKS5OkRequestLength = arraysize(kSOCKS5OkRequest);
1623 1624
1624 const char kSOCKS5OkResponse[] = 1625 const char kSOCKS5OkResponse[] =
1625 { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 }; 1626 { 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
1626 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse); 1627 const int kSOCKS5OkResponseLength = arraysize(kSOCKS5OkResponse);
1627 1628
1628 } // namespace net 1629 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698