Change WebRTC SslCipher to be exposed as number only.

webrtc/base/sslstreamadapter.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 21 matching lines @@
 SSLStreamAdapter* SSLStreamAdapter::Create(StreamInterface* stream) {
 #if SSL_USE_SCHANNEL
   return NULL;
 #elif SSL_USE_OPENSSL  // !SSL_USE_SCHANNEL
   return new OpenSSLStreamAdapter(stream);
 #else  // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL
   return NULL;
 #endif
 }
 
-bool SSLStreamAdapter::GetSslCipher(std::string* cipher) {
+bool SSLStreamAdapter::GetSslCipher(SslCipher* cipher) {
   return false;
 }
 
 bool SSLStreamAdapter::ExportKeyingMaterial(const std::string& label,
                                             const uint8* context,
                                             size_t context_len,
                                             bool use_context,
                                             uint8* result,
                                             size_t result_len) {
   return false;  // Default is unsupported
 }
 
 bool SSLStreamAdapter::SetDtlsSrtpCiphers(
     const std::vector<std::string>& ciphers) {
   return false;
 }
 
 bool SSLStreamAdapter::GetDtlsSrtpCipher(std::string* cipher) {
   return false;
 }
 
 // Note: this matches the logic above with SCHANNEL dominating
 #if SSL_USE_SCHANNEL
 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() {
   return OpenSSLStreamAdapter::HaveDtls();
 }
 bool SSLStreamAdapter::HaveDtlsSrtp() {
   return OpenSSLStreamAdapter::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
 
 ///////////////////////////////////////////////////////////////////////////////
 
 }  // namespace rtc