| Index: webrtc/base/opensslstreamadapter.cc
|
| diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc
|
| index 3d1760721f1f55c136306b7fb5f371453fb92ff4..54ee5e1bcdf80726ef4edf280e0de2938220d6df 100644
|
| --- a/webrtc/base/opensslstreamadapter.cc
|
| +++ b/webrtc/base/opensslstreamadapter.cc
|
| @@ -379,17 +379,16 @@ bool OpenSSLStreamAdapter::GetSslCipher(std::string* 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)
|
|
|