July 2007 - Wine-commits - list.winehq.org

Evan Stade : gdiplus: Fix memory leak.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: f52adfd0dea44dcdea0e87b624f9fdf7970d889c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52adfd0dea44dcdea0e87b62… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 25 19:15:20 2007 -0700 gdiplus: Fix memory leak. --- dlls/gdiplus/graphics.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f53ea4c..3836476 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -154,6 +154,7 @@ static void transform_and_round_points(GpGraphics *graphics, POINT *pti, GdipCloneMatrix(graphics->worldtrans, &matrix); GdipScaleMatrix(matrix, unitscale, unitscale, MatrixOrderAppend); GdipTransformMatrixPoints(matrix, ptf, count); + GdipDeleteMatrix(matrix); for(i = 0; i < count; i++){ pti[i].x = roundr(ptf[i].X);

1 0

Evan Stade : gdiplus: Added GdipAddPathEllipse.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: fe2ce3a08b61f5629181148e53d4ec39b58ced1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2ce3a08b61f5629181148e5… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 25 19:15:24 2007 -0700 gdiplus: Added GdipAddPathEllipse. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 30 ++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 74ba047..02b1e18 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -14,7 +14,7 @@ @ stub GdipAddPathCurve3I @ stub GdipAddPathCurve @ stub GdipAddPathCurveI -@ stub GdipAddPathEllipse +@ stdcall GdipAddPathEllipse(ptr long long long long) @ stub GdipAddPathEllipseI @ stdcall GdipAddPathLine2(ptr ptr long) @ stub GdipAddPathLine2I diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index d059482..4fe99e0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -121,6 +121,36 @@ GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points, return Ok; } +GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, + REAL height) +{ + INT old_count, numpts; + + if(!path) + return InvalidParameter; + + if(!lengthen_path(path, MAX_ARC_PTS)) + return OutOfMemory; + + old_count = path->pathdata.Count; + if((numpts = arc2polybezier(&path->pathdata.Points[old_count], x, y, width, + height, 0.0, 360.0)) != MAX_ARC_PTS){ + ERR("expected %d points but got %d\n", MAX_ARC_PTS, numpts); + return GenericError; + } + + memset(&path->pathdata.Types[old_count + 1], PathPointTypeBezier, + MAX_ARC_PTS - 1); + + /* An ellipse is an instrinsic figure (always its own subpath). */ + path->pathdata.Types[old_count] = PathPointTypeStart; + path->pathdata.Types[old_count + MAX_ARC_PTS - 1] |= PathPointTypeCloseSubpath; + path->newfigure = TRUE; + path->pathdata.Count += MAX_ARC_PTS; + + return Ok; +} + GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, INT count) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 816f32d..d56c45c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -89,6 +89,7 @@ GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill*,ARGB); GpStatus WINGDIPAPI GdipAddPathArc(GpPath*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathLine2(GpPath*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipAddPathPath(GpPath*,GDIPCONST GpPath*,BOOL); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*);

1 0

Juan Lang : crypt32: Test and fix encoding and decoding of attributes in PKCS signers.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: c58cb379ebf5875ca241b609765554a9099e0e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58cb379ebf5875ca241b6097… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 25 18:13:45 2007 -0700 crypt32: Test and fix encoding and decoding of attributes in PKCS signers. --- dlls/crypt32/decode.c | 27 ++++++++++++-------- dlls/crypt32/encode.c | 30 +++++++++++++++-------- dlls/crypt32/tests/encode.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 29e1a2d..52e207e 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1896,9 +1896,8 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttributesInternal( DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { - struct AsnArrayDescriptor arrayDesc = { ASN_CONSTRUCTOR | ASN_SETOF, - CRYPT_AsnDecodePKCSAttribute, sizeof(CRYPT_ATTRIBUTE), TRUE, - offsetof(CRYPT_ATTRIBUTE, pszObjId) }; + struct AsnArrayDescriptor arrayDesc = { 0, CRYPT_AsnDecodePKCSAttribute, + sizeof(CRYPT_ATTRIBUTE), TRUE, offsetof(CRYPT_ATTRIBUTE, pszObjId) }; PCRYPT_ATTRIBUTES attrs = (PCRYPT_ATTRIBUTES)pvStructInfo; BOOL ret; @@ -1921,8 +1920,12 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttributes(DWORD dwCertEncodingType, { DWORD bytesNeeded; - if ((ret = CRYPT_AsnDecodePKCSAttributesInternal(dwCertEncodingType, - lpszStructType, pbEncoded, cbEncoded, + if (!cbEncoded) + SetLastError(CRYPT_E_ASN1_EOD); + else if (pbEncoded[0] != (ASN_CONSTRUCTOR | ASN_SETOF)) + SetLastError(CRYPT_E_ASN1_CORRUPT); + else if ((ret = CRYPT_AsnDecodePKCSAttributesInternal( + dwCertEncodingType, lpszStructType, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, &bytesNeeded))) { if (!pvStructInfo) @@ -3813,19 +3816,21 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, { ASN_SEQUENCEOF, offsetof(CMSG_SIGNER_INFO, HashAlgorithm), CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, HashAlgorithm.pszObjId), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 0, + offsetof(CMSG_SIGNER_INFO, AuthAttrs), + CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), + TRUE, TRUE, offsetof(CMSG_SIGNER_INFO, AuthAttrs.rgAttr), 0 }, { ASN_SEQUENCEOF, offsetof(CMSG_SIGNER_INFO, HashEncryptionAlgorithm), CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, HashEncryptionAlgorithm.pszObjId), 0 }, - { ASN_CONSTRUCTOR | ASN_SETOF, offsetof(CMSG_SIGNER_INFO, AuthAttrs), - CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), - TRUE, TRUE, offsetof(CMSG_SIGNER_INFO, AuthAttrs.rgAttr), 0 }, - { ASN_CONSTRUCTOR | ASN_SETOF, offsetof(CMSG_SIGNER_INFO, UnauthAttrs), - CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), - TRUE, TRUE, offsetof(CMSG_SIGNER_INFO, UnauthAttrs.rgAttr), 0 }, { ASN_OCTETSTRING, offsetof(CMSG_SIGNER_INFO, EncryptedHash), CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_DER_BLOB), FALSE, TRUE, offsetof(CMSG_SIGNER_INFO, EncryptedHash.pbData), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 1, + offsetof(CMSG_SIGNER_INFO, UnauthAttrs), + CRYPT_AsnDecodePKCSAttributesInternal, sizeof(CRYPT_ATTRIBUTES), + TRUE, TRUE, offsetof(CMSG_SIGNER_INFO, UnauthAttrs.rgAttr), 0 }, }; ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index e6695cf..b653a0d 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3201,26 +3201,36 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSSignerInfo(DWORD dwCertEncodingType, { &info->Issuer, CRYPT_AsnEncodeIssuerSerialNumber, 0 }, { &info->HashAlgorithm, CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 }, - { &info->HashEncryptionAlgorithm, - CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 }, }; - DWORD cItem = 4; + struct AsnEncodeTagSwappedItem swapped[2] = { { 0 } }; + DWORD cItem = 3, cSwapped = 0; if (info->AuthAttrs.cAttr) { - items[cItem].pvStructInfo = &info->AuthAttrs; - items[cItem].encodeFunc = CRYPT_AsnEncodePKCSAttributes; + swapped[cSwapped].tag = ASN_CONTEXT | ASN_CONSTRUCTOR | 0; + swapped[cSwapped].pvStructInfo = &info->AuthAttrs; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodePKCSAttributes; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; cItem++; } + items[cItem].pvStructInfo = &info->HashEncryptionAlgorithm; + items[cItem].encodeFunc = CRYPT_AsnEncodeAlgorithmIdWithNullParams; + cItem++; + items[cItem].pvStructInfo = &info->EncryptedHash; + items[cItem].encodeFunc = CRYPT_AsnEncodeOctets; + cItem++; if (info->UnauthAttrs.cAttr) { - items[cItem].pvStructInfo = &info->UnauthAttrs; - items[cItem].encodeFunc = CRYPT_AsnEncodePKCSAttributes; + swapped[cSwapped].tag = ASN_CONTEXT | ASN_CONSTRUCTOR | 1; + swapped[cSwapped].pvStructInfo = &info->UnauthAttrs; + swapped[cSwapped].encodeFunc = CRYPT_AsnEncodePKCSAttributes; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; cItem++; } - items[cItem].pvStructInfo = &info->EncryptedHash; - items[cItem].encodeFunc = CRYPT_AsnEncodeOctets; - cItem++; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem, dwFlags, pEncodePara, pbEncoded, pcbEncoded); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 8173a12..467619a 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -4924,6 +4924,14 @@ static const BYTE PKCSSignerWithHash[] = { 0x01,0x01,0x30,0x06,0x06,0x02,0x2a,0x03,0x05,0x00,0x30,0x06,0x06,0x02,0x2d, 0x06,0x05,0x00,0x04,0x10,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09, 0x0a,0x0b,0x0c,0x0d,0x0e,0x0f }; +static const BYTE PKCSSignerWithAuthAttr[] = { +0x30,0x62,0x02,0x01,0x00,0x30,0x19,0x30,0x14,0x31,0x12,0x30,0x10,0x06,0x03, +0x55,0x04,0x03,0x13,0x09,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x02, +0x01,0x01,0x30,0x06,0x06,0x02,0x2a,0x03,0x05,0x00,0xa0,0x20,0x30,0x1e,0x06, +0x03,0x55,0x04,0x03,0x31,0x17,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55, +0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x30, +0x06,0x06,0x02,0x2d,0x06,0x05,0x00,0x04,0x10,0x00,0x01,0x02,0x03,0x04,0x05, +0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f }; static void test_encodePKCSSignerInfo(DWORD dwEncoding) { @@ -4932,6 +4940,10 @@ static void test_encodePKCSSignerInfo(DWORD dwEncoding) LPBYTE buf = NULL; DWORD size = 0; CMSG_SIGNER_INFO info = { 0 }; + char oid_common_name[] = szOID_COMMON_NAME; + CRYPT_ATTR_BLOB commonName = { sizeof(encodedCommonName), + (LPBYTE)encodedCommonName }; + CRYPT_ATTRIBUTE attr = { oid_common_name, 1, &commonName }; SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, @@ -5053,6 +5065,29 @@ static void test_encodePKCSSignerInfo(DWORD dwEncoding) LocalFree(buf); } } + info.AuthAttrs.cAttr = 1; + info.AuthAttrs.rgAttr = &attr; + SetLastError(0xdeadbeef); + ret = CryptEncodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + if (!(dwEncoding & PKCS_7_ASN_ENCODING)) + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + else + { + ok(ret, "CryptEncodeObjectEx failed: %x\n", GetLastError()); + if (buf) + { + ok(size == sizeof(PKCSSignerWithAuthAttr), "Unexpected size %d\n", + size); + if (size == sizeof(PKCSSignerWithAuthAttr)) + ok(!memcmp(buf, PKCSSignerWithAuthAttr, size), + "Unexpected value\n"); + else + ok(0, "Unexpected value\n"); + LocalFree(buf); + } + } } static void test_decodePKCSSignerInfo(DWORD dwEncoding) @@ -5157,6 +5192,26 @@ static void test_decodePKCSSignerInfo(DWORD dwEncoding) "Unexpected value\n"); LocalFree(buf); } + ret = CryptDecodeObjectEx(dwEncoding, PKCS7_SIGNER_INFO, + PKCSSignerWithAuthAttr, sizeof(PKCSSignerWithAuthAttr), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + if (buf) + { + info = (CMSG_SIGNER_INFO *)buf; + ok(info->AuthAttrs.cAttr == 1, "Expected 1 attribute, got %d\n", + info->AuthAttrs.cAttr); + ok(!strcmp(info->AuthAttrs.rgAttr[0].pszObjId, szOID_COMMON_NAME), + "Expected %s, got %s\n", szOID_COMMON_NAME, + info->AuthAttrs.rgAttr[0].pszObjId); + ok(info->AuthAttrs.rgAttr[0].cValue == 1, "Expected 1 value, got %d\n", + info->AuthAttrs.rgAttr[0].cValue); + ok(info->AuthAttrs.rgAttr[0].rgValue[0].cbData == + sizeof(encodedCommonName), "Unexpected size %d\n", + info->AuthAttrs.rgAttr[0].rgValue[0].cbData); + ok(!memcmp(info->AuthAttrs.rgAttr[0].rgValue[0].pbData, + encodedCommonName, sizeof(encodedCommonName)), "Unexpected value\n"); + LocalFree(buf); + } } /* Free *pInfo with HeapFree */

1 0

Juan Lang : crypt32: Actually skip content when skipping an item in a sequence.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 30346ee2969125a61460c0ef941311c466343df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30346ee2969125a61460c0ef9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 25 18:10:40 2007 -0700 crypt32: Actually skip content when skipping an item in a sequence. --- dlls/crypt32/decode.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 8a062ce..7281b15 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -381,6 +381,7 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, } else { + ptr += 1 + nextItemLenBytes + nextItemLen; decoded += 1 + nextItemLenBytes + nextItemLen; items[i].size = items[i].minSize; }

1 0

Juan Lang : crypt32: Don't check tag in CRYPT_DecodeDERArray, caller already does.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 5674ca2e4e80f30930170fd614c8441088b63ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5674ca2e4e80f30930170fd61… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 25 18:11:31 2007 -0700 crypt32: Don't check tag in CRYPT_DecodeDERArray, caller already does. --- dlls/crypt32/decode.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7281b15..f66ae85 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1847,9 +1847,8 @@ static BOOL WINAPI CRYPT_DecodeDERArray(DWORD dwCertEncodingType, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) { BOOL ret; - struct AsnArrayDescriptor arrayDesc = { ASN_CONSTRUCTOR | ASN_SETOF, - CRYPT_AsnDecodeCopyBytes, sizeof(CRYPT_DER_BLOB), TRUE, - offsetof(CRYPT_DER_BLOB, pbData) }; + struct AsnArrayDescriptor arrayDesc = { 0, CRYPT_AsnDecodeCopyBytes, + sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) }; struct GenericArray *array = (struct GenericArray *)pvStructInfo; TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags,

1 0

Juan Lang : crypt32: Partially implement decoding of signed messages.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 3a85fa6b15abe69c6a4a974689a571df41763ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a85fa6b15abe69c6a4a97468… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 25 18:12:16 2007 -0700 crypt32: Partially implement decoding of signed messages. --- dlls/crypt32/crypt32_private.h | 4 +++ dlls/crypt32/decode.c | 56 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/msg.c | 22 +++++++++++++++- 3 files changed, 81 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 9b1fc27..14f081f 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -99,6 +99,10 @@ typedef struct _CRYPT_SIGNED_INFO BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *, void *pvData, DWORD *pcbData); +BOOL CRYPT_AsnDecodePKCSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, + CRYPT_SIGNED_INFO *signedInfo, DWORD *pcbSignedInfo); + /* Helper function to check *pcbEncoded, set it to the required size, and * optionally to allocate memory. Assumes pbEncoded is not NULL. * If CRYPT_ENCODE_ALLOC_FLAG is set in dwFlags, *pbEncoded will be set to a diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index f66ae85..29e1a2d 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3841,6 +3841,62 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_DecodeSignerArray(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + struct AsnArrayDescriptor arrayDesc = { ASN_CONSTRUCTOR | ASN_SETOF, + CRYPT_AsnDecodePKCSSignerInfo, sizeof(CMSG_SIGNER_INFO), TRUE, + offsetof(CMSG_SIGNER_INFO, Issuer.pbData) }; + struct GenericArray *array = (struct GenericArray *)pvStructInfo; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, *pcbStructInfo); + + ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pcbStructInfo, array ? array->rgItems : NULL); + return ret; +} + +BOOL CRYPT_AsnDecodePKCSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, + CRYPT_SIGNED_INFO *signedInfo, DWORD *pcbSignedInfo) +{ + BOOL ret = FALSE; + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(CRYPT_SIGNED_INFO, version), CRYPT_AsnDecodeInt, + sizeof(DWORD), FALSE, FALSE, 0, 0 }, + /* Placeholder for the hash algorithms - redundant with those in the + * signers, so just ignore them. + */ + { ASN_CONSTRUCTOR | ASN_SETOF, 0, NULL, 0, TRUE, FALSE, 0, 0 }, + { ASN_SEQUENCE, offsetof(CRYPT_SIGNED_INFO, content), + CRYPT_AsnDecodePKCSContentInfoInternal, sizeof(CRYPT_CONTENT_INFO), + FALSE, TRUE, offsetof(CRYPT_SIGNED_INFO, content.pszObjId), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 0, + offsetof(CRYPT_SIGNED_INFO, cCertEncoded), + CRYPT_DecodeDERArray, sizeof(struct GenericArray), TRUE, TRUE, + offsetof(CRYPT_SIGNED_INFO, rgCertEncoded), 0 }, + { ASN_CONSTRUCTOR | ASN_CONTEXT | 1, + offsetof(CRYPT_SIGNED_INFO, cCrlEncoded), CRYPT_DecodeDERArray, + sizeof(struct GenericArray), TRUE, TRUE, + offsetof(CRYPT_SIGNED_INFO, rgCrlEncoded), 0 }, + { ASN_CONSTRUCTOR | ASN_SETOF, offsetof(CRYPT_SIGNED_INFO, cSignerInfo), + CRYPT_DecodeSignerArray, sizeof(struct GenericArray), TRUE, TRUE, + offsetof(CRYPT_SIGNED_INFO, rgSignerInfo), 0 }, + }; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, signedInfo, *pcbSignedInfo); + + ret = CRYPT_AsnDecodeSequence(X509_ASN_ENCODING, items, + sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, + pDecodePara, signedInfo, pcbSignedInfo, NULL); + TRACE("returning %d\n", ret); + return ret; +} + BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index a842286..7ccfb53 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1253,6 +1253,23 @@ static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg, return ret; } +static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, + CRYPT_DER_BLOB *blob) +{ + BOOL ret; + CRYPT_SIGNED_INFO *signedInfo; + DWORD size; + + ret = CRYPT_AsnDecodePKCSSignedInfo(blob->pbData, blob->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_SIGNED_INFO *)&signedInfo, + &size); + if (ret) + { + FIXME("store properties in message\n"); + LocalFree(signedInfo); + } + return ret; +} /* Decodes the content in blob as the type given, and updates the value * (type, parameters, etc.) of msg based on what blob contains. * It doesn't just use msg's type, to allow a recursive call from an implicitly @@ -1274,10 +1291,13 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, msg->type = CMSG_HASHED; break; case CMSG_ENVELOPED: - case CMSG_SIGNED: FIXME("unimplemented for type %s\n", MSG_TYPE_STR(type)); ret = TRUE; break; + case CMSG_SIGNED: + if ((ret = CDecodeMsg_DecodeSignedContent(msg, blob))) + msg->type = CMSG_HASHED; + break; default: { CRYPT_CONTENT_INFO *info;

1 0

Juan Lang : crypt32: Trace a few more items when decoding.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: b8ab462100222dfeece36d123a4478469926f332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ab462100222dfeece36d123… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 25 18:14:25 2007 -0700 crypt32: Trace a few more items when decoding. --- dlls/crypt32/decode.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 52e207e..de4de4a 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -366,6 +366,8 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, items[i].size % sizeof(DWORD); ptr += 1 + nextItemLenBytes + nextItemLen; decoded += 1 + nextItemLenBytes + nextItemLen; + TRACE("item %d: decoded %d bytes\n", i, + 1 + nextItemLenBytes + nextItemLen); } else if (items[i].optional && GetLastError() == CRYPT_E_ASN1_BADTAG) @@ -381,6 +383,8 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, } else { + TRACE("item %d: decoded %d bytes\n", i, + 1 + nextItemLenBytes + nextItemLen); ptr += 1 + nextItemLenBytes + nextItemLen; decoded += 1 + nextItemLenBytes + nextItemLen; items[i].size = items[i].minSize; @@ -393,8 +397,8 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, } else { - TRACE("tag %02x doesn't match expected %02x\n", - ptr[0], items[i].tag); + TRACE("item %d: tag %02x doesn't match expected %02x\n", + i, ptr[0], items[i].tag); SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; }

1 0

Juan Lang : crypt32: Remove redundant assignment.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 429e5b300fe88b34f733fad758832ed253ee2e9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=429e5b300fe88b34f733fad75… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 25 18:10:12 2007 -0700 crypt32: Remove redundant assignment. --- dlls/crypt32/msg.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ba75cb6..a842286 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1231,7 +1231,6 @@ static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg, &size); if (ret) { - msg->type = CMSG_HASHED; ContextPropertyList_SetProperty(msg->properties, CMSG_VERSION_PARAM, (const BYTE *)&digestedData->version, sizeof(digestedData->version)); CDecodeMsg_SaveAlgorithmID(msg, CMSG_HASH_ALGORITHM_PARAM,

1 0

Juan Lang : crypt32: Add initial tests for decoding signed messages.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: e0b13a20b5680e797072efd3033a7e10ed32c78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b13a20b5680e797072efd30… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 25 18:09:37 2007 -0700 crypt32: Add initial tests for decoding signed messages. --- dlls/crypt32/tests/msg.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index f65c7f8..ad4113a 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1843,6 +1843,24 @@ static void test_decode_msg_update(void) ret = CryptMsgUpdate(msg, bogusHashContent, sizeof(bogusHashContent), TRUE); ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, signedContent, sizeof(signedContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, signedWithCertAndCrlBareContent, + sizeof(signedWithCertAndCrlBareContent), TRUE); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %08x\n", GetLastError()); + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, + NULL); + ret = CryptMsgUpdate(msg, signedWithCertAndCrlBareContent, + sizeof(signedWithCertAndCrlBareContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); } static const BYTE hashParam[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,

1 0

Juan Lang : crypt32: Test getting the hash from a hash message with an invalid index.
by Alexandre Julliard 26 Jul '07

26 Jul '07

Module: wine Branch: master Commit: 55729020460264338a633d495be305a1aca64400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55729020460264338a633d495… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 25 18:08:58 2007 -0700 crypt32: Test getting the hash from a hash message with an invalid index. --- dlls/crypt32/tests/msg.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 3bd0882..f65c7f8 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1853,6 +1853,7 @@ static void test_decode_msg_get_param(void) HCRYPTMSG msg; BOOL ret; DWORD size = 0, version; + LPBYTE buf; msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); SetLastError(0xdeadbeef); @@ -1879,7 +1880,19 @@ static void test_decode_msg_get_param(void) sizeof(hashParam)); check_param("hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, hashParam, sizeof(hashParam)); - size = strlen(szOID_RSA_data) + 1; + /* Curiously, getting the hash of index 1 succeeds, even though there's + * only one hash. + */ + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + buf = CryptMemAlloc(size); + if (buf) + { + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, buf, &size); + ok(size == sizeof(hashParam), "Unexpected size %d\n", size); + ok(!memcmp(buf, hashParam, size), "Unexpected value\n"); + CryptMemFree(buf); + } check_param("hash inner OID", msg, CMSG_INNER_CONTENT_TYPE_PARAM, (const BYTE *)szOID_RSA_data, strlen(szOID_RSA_data) + 1); version = CMSG_HASHED_DATA_V0;

1 0