From f5e635addaef59159bf6bc529b17954eda3684a1 Mon Sep 17 00:00:00 2001
From: FearlessTobi
Date: Sun, 31 Jul 2022 04:46:26 +0200
Subject: ldn: Initial implementation

---
 src/dedicated_room/yuzu_room.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/dedicated_room/yuzu_room.cpp')

diff --git a/src/dedicated_room/yuzu_room.cpp b/src/dedicated_room/yuzu_room.cpp
index 7b6deba41..8d8ac1ed7 100644
--- a/src/dedicated_room/yuzu_room.cpp
+++ b/src/dedicated_room/yuzu_room.cpp
@@ -76,7 +76,8 @@ static constexpr char BanListMagic[] = "YuzuRoom-BanList-1";
 static constexpr char token_delimiter{':'};
 
 static void PadToken(std::string& token) {
-    while (token.size() % 4 != 0) {
+    const auto remainder = token.size() % 3;
+    for (size_t i = 0; i < (3 - remainder); i++) {
         token.push_back('=');
     }
 }
-- 
cgit v1.2.3


From aa11d73bba386076973010ba4c60d5b04ba828a3 Mon Sep 17 00:00:00 2001
From: liushuyu
Date: Sat, 10 Sep 2022 17:38:36 -0600
Subject: dedicated_room: fix token padding ...

... mebedtls' base64 routine has a strange behavioral issue where if the
input is invalid, it will not report it as invalid, but rather returning
a bunch of garbage data. This new round-tripping padding method should
eliminate such issue.
---
 src/dedicated_room/yuzu_room.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/dedicated_room/yuzu_room.cpp')

diff --git a/src/dedicated_room/yuzu_room.cpp b/src/dedicated_room/yuzu_room.cpp
index 8d8ac1ed7..359891883 100644
--- a/src/dedicated_room/yuzu_room.cpp
+++ b/src/dedicated_room/yuzu_room.cpp
@@ -76,8 +76,18 @@ static constexpr char BanListMagic[] = "YuzuRoom-BanList-1";
 static constexpr char token_delimiter{':'};
 
 static void PadToken(std::string& token) {
-    const auto remainder = token.size() % 3;
-    for (size_t i = 0; i < (3 - remainder); i++) {
+    std::size_t outlen = 0;
+
+    std::array<unsigned char, 512> output{};
+    std::array<unsigned char, 2048> roundtrip{};
+    for (size_t i = 0; i < 3; i++) {
+        mbedtls_base64_decode(output.data(), output.size(), &outlen,
+                              reinterpret_cast<const unsigned char*>(token.c_str()),
+                              token.length());
+        mbedtls_base64_encode(roundtrip.data(), roundtrip.size(), &outlen, output.data(), outlen);
+        if (memcmp(roundtrip.data(), token.data(), token.size()) == 0) {
+            break;
+        }
         token.push_back('=');
     }
 }
-- 
cgit v1.2.3