Juan Lang : crypt32: Fix decoding cert issuer/subject unique ids.
Alexandre Julliard
julliard at winehq.org
Mon Nov 9 15:14:16 CST 2009
Module: wine
Branch: master
Commit: ed9a4ffa0ba943f6c9e6eeb2638b278b3331553a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9a4ffa0ba943f6c9e6eeb2638b278b3331553a
Author: Juan Lang <juan.lang at gmail.com>
Date: Fri Nov 6 11:23:17 2009 -0800
crypt32: Fix decoding cert issuer/subject unique ids.
---
dlls/crypt32/decode.c | 4 ++--
dlls/crypt32/tests/encode.c | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c
index fa1cc63..aacdcc9 100644
--- a/dlls/crypt32/decode.c
+++ b/dlls/crypt32/decode.c
@@ -1002,10 +1002,10 @@ static BOOL CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType,
CRYPT_AsnDecodePubKeyInfoInternal, sizeof(CERT_PUBLIC_KEY_INFO),
FALSE, TRUE, offsetof(CERT_INFO,
SubjectPublicKeyInfo.Algorithm.Parameters.pbData), 0 },
- { ASN_BITSTRING, offsetof(CERT_INFO, IssuerUniqueId),
+ { ASN_CONTEXT | 1, offsetof(CERT_INFO, IssuerUniqueId),
CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), TRUE, TRUE,
offsetof(CERT_INFO, IssuerUniqueId.pbData), 0 },
- { ASN_BITSTRING, offsetof(CERT_INFO, SubjectUniqueId),
+ { ASN_CONTEXT | 2, offsetof(CERT_INFO, SubjectUniqueId),
CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), TRUE, TRUE,
offsetof(CERT_INFO, SubjectUniqueId.pbData), 0 },
{ ASN_CONTEXT | ASN_CONSTRUCTOR | 3, offsetof(CERT_INFO, cExtension),
diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
index 1942a83..9cce74e 100644
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -3119,7 +3119,6 @@ static void test_decodeCertToBeSigned(DWORD dwEncoding)
v1CertWithSubjectIssuerSerialAndIssuerUniqueId,
sizeof(v1CertWithSubjectIssuerSerialAndIssuerUniqueId),
CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size);
- todo_wine
ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError());
if (ret)
{
More information about the wine-cvs
mailing list