[PATCH 1/4] crypt32: Use correct tag for OCSP basic response extensions.

[Paul Gofman]

From: Paul Gofman

---
 dlls/crypt32/decode.c       |  2 +-
 dlls/crypt32/tests/encode.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c
index cfdeef5380a..44877a6e9d6 100644
--- a/dlls/crypt32/decode.c
+++ b/dlls/crypt32/decode.c
@@ -6722,7 +6722,7 @@ static BOOL WINAPI CRYPT_AsnDecodeOCSPBasicResponse(DWORD dwCertEncodingType,
      { ASN_SEQUENCEOF, offsetof(OCSP_BASIC_RESPONSE_INFO, cResponseEntry),
        CRYPT_AsnDecodeOCSPBasicResponseEntriesArray, MEMBERSIZE(OCSP_BASIC_RESPONSE_INFO, cResponseEntry, cExtension),
        TRUE, TRUE, offsetof(OCSP_BASIC_RESPONSE_INFO, rgResponseEntry) },
-     { ASN_CONTEXT | ASN_CONSTRUCTOR, offsetof(OCSP_BASIC_RESPONSE_INFO, cExtension),
+     { ASN_CONTEXT | ASN_CONSTRUCTOR | 1, offsetof(OCSP_BASIC_RESPONSE_INFO, cExtension),
        CRYPT_AsnDecodeCertExtensions, FINALMEMBERSIZE(OCSP_BASIC_RESPONSE_INFO, cExtension),
        TRUE, TRUE, offsetof(OCSP_BASIC_RESPONSE_INFO, rgExtension), 0 },
      };
diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
index b5db9cf7d0d..c6c461999e6 100644
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -8847,6 +8847,7 @@ static const BYTE ocsp_basic_signed_response_with_cert[] =
 static void test_decodeOCSPBasicSignedResponseInfo(DWORD dwEncoding)
 {
     OCSP_BASIC_SIGNED_RESPONSE_INFO *info;
+    OCSP_BASIC_RESPONSE_INFO *b;
     DWORD size;
     BOOL ret;

@@ -8875,12 +8876,25 @@ static void test_decodeOCSPBasicSignedResponseInfo(DWORD dwEncoding)

ok(!info->SignatureInfo.cCertEncoded, "got %lu\n", info->SignatureInfo.cCertEncoded);
     ok(!info->SignatureInfo.rgCertEncoded, "got %p\n", info->SignatureInfo.rgCertEncoded);
+
+
+    ret = CryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, info->ToBeSigned.pbData, info->ToBeSigned.cbData,
+                             CRYPT_DECODE_ALLOC_FLAG, NULL, &b, &size);
+    ok(ret, "got %08lx\n", GetLastError());
+    ok(!b->cExtension, "got %lu.\n", b->cExtension);
+    LocalFree(b);
     LocalFree(info);

size = 0;
     ret = CryptDecodeObjectEx(dwEncoding, OCSP_BASIC_SIGNED_RESPONSE, ocsp_basic_signed_response_with_cert,
                                sizeof(ocsp_basic_signed_response_with_cert), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size);
     ok(ret, "got %08lx\n", GetLastError());
+
+    ret = CryptDecodeObjectEx(dwEncoding, OCSP_BASIC_RESPONSE, info->ToBeSigned.pbData, info->ToBeSigned.cbData,
+                             CRYPT_DECODE_ALLOC_FLAG, NULL, &b, &size);
+    ok(ret, "got %08lx\n", GetLastError());
+    ok(b->cExtension == 1, "got %lu.\n", b->cExtension);
+    LocalFree(b);
     LocalFree(info);
 }