Torge Matthies : wintrust: Fix segfault in CRYPT_AsnEncodeAttributeTypeValue.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a35d2b17a58965974b16fc7960e5a1b10bee6c41
URL:    https://gitlab.winehq.org/wine/wine/-/commit/a35d2b17a58965974b16fc7960e5a1b...

Author: Torge Matthies <openglfreak(a)googlemail.com>
Date:   Mon Aug  7 11:04:33 2023 +0200

wintrust: Fix segfault in CRYPT_AsnEncodeAttributeTypeValue.

Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com>

---

 dlls/wintrust/asn.c       | 2 +-
 dlls/wintrust/tests/asn.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c
index 27a77629b11..7846ccb5e2e 100644
--- a/dlls/wintrust/asn.c
+++ b/dlls/wintrust/asn.c
@@ -681,7 +681,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAttributeTypeValue(DWORD dwCertEncodingType,
 {
     const CRYPT_ATTRIBUTE_TYPE_VALUE *typeValue = pvStructInfo;
     struct AsnEncodeSequenceItem items[] = {
-     { &typeValue->pszObjId, CRYPT_AsnEncodeOid, 0 },
+     { typeValue->pszObjId,  CRYPT_AsnEncodeOid, 0 },
      { &typeValue->Value,    CRYPT_CopyEncodedBlob, 0 },
     };
 
diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c
index 88778e990f1..09a00ea393a 100644
--- a/dlls/wintrust/tests/asn.c
+++ b/dlls/wintrust/tests/asn.c
@@ -575,11 +575,9 @@ static void test_encodeSPCIndirectDataContent(void)
 
     ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT,
      &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
-    todo_wine
     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
@@ -592,11 +590,9 @@ static void test_encodeSPCIndirectDataContent(void)
     indirectData.Digest.pbData = fakeDigest;
     ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT,
      &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
-    todo_wine
     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
@@ -608,7 +604,6 @@ static void test_encodeSPCIndirectDataContent(void)
     indirectData.DigestAlgorithm.pszObjId = szOID_OIWSEC_sha1_;
     ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT,
      &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
-    todo_wine
     ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError());
     if (ret)
     {
@@ -626,7 +621,6 @@ static void test_encodeSPCIndirectDataContent(void)
     indirectData.DigestAlgorithm.Parameters.pbData = parameters;
     ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT,
      &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
-    todo_wine
     ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError());
     if (ret)
     {
@@ -643,7 +637,6 @@ static void test_encodeSPCIndirectDataContent(void)
     indirectData.Data.pszObjId = SPC_PE_IMAGE_DATA_OBJID_;
     ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT,
      &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
-    todo_wine
     ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError());
     if (ret)
     {
@@ -661,7 +654,6 @@ static void test_encodeSPCIndirectDataContent(void)
     indirectData.Data.Value.pbData = (void*)emptySequence;
     ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_INDIRECT_DATA_CONTENT_STRUCT,
      &indirectData, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);
-    todo_wine
     ok(ret, "CryptEncodeObjectEx failed: %08lx\n", GetLastError());
     if (ret)
     {