[PATCH v2 0/1] MR5391: crypt32: Fix CryptBinaryToStringA not adding a separator.

[Santino Mazza (＠tati1454)]

--
  v2: crypt32: Fix CryptBinaryToString not adding a separator.

https://gitlab.winehq.org/wine/wine/-/merge_requests/5391

[PATCH v2 1/1] crypt32: Fix CryptBinaryToString not adding a separator.

[Santino Mazza]

From: Santino Mazza

---
 dlls/crypt32/base64.c       | 16 +++++++++-------
 dlls/crypt32/tests/base64.c |  8 ++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c
index b61ed7ff8cc..298756ca541 100644
--- a/dlls/crypt32/base64.c
+++ b/dlls/crypt32/base64.c
@@ -111,8 +111,6 @@ static DWORD encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep,
     i = 0;
     while (div > 0 && ptr < end)
     {
-        if (i && i % 64 == 0)
-            ptr += stradd(ptr, end, sep, strlen(sep));
         /* first char is the first 6 bits of the first byte*/
         chunk[0] = b64[ ( d[0] >> 2) & 0x3f ];
         /* second char is the last 2 bits of the first byte and the first 4
@@ -127,6 +125,9 @@ static DWORD encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep,
         i += 4;
         d += 3;
         div--;
+
+        if (i && i % 64 == 0)
+            ptr += stradd(ptr, end, sep, strlen(sep));
     }

switch(pad_bytes)
@@ -393,11 +394,6 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep,
     i = 0;
     while (div > 0)
     {
-        if (i && i % 64 == 0)
-        {
-            lstrcpyW(ptr, sep);
-            ptr += lstrlenW(sep);
-        }
         /* first char is the first 6 bits of the first byte*/
         *ptr++ = b64[ ( d[0] >> 2) & 0x3f ];
         /* second char is the last 2 bits of the first byte and the first 4
@@ -411,6 +407,12 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep,
         i += 4;
         d += 3;
         div--;
+
+        if (i && i % 64 == 0)
+        {
+            lstrcpyW(ptr, sep);
+            ptr += lstrlenW(sep);
+        }
     }

switch(pad_bytes)
diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c
index e81a57c576d..2263b236fa8 100644
--- a/dlls/crypt32/tests/base64.c
+++ b/dlls/crypt32/tests/base64.c
@@ -57,6 +57,8 @@ static const BYTE toEncode4[] =
 static const BYTE toEncode5[] =
  "abcdefghijlkmnopqrstuvwxyz01234567890ABCDEFGHI";

+static const BYTE toEncode6[] = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+
 static const struct BinTests tests[] = {
  { toEncode1, sizeof(toEncode1), "AA==\r\n", },
  { toEncode2, sizeof(toEncode2), "AQI=\r\n", },
@@ -69,6 +71,9 @@ static const struct BinTests tests[] = {
    "SElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NTY3ODkwAA==\r\n" },
  { toEncode5, sizeof(toEncode5),
    "YWJjZGVmZ2hpamxrbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5MEFCQ0RFRkdISQA=\r\n" },
+ { toEncode6, sizeof(toEncode6),
+   "YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh\r\n"
+   "YQA=\r\n" },
 };

static const struct BinTests testsNoCR[] = {
@@ -83,6 +88,9 @@ static const struct BinTests testsNoCR[] = {
    "SElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0NTY3ODkwAA==\n" },
  { toEncode5, sizeof(toEncode5),
    "YWJjZGVmZ2hpamxrbW5vcHFyc3R1dnd4eXowMTIzNDU2Nzg5MEFCQ0RFRkdISQA=\n" },
+ { toEncode6, sizeof(toEncode6),
+   "YWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFh\n"
+   "YQA=\n" },
 };

static WCHAR *strdupAtoW(const char *str)

[PATCH v2 0/1] MR5391: crypt32: Fix CryptBinaryToStringA not adding a separator. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.