| Index: net/socket/ssl_client_socket_nss.cc
|
| ===================================================================
|
| --- net/socket/ssl_client_socket_nss.cc (revision 126517)
|
| +++ net/socket/ssl_client_socket_nss.cc (working copy)
|
| @@ -539,13 +539,14 @@
|
| }
|
|
|
| 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) {
|
| @@ -2039,7 +2040,7 @@
|
| 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;
|
| @@ -2068,7 +2069,7 @@
|
| 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);
|
| }
|
|
|