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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_server_socket_nss.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 side-by-side diff with in-line comments
Download patch
« net/socket/ssl_server_socket_nss.h ('K') | « net/socket/ssl_server_socket_nss.h ('k') | net/socket/ssl_server_socket_unittest.cc » ('j') | net/socket/ssl_socket.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_server_socket_nss.cc
===================================================================
--- net/socket/ssl_server_socket_nss.cc (revision 125777)
+++ net/socket/ssl_server_socket_nss.cc (working copy)
@@ -120,13 +120,14 @@
}
int SSLServerSocketNSS::ExportKeyingMaterial(const base::StringPiece& label,
+ bool has_context,
const base::StringPiece& context,
unsigned char *out,
Ryan Sleevi 2012/03/10 04:23:31 nit: "unsigned char *" -> "unsigned char* "
unsigned int outlen) {
if (!IsConnected())
return ERR_SOCKET_NOT_CONNECTED;
SECStatus result = SSL_ExportKeyingMaterial(
- nss_fd_, label.data(), label.size(),
+ nss_fd_, label.data(), label.size(), has_context,
reinterpret_cast<const unsigned char*>(context.data()),
context.length(), out, outlen);
if (result != SECSuccess) {
« net/socket/ssl_server_socket_nss.h ('K') | « net/socket/ssl_server_socket_nss.h ('k') | net/socket/ssl_server_socket_unittest.cc » ('j') | net/socket/ssl_socket.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698