| Index: webrtc/base/opensslstreamadapter.cc
|
| diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc
|
| index c759ee5f15bc56f28afec7a8217dcbe743a54d14..67ed5db4b5f38520a498bb940fdea51dace7bce8 100644
|
| --- a/webrtc/base/opensslstreamadapter.cc
|
| +++ b/webrtc/base/opensslstreamadapter.cc
|
| @@ -384,17 +384,16 @@ bool OpenSSLStreamAdapter::GetSslCipherSuite(int* cipher) {
|
|
|
| // Key Extractor interface
|
| bool OpenSSLStreamAdapter::ExportKeyingMaterial(const std::string& label,
|
| - const uint8* context,
|
| + const uint8_t* context,
|
| size_t context_len,
|
| bool use_context,
|
| - uint8* result,
|
| + uint8_t* result,
|
| size_t result_len) {
|
| #ifdef HAVE_DTLS_SRTP
|
| int i;
|
|
|
| - i = SSL_export_keying_material(ssl_, result, result_len,
|
| - label.c_str(), label.length(),
|
| - const_cast<uint8 *>(context),
|
| + i = SSL_export_keying_material(ssl_, result, result_len, label.c_str(),
|
| + label.length(), const_cast<uint8_t*>(context),
|
| context_len, use_context);
|
|
|
| if (i != 1)
|
|
|