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

Side by Side Diff: net/socket/ssl_client_socket_win.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/ssl_client_socket_win.h" 5 #include "net/socket/ssl_client_socket_win.h"
6 6
7 #include <schnlsp.h> 7 #include <schnlsp.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after
533 CertFreeCertificateContext(intermediates[i]); 533 CertFreeCertificateContext(intermediates[i]);
534 } 534 }
535 535
536 FreeContextBuffer(issuer_list.aIssuers); 536 FreeContextBuffer(issuer_list.aIssuers);
537 537
538 BOOL ok = CertCloseStore(my_cert_store, CERT_CLOSE_STORE_CHECK_FLAG); 538 BOOL ok = CertCloseStore(my_cert_store, CERT_CLOSE_STORE_CHECK_FLAG);
539 DCHECK(ok); 539 DCHECK(ok);
540 } 540 }
541 541
542 int SSLClientSocketWin::ExportKeyingMaterial(const base::StringPiece& label, 542 int SSLClientSocketWin::ExportKeyingMaterial(const base::StringPiece& label,
543 bool has_context,
543 const base::StringPiece& context, 544 const base::StringPiece& context,
544 unsigned char *out, 545 unsigned char *out,
Ryan Sleevi 2012/03/10 04:23:31 nit: "unsigned char *" -> "unsigned char* "
545 unsigned int outlen) { 546 unsigned int outlen) {
546 return ERR_NOT_IMPLEMENTED; 547 return ERR_NOT_IMPLEMENTED;
547 } 548 }
548 549
549 SSLClientSocket::NextProtoStatus 550 SSLClientSocket::NextProtoStatus
550 SSLClientSocketWin::GetNextProto(std::string* proto, 551 SSLClientSocketWin::GetNextProto(std::string* proto,
551 std::string* server_protos) { 552 std::string* server_protos) {
552 proto->clear(); 553 proto->clear();
553 server_protos->clear(); 554 server_protos->clear();
554 return kNextProtoUnsupported; 555 return kNextProtoUnsupported;
(...skipping 1034 matching lines...) Expand 10 before | Expand all | Expand 10 after
1589 UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA); 1590 UpdateConnectionTypeHistograms(CONNECTION_SSL_MD2_CA);
1590 } 1591 }
1591 1592
1592 void SSLClientSocketWin::FreeSendBuffer() { 1593 void SSLClientSocketWin::FreeSendBuffer() {
1593 SECURITY_STATUS status = FreeContextBuffer(send_buffer_.pvBuffer); 1594 SECURITY_STATUS status = FreeContextBuffer(send_buffer_.pvBuffer);
1594 DCHECK(status == SEC_E_OK); 1595 DCHECK(status == SEC_E_OK);
1595 memset(&send_buffer_, 0, sizeof(send_buffer_)); 1596 memset(&send_buffer_, 0, sizeof(send_buffer_));
1596 } 1597 }
1597 1598
1598 } // namespace net 1599 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698