commit 789a54a0c47e00cf3a5aaddd40a6d26d2cc46409
author Harald Alvestrand <hta@webrtc.org> Mon Sep 30 21:50:15 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Oct 01 06:57:24 2024
tree 489dd68d13317e7d5f75c2df5566b355e9db82a5
parent 8569a0d5346330eb6641512df65b864bbaed11e9

Remove ValidateMessageIntegrity standalone functions

These functions have been deprecated since October 2022.

Bug: None
Change-Id: I74f51c9d0e8ee340a2043bf43f7a1b0d8b79726e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364280
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43118}

api/transport/stun.cc

diff --git a/api/transport/stun.cc b/api/transport/stun.cc
index 6550182..6f89028 100644
--- a/api/transport/stun.cc
+++ b/api/transport/stun.cc
@@ -366,24 +366,6 @@
                                         password);
 }
 
-// Deprecated
-bool StunMessage::ValidateMessageIntegrity(const char* data,
-                                           size_t size,
-                                           const std::string& password) {
-  return ValidateMessageIntegrityOfType(STUN_ATTR_MESSAGE_INTEGRITY,
-                                        kStunMessageIntegritySize, data, size,
-                                        password);
-}
-
-// Deprecated
-bool StunMessage::ValidateMessageIntegrity32(const char* data,
-                                             size_t size,
-                                             const std::string& password) {
-  return ValidateMessageIntegrityOfType(STUN_ATTR_GOOG_MESSAGE_INTEGRITY_32,
-                                        kStunMessageIntegrity32Size, data, size,
-                                        password);
-}
-
 // Verifies a STUN message has a valid MESSAGE-INTEGRITY attribute, using the
 // procedure outlined in RFC 5389, section 15.4.
 bool StunMessage::ValidateMessageIntegrityOfType(int mi_attr_type,

api/transport/stun.h

diff --git a/api/transport/stun.h b/api/transport/stun.h
index ef95cb7..cfe8cbc 100644
--- a/api/transport/stun.h
+++ b/api/transport/stun.h
@@ -294,19 +294,6 @@
   bool EqualAttributes(const StunMessage* other,
                        std::function<bool(int type)> attribute_type_mask) const;
 
-  // Validates that a STUN message in byte buffer form
-  // has a correct MESSAGE-INTEGRITY value.
-  // These functions are not recommended and will be deprecated; use
-  // ValidateMessageIntegrity(password) on the parsed form instead.
-  [[deprecated("Use member function")]] static bool ValidateMessageIntegrity(
-      const char* data,
-      size_t size,
-      const std::string& password);
-  [[deprecated("Use member function")]] static bool ValidateMessageIntegrity32(
-      const char* data,
-      size_t size,
-      const std::string& password);
-
   // Expose raw-buffer ValidateMessageIntegrity function for testing.
   static bool ValidateMessageIntegrityForTesting(const char* data,
                                                  size_t size,