Change WebRTC SslCipher to be exposed as number only.

webrtc/base/sslstreamadapter.cc

Index: webrtc/base/sslstreamadapter.cc
diff --git a/webrtc/base/sslstreamadapter.cc b/webrtc/base/sslstreamadapter.cc
index 42dea9c0362f6910f550a36830e4dade3cecc5f1..d3751ffbb1530a1a79a38fc38dbbb76edf8574f0 100644
--- a/webrtc/base/sslstreamadapter.cc
+++ b/webrtc/base/sslstreamadapter.cc
@@ -39,7 +39,7 @@ SSLStreamAdapter* SSLStreamAdapter::Create(StreamInterface* stream) {
 #endif
 }
 
-bool SSLStreamAdapter::GetSslCipher(std::string* cipher) {
+bool SSLStreamAdapter::GetSslCipher(SslCipher* cipher) {
   return false;
 }
 
@@ -66,9 +66,10 @@ bool SSLStreamAdapter::GetDtlsSrtpCipher(std::string* cipher) {
 bool SSLStreamAdapter::HaveDtls() { return false; }
 bool SSLStreamAdapter::HaveDtlsSrtp() { return false; }
 bool SSLStreamAdapter::HaveExporter() { return false; }
-std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version,
-                                                  KeyType key_type) {
-  return std::string();
+const SslCipher& SSLStreamAdapter::GetDefaultSslCipher(
+    SSLProtocolVersion version,
+    KeyType key_type) {
+  return kNullSslCipher;

[juberti, 2015/09/24 13:41:15]

Using the null cipher here seems dangerous. We certainly don't want to ever
expect to use the null cipher!

[guoweis_webrtc, 2015/09/24 18:27:13]

This function is only used by tests. We should just rename it as
GetDefaultSslCipherForTest. and/or changing the signature to return bool as
GetSslCipher().

[juberti, 2015/09/24 21:37:32]

The function name wasn't the problem. See my comment about null vs invalid
elsewhere.

 }
 #elif SSL_USE_OPENSSL
 bool SSLStreamAdapter::HaveDtls() {
@@ -80,8 +81,9 @@ bool SSLStreamAdapter::HaveDtlsSrtp() {
 bool SSLStreamAdapter::HaveExporter() {
   return OpenSSLStreamAdapter::HaveExporter();
 }
-std::string SSLStreamAdapter::GetDefaultSslCipher(SSLProtocolVersion version,
-                                                  KeyType key_type) {
+const SslCipher& SSLStreamAdapter::GetDefaultSslCipher(
+    SSLProtocolVersion version,
+    KeyType key_type) {
   return OpenSSLStreamAdapter::GetDefaultSslCipher(version, key_type);
 }
 #endif  // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL