commit 7750d802a5f3de67a49db478a97f824d3b958bf3
author Mirko Bonadei <mbonadei@webrtc.org> Mon Jul 26 17:27:42 2021 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Jul 26 16:33:54 2021 +0000
tree 9e2de5f51feb3837e21b4616c6f557ff11ad734f
parent f7448fb8829b7cd639cdd5a6928c51722b7f17bc

Rename rtc_base/ssl_stream_adapter.h constants.

Uppercase constants are more likely to conflict with macros (for
example rtc::SRTP_AES128_CM_SHA1_80 and OpenSSL SRTP_AES128_CM_SHA1_80).

This CL renames some constants and follows the C++ style guide.

Bug: webrtc:12997
Change-Id: I2398232568b352f88afed571a9b698040bb81c30
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/226564
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34553}

api/crypto/crypto_options.cc

diff --git a/api/crypto/crypto_options.cc b/api/crypto/crypto_options.cc
index f47e844..22c5dd4 100644
--- a/api/crypto/crypto_options.cc
+++ b/api/crypto/crypto_options.cc
@@ -32,24 +32,24 @@
 
 std::vector<int> CryptoOptions::GetSupportedDtlsSrtpCryptoSuites() const {
   std::vector<int> crypto_suites;
-  // Note: SRTP_AES128_CM_SHA1_80 is what is required to be supported (by
-  // draft-ietf-rtcweb-security-arch), but SRTP_AES128_CM_SHA1_32 is allowed as
+  // Note: kSrtpAes128CmSha1_80 is what is required to be supported (by
+  // draft-ietf-rtcweb-security-arch), but kSrtpAes128CmSha1_32 is allowed as
   // well, and saves a few bytes per packet if it ends up selected.
   // As the cipher suite is potentially insecure, it will only be used if
   // enabled by both peers.
   if (srtp.enable_aes128_sha1_32_crypto_cipher) {
-    crypto_suites.push_back(rtc::SRTP_AES128_CM_SHA1_32);
+    crypto_suites.push_back(rtc::kSrtpAes128CmSha1_32);
   }
   if (srtp.enable_aes128_sha1_80_crypto_cipher) {
-    crypto_suites.push_back(rtc::SRTP_AES128_CM_SHA1_80);
+    crypto_suites.push_back(rtc::kSrtpAes128CmSha1_80);
   }
 
   // Note: GCM cipher suites are not the top choice since they increase the
   // packet size. In order to negotiate them the other side must not support
-  // SRTP_AES128_CM_SHA1_80.
+  // kSrtpAes128CmSha1_80.
   if (srtp.enable_gcm_crypto_suites) {
-    crypto_suites.push_back(rtc::SRTP_AEAD_AES_256_GCM);
-    crypto_suites.push_back(rtc::SRTP_AEAD_AES_128_GCM);
+    crypto_suites.push_back(rtc::kSrtpAeadAes256Gcm);
+    crypto_suites.push_back(rtc::kSrtpAeadAes128Gcm);
   }
   RTC_CHECK(!crypto_suites.empty());
   return crypto_suites;

api/crypto/crypto_options.h

diff --git a/api/crypto/crypto_options.h b/api/crypto/crypto_options.h
index 5f6cea6..3179951 100644
--- a/api/crypto/crypto_options.h
+++ b/api/crypto/crypto_options.h
@@ -44,7 +44,7 @@
     bool enable_gcm_crypto_suites = false;
 
     // If set to true, the (potentially insecure) crypto cipher
-    // SRTP_AES128_CM_SHA1_32 will be included in the list of supported ciphers
+    // kSrtpAes128CmSha1_32 will be included in the list of supported ciphers
     // during negotiation. It will only be used if both peers support it and no
     // other ciphers get preferred.
     bool enable_aes128_sha1_32_crypto_cipher = false;