diff options
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index bc2bc92..688b8e6 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -539,13 +539,14 @@ void SSLClientSocketNSS::GetSSLCertRequestInfo( } int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label, + bool has_context, const base::StringPiece& context, - unsigned char *out, + unsigned char* out, 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) { @@ -2037,7 +2038,7 @@ void SSLClientSocketNSS::BufferSendComplete(int result) { int SSLClientSocketNSS::BufferRecv(void) { if (transport_recv_busy_) return ERR_IO_PENDING; - char *buf; + char* buf; int nb = memio_GetReadParams(nss_bufs_, &buf); EnterFunction(nb); int rv; @@ -2066,7 +2067,7 @@ int SSLClientSocketNSS::BufferRecv(void) { void SSLClientSocketNSS::BufferRecvComplete(int result) { EnterFunction(result); if (result > 0) { - char *buf; + char* buf; memio_GetReadParams(nss_bufs_, &buf); memcpy(buf, recv_buffer_->data(), result); } |