diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 16:04:20 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 16:04:20 +0000 |
| commit | deffb93ae82baf9125ab1129a64ad087f602ee6b (patch) | |
| tree | 11bd5e7229dfa4eaeacda28cd18d099f97c75769 /net/socket | |
| parent | 33ca366d226f980c5a8513f09258ca84addc8f47 (diff) | |
| download | chromium_src-deffb93ae82baf9125ab1129a64ad087f602ee6b.zip chromium_src-deffb93ae82baf9125ab1129a64ad087f602ee6b.tar.gz chromium_src-deffb93ae82baf9125ab1129a64ad087f602ee6b.tar.bz2 | |
net: allow SSL secrets to be exported sooner.
This also addresses some follows up from previous CLs.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7493056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 3 | ||||
| -rw-r--r-- | net/socket/ssl_server_socket_nss.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index eddac5c..42acb81 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -529,9 +529,8 @@ int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label, unsigned int outlen) { if (!IsConnected()) return ERR_SOCKET_NOT_CONNECTED; - std::string label_string(label.data(), label.length()); SECStatus result = SSL_ExportKeyingMaterial( - nss_fd_, label_string.c_str(), + nss_fd_, label.data(), label.size(), reinterpret_cast<const unsigned char*>(context.data()), context.length(), out, outlen); if (result != SECSuccess) { diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc index c364173..08d84b9 100644 --- a/net/socket/ssl_server_socket_nss.cc +++ b/net/socket/ssl_server_socket_nss.cc @@ -132,9 +132,8 @@ int SSLServerSocketNSS::ExportKeyingMaterial(const base::StringPiece& label, unsigned int outlen) { if (!IsConnected()) return ERR_SOCKET_NOT_CONNECTED; - std::string label_string(label.data(), label.length()); SECStatus result = SSL_ExportKeyingMaterial( - nss_fd_, label_string.c_str(), + nss_fd_, label.data(), label.size(), reinterpret_cast<const unsigned char*>(context.data()), context.length(), out, outlen); if (result != SECSuccess) { |