| Index: webrtc/base/opensslstreamadapter.h
|
| diff --git a/webrtc/base/opensslstreamadapter.h b/webrtc/base/opensslstreamadapter.h
|
| index cf332b155df11e84b69d563430523de0d82d6d2f..e19264ff9d0e8c42b4b9615d6cc4642517023696 100644
|
| --- a/webrtc/base/opensslstreamadapter.h
|
| +++ b/webrtc/base/opensslstreamadapter.h
|
| @@ -92,7 +92,7 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
|
| static const char* GetRfcSslCipherName(const SSL_CIPHER* cipher);
|
| #endif
|
|
|
| - bool GetSslCipher(std::string* cipher) override;
|
| + bool GetSslCipher(SslCipher* cipher) override;
|
|
|
| // Key Extractor interface
|
| bool ExportKeyingMaterial(const std::string& label,
|
| @@ -110,8 +110,8 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
|
| static bool HaveDtls();
|
| static bool HaveDtlsSrtp();
|
| static bool HaveExporter();
|
| - static std::string GetDefaultSslCipher(SSLProtocolVersion version,
|
| - KeyType key_type);
|
| + static const SslCipher& GetDefaultSslCipherForTest(SSLProtocolVersion version,
|
| + KeyType key_type);
|
|
|
| protected:
|
| void OnEvent(StreamInterface* stream, int events, int err) override;
|
|
|