[ClearKey] Moved padding method to BASE64 utils

xbmc · Aug 25, 2024 · 3ac84ff · 3ac84ff
1 parent d3a097e
commit 3ac84ff
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/decrypters/clearkey/ClearKeyCencSingleSampleDecrypter.cpp b/src/decrypters/clearkey/ClearKeyCencSingleSampleDecrypter.cpp
@@ -270,26 +270,10 @@ bool CClearKeyCencSingleSampleDecrypter::ParseLicenseResponse(std::string data)
         if (!b64Key.empty() && !b64KeyId.empty())
         {
           CkB64Decode(b64Key);
-          CkB64Decode(b64KeyId);
+          BASE64::AddPadding(b64Key);
 
-          // pad b64
-          int left = 4 - (b64Key.length() % 4);
-          if (b64Key.length() % 4)
-          {
-            for (int i = 0; i < left; i++)
-            {
-              b64Key.push_back('=');
-            }
-          }
-
-          left = 4 - (b64KeyId.length() % 4);
-          if (b64KeyId.length() % 4)
-          {
-            for (int i = 0; i < left; i++)
-            {
-              b64KeyId.push_back('=');
-            }
-          }
+          CkB64Decode(b64KeyId);
+          BASE64::AddPadding(b64KeyId);
 
           m_keyPairs.emplace(b64KeyId, b64Key);
           break;

diff --git a/src/utils/Base64Utils.cpp b/src/utils/Base64Utils.cpp
@@ -217,3 +217,17 @@ bool UTILS::BASE64::IsValidBase64(const std::string& input)
   std::regex base64Regex(REGEX.data());
   return std::regex_match(input, base64Regex);
 }
+
+bool UTILS::BASE64::AddPadding(std::string& base64str)
+{
+  const int mod = static_cast<int>(base64str.length() % 4);
+  if (mod > 0)
+  {
+    for (int i = 4 - mod; i > 0; --i)
+    {
+      base64str.push_back(PADDING);
+    }
+    return true;
+  }
+  return false;
+}
diff --git a/src/utils/Base64Utils.h b/src/utils/Base64Utils.h
@@ -30,5 +30,7 @@ std::string DecodeToStr(std::string_view input);
 
 bool IsValidBase64(const std::string& input);
 
+bool AddPadding(std::string& base64str);
+
 } // namespace BASE64
 } // namespace UTILS