Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Unified Diff: webrtc/base/opensslstreamadapter.h

Issue 1380603005: Revert of Change WebRTC SslCipher to be exposed as number only. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « talk/session/media/srtpfilter_unittest.cc ('k') | webrtc/base/opensslstreamadapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/opensslstreamadapter.h
diff --git a/webrtc/base/opensslstreamadapter.h b/webrtc/base/opensslstreamadapter.h
index dfcb43902ea26c5c9c38d3519a6115649037cdeb..cf332b155df11e84b69d563430523de0d82d6d2f 100644
--- a/webrtc/base/opensslstreamadapter.h
+++ b/webrtc/base/opensslstreamadapter.h
@@ -87,10 +87,12 @@
void Close() override;
StreamState GetState() const override;
- // TODO(guoweis): Move this away from a static class method.
- static std::string GetSslCipherSuiteName(uint16_t cipher);
-
- bool GetSslCipherSuite(uint16_t* cipher) override;
+#ifndef OPENSSL_IS_BORINGSSL
+ // Return the RFC (5246, 3268, etc.) cipher name for an OpenSSL cipher.
+ static const char* GetRfcSslCipherName(const SSL_CIPHER* cipher);
+#endif
+
+ bool GetSslCipher(std::string* cipher) override;
// Key Extractor interface
bool ExportKeyingMaterial(const std::string& label,
@@ -108,10 +110,8 @@
static bool HaveDtls();
static bool HaveDtlsSrtp();
static bool HaveExporter();
-
- // TODO(guoweis): Move this away from a static class method.
- static uint16_t GetDefaultSslCipherForTest(SSLProtocolVersion version,
- KeyType key_type);
+ static std::string GetDefaultSslCipher(SSLProtocolVersion version,
+ KeyType key_type);
protected:
void OnEvent(StreamInterface* stream, int events, int err) override;
« no previous file with comments | « talk/session/media/srtpfilter_unittest.cc ('k') | webrtc/base/opensslstreamadapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698