Torge Matthies : wintrust: Encode algorithm id without parameters if pszObjId is NULL.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c58c42ad93d04034345266c4639734979b3bbcde
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c58c42ad93d04034345266c46397349...

Author: Torge Matthies 
Date:   Mon Aug  7 11:04:34 2023 +0200

wintrust: Encode algorithm id without parameters if pszObjId is NULL.

The only user of this function is CRYPT_AsnEncodeSPCDigest, whose only user is WVTAsn1SpcIndirectDataContentEncode, so
this behavior might be specific to that function.

Signed-off-by: Torge Matthies

---

dlls/wintrust/asn.c       | 8 ++++++--
 dlls/wintrust/tests/asn.c | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c
index 71a2025c461..87deff72245 100644
--- a/dlls/wintrust/asn.c
+++ b/dlls/wintrust/asn.c
@@ -652,6 +652,7 @@ static BOOL WINAPI CRYPT_CopyEncodedBlob(DWORD dwCertEncodingType,
     return ret;
 }

+/* Different from the one in crypt32 */
 static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams(
  DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo,
  BYTE *pbEncoded, DWORD *pcbEncoded)
@@ -665,12 +666,15 @@ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams(
      { algo->pszObjId, CRYPT_AsnEncodeOid, 0 },
      { NULL,           CRYPT_CopyEncodedBlob, 0 },
     };
+    DWORD cItem = 2;

if (algo->Parameters.cbData)
         items[1].pvStructInfo = &algo->Parameters;
-    else
+    else if (algo->pszObjId)
         items[1].pvStructInfo = &nullBlob;
-    ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items),
+    else
+        cItem -= 1;
+    ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem,
      pbEncoded, pcbEncoded);
     return ret;
 }
diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c
index fa0716a2d4d..deaaf40e64b 100644
--- a/dlls/wintrust/tests/asn.c
+++ b/dlls/wintrust/tests/asn.c
@@ -578,10 +578,8 @@ static void test_encodeSPCIndirectDataContent(void)
     ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError());
     if (ret)
     {
-        todo_wine
         ok(size == sizeof(emptyIndirectData), "Unexpected size %ld\n", size);
         if (size == sizeof(emptyIndirectData))
-            todo_wine
             ok(!memcmp(buf, emptyIndirectData, sizeof(emptyIndirectData)),
              "Unexpected value\n");
         LocalFree(buf);
@@ -594,10 +592,8 @@ static void test_encodeSPCIndirectDataContent(void)
     ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError());
     if (ret)
     {
-        todo_wine
         ok(size == sizeof(spcidcWithOnlyDigest), "Unexpected size %ld\n", size);
         if (size == sizeof(spcidcWithOnlyDigest))
-            todo_wine
             ok(!memcmp(buf, spcidcWithOnlyDigest, sizeof(spcidcWithOnlyDigest)),
              "Unexpected value\n");
         LocalFree(buf);