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 11 matching lines @@
 #elif SSL_USE_OPENSSL  // && !SSL_USE_SCHANNEL
 
 #include "webrtc/base/opensslstreamadapter.h"
 
 #endif  // !SSL_USE_OPENSSL && !SSL_USE_SCHANNEL
 
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace rtc {
 
+const char CS_AES_CM_128_HMAC_SHA1_80[] = "AES_CM_128_HMAC_SHA1_80";
+const char CS_AES_CM_128_HMAC_SHA1_32[] = "AES_CM_128_HMAC_SHA1_32";
+
+SrtpCipherType GetSrtpCipherType(const std::string& cipher) {
+  if (cipher == CS_AES_CM_128_HMAC_SHA1_32)
+    return SrtpCipher_AES_CM_128_HMAC_SHA1_32;
+  if (cipher == CS_AES_CM_128_HMAC_SHA1_80)
+    return SrtpCipher_AES_CM_128_HMAC_SHA1_80;
+  return SrtpCipher_Unknown;
+}
+
 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(uint16_t* 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();
+uint16_t SSLStreamAdapter::GetDefaultSslCipherForTest(
+    SSLProtocolVersion version,
+    KeyType key_type) {
+  return 0;
 }
 #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) {
-  return OpenSSLStreamAdapter::GetDefaultSslCipher(version, key_type);
+uint16_t SSLStreamAdapter::GetDefaultSslCipherForTest(
+    SSLProtocolVersion version,
+    KeyType key_type) {
+  return OpenSSLStreamAdapter::GetDefaultSslCipherForTest(version, key_type);
+}
+
+const std::string SSLStreamAdapter::GetRfcSslCipherName(uint16_t cipher) {

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

(Ditto on const std::string)

+  return OpenSSLStreamAdapter::GetRfcSslCipherName(cipher);
 }
 #endif  // !SSL_USE_SCHANNEL && !SSL_USE_OPENSSL
 
 ///////////////////////////////////////////////////////////////////////////////
 
 }  // namespace rtc