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

Unified Diff: webrtc/base/opensslstreamadapter.h

Issue 1377733004: Convert uint16_t to int for WebRTC cipher/crypto suite (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 2 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
Index: webrtc/base/opensslstreamadapter.h
diff --git a/webrtc/base/opensslstreamadapter.h b/webrtc/base/opensslstreamadapter.h
index dfcb43902ea26c5c9c38d3519a6115649037cdeb..56bba41c9093a8fc301cf9a0fb1aacbd650a904e 100644
--- a/webrtc/base/opensslstreamadapter.h
+++ b/webrtc/base/opensslstreamadapter.h
@@ -88,9 +88,9 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
StreamState GetState() const override;
// TODO(guoweis): Move this away from a static class method.
- static std::string GetSslCipherSuiteName(uint16_t cipher);
+ static std::string GetSslCipherSuiteName(int cipher);
- bool GetSslCipherSuite(uint16_t* cipher) override;
+ bool GetSslCipherSuite(int* cipher) override;
// Key Extractor interface
bool ExportKeyingMaterial(const std::string& label,
@@ -110,8 +110,8 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
static bool HaveExporter();
// TODO(guoweis): Move this away from a static class method.
- static uint16_t GetDefaultSslCipherForTest(SSLProtocolVersion version,
- KeyType key_type);
+ static int GetDefaultSslCipherForTest(SSLProtocolVersion version,
+ KeyType key_type);
protected:
void OnEvent(StreamInterface* stream, int events, int err) override;

Powered by Google App Engine
This is Rietveld 408576698