Change WebRTC SslCipher to be exposed as number only.

webrtc/base/opensslstreamadapter.h

Index: webrtc/base/opensslstreamadapter.h
diff --git a/webrtc/base/opensslstreamadapter.h b/webrtc/base/opensslstreamadapter.h
index cf332b155df11e84b69d563430523de0d82d6d2f..476221e094de7c7c2ca405991b85f61d55f20ef2 100644
--- a/webrtc/base/opensslstreamadapter.h
+++ b/webrtc/base/opensslstreamadapter.h
@@ -87,12 +87,9 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
   void Close() override;
   StreamState GetState() const 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
+  static const std::string GetRfcSslCipherName(uint16_t cipher);

[davidben_webrtc, 2015/09/25 19:23:13]

(Ditto on const std::string)

 
-  bool GetSslCipher(std::string* cipher) override;
+  bool GetSslCipher(uint16_t* cipher) override;
 
   // Key Extractor interface
   bool ExportKeyingMaterial(const std::string& label,
@@ -110,8 +107,8 @@ class OpenSSLStreamAdapter : public SSLStreamAdapter {
   static bool HaveDtls();
   static bool HaveDtlsSrtp();
   static bool HaveExporter();
-  static std::string GetDefaultSslCipher(SSLProtocolVersion version,
-                                         KeyType key_type);
+  static uint16_t GetDefaultSslCipherForTest(SSLProtocolVersion version,
+                                             KeyType key_type);
 
  protected:
   void OnEvent(StreamInterface* stream, int events, int err) override;