commit 34517f9d962b9681761f6ce94d252c95f27b28c3
author Mirko Bonadei <mbonadei@webrtc.org> Tue Jul 27 14:54:06 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 30 14:22:30 2021
tree 4bb256c4f5a88021e72e43b7c097b7667f48a765
parent 481e3451d161bd25ce9d31605974a6273aab9e7a

Remove deprecated constants.

Follow-up of https://webrtc-review.googlesource.com/c/src/+/226564.

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

rtc_base/ssl_stream_adapter.cc

diff --git a/rtc_base/ssl_stream_adapter.cc b/rtc_base/ssl_stream_adapter.cc
index 718c62d..b805fdc 100644
--- a/rtc_base/ssl_stream_adapter.cc
+++ b/rtc_base/ssl_stream_adapter.cc
@@ -24,15 +24,6 @@
 const char kCsAeadAes128Gcm[] = "AEAD_AES_128_GCM";
 const char kCsAeadAes256Gcm[] = "AEAD_AES_256_GCM";
 
-// TODO(bugs.webrtc.org/12997): Start.
-// Remove the following constants which violate the style guide and can
-// potentially clash with OpenSSL macros.
-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";
-const char CS_AEAD_AES_128_GCM[] = "AEAD_AES_128_GCM";
-const char CS_AEAD_AES_256_GCM[] = "AEAD_AES_256_GCM";
-// TODO(bugs.webrtc.org/12997): End.
-
 std::string SrtpCryptoSuiteToName(int crypto_suite) {
   switch (crypto_suite) {
     case kSrtpAes128CmSha1_32:

rtc_base/ssl_stream_adapter.h

diff --git a/rtc_base/ssl_stream_adapter.h b/rtc_base/ssl_stream_adapter.h
index dc8a8ca..618ffca 100644
--- a/rtc_base/ssl_stream_adapter.h
+++ b/rtc_base/ssl_stream_adapter.h
@@ -29,32 +29,6 @@
 constexpr int kTlsNullWithNullNull = 0;
 constexpr int kSslCipherSuiteMaxValue = 0xFFFF;
 
-// TODO(bugs.webrtc.org/12997): Start.
-// Remove the following constants which violate the style guide and can
-// potentially clash with OpenSSL macros.
-#ifndef SRTP_AES128_CM_SHA1_80
-const int SRTP_AES128_CM_SHA1_80 = 0x0001;
-#endif
-#ifndef SRTP_AES128_CM_SHA1_32
-const int SRTP_AES128_CM_SHA1_32 = 0x0002;
-#endif
-#ifndef SRTP_AEAD_AES_128_GCM
-const int SRTP_AEAD_AES_128_GCM = 0x0007;
-#endif
-#ifndef SRTP_AEAD_AES_256_GCM
-const int SRTP_AEAD_AES_256_GCM = 0x0008;
-#endif
-// Names of SRTP profiles listed above.
-// 128-bit AES with 80-bit SHA-1 HMAC.
-extern const char CS_AES_CM_128_HMAC_SHA1_80[];
-// 128-bit AES with 32-bit SHA-1 HMAC.
-extern const char CS_AES_CM_128_HMAC_SHA1_32[];
-// 128-bit AES GCM with 16 byte AEAD auth tag.
-extern const char CS_AEAD_AES_128_GCM[];
-// 256-bit AES GCM with 16 byte AEAD auth tag.
-extern const char CS_AEAD_AES_256_GCM[];
-// TODO(bugs.webrtc.org/12997): End.
-
 // Constants for SRTP profiles.
 constexpr int kSrtpInvalidCryptoSuite = 0;
 constexpr int kSrtpAes128CmSha1_80 = 0x0001;