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

James Hawkins : msi: Properly delete the columns view.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 8a7690c1519189d49d7fc4c6d4a2bd01462fddaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7690c1519189d49d7fc4c6d… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jul 23 19:19:15 2007 -0700 msi: Properly delete the columns view. --- dlls/msi/alter.c | 2 +- dlls/msi/table.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 734aaba..cfb8ab4 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -129,7 +129,7 @@ static UINT alter_add_column(MSIALTERVIEW *av) colnum, av->colinfo->column, av->colinfo->type, (av->hold == 1)); - msiobj_release(&columns->hdr); + columns->ops->delete(columns); return r; } diff --git a/dlls/msi/table.c b/dlls/msi/table.c index b65494a..745712a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1686,7 +1686,7 @@ static UINT TABLE_add_ref(struct tagMSIVIEW *view) static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - MSIRECORD *rec; + MSIRECORD *rec = NULL; MSIVIEW *columns = NULL; UINT row, r; @@ -1713,7 +1713,7 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num done: msiobj_release(&rec->hdr); - if (columns) msiobj_release(&columns->hdr); + if (columns) columns->ops->delete(columns); return r; }

1 0

Juan Lang : crypt32: Test and implement encoding signed messages with certificates.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 01ab14e1745ae2630ddd409c822717bed7edec62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ab14e1745ae2630ddd409c8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 18:23:43 2007 -0700 crypt32: Test and implement encoding signed messages with certificates. --- dlls/crypt32/encode.c | 23 ++++++++++++++--- dlls/crypt32/tests/msg.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 2645715..d8ccf7e 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3239,12 +3239,12 @@ BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, struct AsnEncodeSequenceItem items[7] = { { &signedInfo->version, CRYPT_AsnEncodeInt, 0 }, }; - struct DERSetDescriptor digestAlgorithmsSet = { 0 }, signerSet = { 0 }; - DWORD cItem = 1; + struct DERSetDescriptor digestAlgorithmsSet = { 0 }, certSet = { 0 }; + struct DERSetDescriptor signerSet = { 0 }; + struct AsnEncodeTagSwappedItem swapped[2] = { { 0 } }; + DWORD cItem = 1, cSwapped = 0; BOOL ret = TRUE; - if (signedInfo->cCertEncoded) - FIXME("unimplemented for certs\n"); if (signedInfo->cCrlEncoded) FIXME("unimplemented for CRLs\n"); if (signedInfo->cAttrCertEncoded) @@ -3264,6 +3264,21 @@ BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, items[cItem].pvStructInfo = &signedInfo->content; items[cItem].encodeFunc = CRYPT_AsnEncodePKCSContentInfoInternal; cItem++; + if (signedInfo->cCertEncoded) + { + certSet.cItems = signedInfo->cCertEncoded; + certSet.items = signedInfo->rgCertEncoded; + certSet.itemSize = sizeof(CERT_BLOB); + certSet.itemOffset = 0; + certSet.encode = CRYPT_CopyEncodedBlob; + swapped[cSwapped].tag = ASN_CONSTRUCTOR | ASN_CONTEXT | 0; + swapped[cSwapped].pvStructInfo = &certSet; + swapped[cSwapped].encodeFunc = CRYPT_DEREncodeItemsAsSet; + items[cItem].pvStructInfo = &swapped[cSwapped]; + items[cItem].encodeFunc = CRYPT_AsnEncodeSwapTag; + cSwapped++; + cItem++; + } if (ret && signedInfo->cSignerInfo) { signerSet.cItems = signedInfo->cSignerInfo; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 0568331..de11303 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1256,6 +1256,52 @@ static const BYTE signedContent[] = { static const BYTE signedHash[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26, 0x2f }; +static BYTE cert[] = { +0x30,0x7a,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30, +0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11,0x06, +0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67, +0x00,0x30,0x07,0x30,0x02,0x06,0x00,0x03,0x01,0x00,0xa3,0x16,0x30,0x14,0x30, +0x12,0x06,0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01, +0xff,0x02,0x01,0x01 }; +static const BYTE signedWithCertEmptyBareContent[] = { +0x30,0x81,0xce,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48, +0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x02,0x06,0x00,0xa0,0x7c,0x30,0x7a, +0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03, +0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00, +0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55, +0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x30, +0x07,0x30,0x02,0x06,0x00,0x03,0x01,0x00,0xa3,0x16,0x30,0x14,0x30,0x12,0x06, +0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02, +0x01,0x01,0x31,0x37,0x30,0x35,0x02,0x01,0x01,0x30,0x1a,0x30,0x15,0x31,0x13, +0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c, +0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00,0x04,0x00 }; +static const BYTE signedWithCertBareContent[] = { +0x30,0x82,0x01,0x1f,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a,0x86, +0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x13,0x06,0x09,0x2a,0x86,0x48, +0x86,0xf7,0x0d,0x01,0x07,0x01,0xa0,0x06,0x04,0x04,0x01,0x02,0x03,0x04,0xa0, +0x7c,0x30,0x7a,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x07,0x30,0x02,0x06,0x00,0x03,0x01,0x00,0xa3,0x16,0x30,0x14, +0x30,0x12,0x06,0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01, +0x01,0xff,0x02,0x01,0x01,0x31,0x77,0x30,0x75,0x02,0x01,0x01,0x30,0x1a,0x30, +0x15,0x31,0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61, +0x6e,0x20,0x4c,0x61,0x6e,0x67,0x00,0x02,0x01,0x01,0x30,0x0c,0x06,0x08,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x02,0x05,0x05,0x00,0x30,0x04,0x06,0x00,0x05,0x00, +0x04,0x40,0x81,0xa6,0x70,0xb3,0xef,0x59,0xd1,0x66,0xd1,0x9b,0xc0,0x9a,0xb6, +0x9a,0x5e,0x6d,0x6f,0x6d,0x0d,0x59,0xa9,0xaa,0x6e,0xe9,0x2c,0xa0,0x1e,0xee, +0xc2,0x60,0xbc,0x59,0xbe,0x3f,0x63,0x06,0x8d,0xc9,0x11,0x1d,0x23,0x64,0x92, +0xef,0x2e,0xfc,0x57,0x29,0xa4,0xaf,0xe0,0xee,0x93,0x19,0x39,0x51,0xe4,0x44, +0xb8,0x0b,0x28,0xf4,0xa8,0x0d }; static void test_signed_msg_encoding(void) { @@ -1263,6 +1309,7 @@ static void test_signed_msg_encoding(void) CMSG_SIGNED_ENCODE_INFO signInfo = { sizeof(signInfo), 0 }; CMSG_SIGNER_ENCODE_INFO signer = { sizeof(signer), 0 }; CERT_INFO certInfo = { 0 }; + CERT_BLOB encodedCert = { sizeof(cert), cert }; BOOL ret; HCRYPTKEY key; DWORD size; @@ -1326,6 +1373,22 @@ static void test_signed_msg_encoding(void) CryptMsgClose(msg); + signInfo.rgCertEncoded = &encodedCert; + signInfo.cCertEncoded = 1; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, + NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + + check_param("signed with cert empty bare content", msg, + CMSG_BARE_CONTENT_PARAM, signedWithCertEmptyBareContent, + sizeof(signedWithCertEmptyBareContent)); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + check_param("signed with cert bare content", msg, CMSG_BARE_CONTENT_PARAM, + signedWithCertBareContent, sizeof(signedWithCertBareContent)); + + CryptMsgClose(msg); + CryptDestroyKey(key); CryptReleaseContext(signer.hCryptProv, 0); CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL,

1 0

Juan Lang : crypt32: Implement getting version from an encoded signed message.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 4f30f90c39bc03b72e98ae00d5ff2767b5b6ee20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f30f90c39bc03b72e98ae00d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 18:22:30 2007 -0700 crypt32: Implement getting version from an encoded signed message. --- dlls/crypt32/msg.c | 4 ++++ dlls/crypt32/tests/msg.c | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 7ba78a9..8a1fea0 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -865,6 +865,10 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CryptGetHashParam(msg->signerHandles[dwIndex].hash, HP_HASHVAL, pvData, pcbData, 0); break; + case CMSG_VERSION_PARAM: + ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->info.version, + sizeof(msg->info.version)); + break; default: FIXME("unimplemented for %d\n", dwParamType); SetLastError(CRYPT_E_INVALID_MSG_TYPE); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 6ee0de6..0568331 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1355,14 +1355,11 @@ static void test_signed_msg_get_param(void) /* For "signed" messages, so is the version. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, (LPBYTE)&value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == CMSG_SIGNED_DATA_V1, "Expected version 1, got %d\n", value); - } /* But for this message, with no signers, the hash and signer aren't * available. */

1 0

Juan Lang : crypt32: Use set encoding function for encoding PKCS signed info.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 8a3f4483a9b73ed570b9f6843cea578787431575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3f4483a9b73ed570b9f6843… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 18:23:00 2007 -0700 crypt32: Use set encoding function for encoding PKCS signed info. --- dlls/crypt32/encode.c | 131 ++++++++++++++++++------------------------------ 1 files changed, 49 insertions(+), 82 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index d63b389..2645715 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1540,88 +1540,6 @@ BOOL CRYPT_AsnEncodePKCSDigestedData(CRYPT_DIGESTED_DATA *digestedData, sizeof(items) / sizeof(items[0]), 0, NULL, pvData, pcbData); } -BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, - DWORD *pcbData) -{ - struct AsnEncodeSequenceItem items[7] = { - { &signedInfo->version, CRYPT_AsnEncodeInt, 0 }, - }; - CRYPT_SET_OF digestAlgorithmsSet = { 0, NULL }, signerSet = { 0, NULL }; - DWORD i, cItem = 1; - BOOL ret = TRUE; - - if (signedInfo->cCertEncoded) - FIXME("unimplemented for certs\n"); - if (signedInfo->cCrlEncoded) - FIXME("unimplemented for CRLs\n"); - if (signedInfo->cAttrCertEncoded) - FIXME("unimplemented for attr certs\n"); - if (signedInfo->cSignerInfo) - { - digestAlgorithmsSet.cValue = signedInfo->cSignerInfo; - digestAlgorithmsSet.rgValue = - CryptMemAlloc(digestAlgorithmsSet.cValue * sizeof(CRYPT_DER_BLOB)); - if (digestAlgorithmsSet.rgValue) - { - memset(digestAlgorithmsSet.rgValue, 0, - digestAlgorithmsSet.cValue * sizeof(CRYPT_DER_BLOB)); - for (i = 0; ret && i < digestAlgorithmsSet.cValue; i++) - ret = CRYPT_AsnEncodeAlgorithmIdWithNullParams(0, NULL, - &signedInfo->rgSignerInfo[i].HashAlgorithm, - CRYPT_ENCODE_ALLOC_FLAG, NULL, - (BYTE *)&digestAlgorithmsSet.rgValue[i].pbData, - &digestAlgorithmsSet.rgValue[i].cbData); - } - else - ret = FALSE; - if (ret) - { - items[cItem].pvStructInfo = &digestAlgorithmsSet; - items[cItem].encodeFunc = CRYPT_DEREncodeSet; - cItem++; - } - } - items[cItem].pvStructInfo = &signedInfo->content; - items[cItem].encodeFunc = CRYPT_AsnEncodePKCSContentInfoInternal; - cItem++; - if (ret && signedInfo->cSignerInfo) - { - signerSet.cValue = signedInfo->cSignerInfo; - signerSet.rgValue = - CryptMemAlloc(signerSet.cValue * sizeof(CRYPT_DER_BLOB)); - if (signerSet.rgValue) - { - memset(signerSet.rgValue, 0, - signerSet.cValue * sizeof(CRYPT_DER_BLOB)); - for (i = 0; ret && i < signerSet.cValue; i++) - ret = CryptEncodeObjectEx( - X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, PKCS7_SIGNER_INFO, - &signedInfo->rgSignerInfo[i], CRYPT_ENCODE_ALLOC_FLAG, NULL, - &signerSet.rgValue[i].pbData, &signerSet.rgValue[i].cbData); - } - else - ret = FALSE; - if (ret) - { - items[cItem].pvStructInfo = &signerSet; - items[cItem].encodeFunc = CRYPT_DEREncodeSet; - cItem++; - } - } - if (ret) - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, cItem, 0, NULL, - pvData, pcbData); - - for (i = 0; i < digestAlgorithmsSet.cValue; i++) - LocalFree(digestAlgorithmsSet.rgValue[i].pbData); - CryptMemFree(digestAlgorithmsSet.rgValue); - for (i = 0; i < signerSet.cValue; i++) - LocalFree(signerSet.rgValue[i].pbData); - CryptMemFree(signerSet.rgValue); - - return ret; -} - static BOOL WINAPI CRYPT_AsnEncodePKCSContentInfo(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -3315,6 +3233,55 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +BOOL CRYPT_AsnEncodePKCSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData, + DWORD *pcbData) +{ + struct AsnEncodeSequenceItem items[7] = { + { &signedInfo->version, CRYPT_AsnEncodeInt, 0 }, + }; + struct DERSetDescriptor digestAlgorithmsSet = { 0 }, signerSet = { 0 }; + DWORD cItem = 1; + BOOL ret = TRUE; + + if (signedInfo->cCertEncoded) + FIXME("unimplemented for certs\n"); + if (signedInfo->cCrlEncoded) + FIXME("unimplemented for CRLs\n"); + if (signedInfo->cAttrCertEncoded) + FIXME("unimplemented for attr certs\n"); + if (signedInfo->cSignerInfo) + { + digestAlgorithmsSet.cItems = signedInfo->cSignerInfo; + digestAlgorithmsSet.items = signedInfo->rgSignerInfo; + digestAlgorithmsSet.itemSize = sizeof(CMSG_SIGNER_INFO); + digestAlgorithmsSet.itemOffset = + offsetof(CMSG_SIGNER_INFO, HashAlgorithm); + digestAlgorithmsSet.encode = CRYPT_AsnEncodeAlgorithmIdWithNullParams; + items[cItem].pvStructInfo = &digestAlgorithmsSet; + items[cItem].encodeFunc = CRYPT_DEREncodeItemsAsSet; + cItem++; + } + items[cItem].pvStructInfo = &signedInfo->content; + items[cItem].encodeFunc = CRYPT_AsnEncodePKCSContentInfoInternal; + cItem++; + if (ret && signedInfo->cSignerInfo) + { + signerSet.cItems = signedInfo->cSignerInfo; + signerSet.items = signedInfo->rgSignerInfo; + signerSet.itemSize = sizeof(CMSG_SIGNER_INFO); + signerSet.itemOffset = 0; + signerSet.encode = CRYPT_AsnEncodePKCSSignerInfo; + items[cItem].pvStructInfo = &signerSet; + items[cItem].encodeFunc = CRYPT_DEREncodeItemsAsSet; + cItem++; + } + if (ret) + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + items, cItem, 0, NULL, pvData, pcbData); + + return ret; +} + BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, void *pvEncoded, DWORD *pcbEncoded)

1 0

Juan Lang : crypt32: Use consistent types for storing and encoding signed encode data.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 99c475417a75c0137c86cd1c0e95569493f43d78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99c475417a75c0137c86cd1c0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 18:13:32 2007 -0700 crypt32: Use consistent types for storing and encoding signed encode data. --- dlls/crypt32/msg.c | 74 +++++++++++++++++++++------------------------------ 1 files changed, 31 insertions(+), 43 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index bcea3c2..7ba78a9 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -767,13 +767,8 @@ typedef struct _CSignedEncodeMsg { CryptMsgBase base; CRYPT_DATA_BLOB data; - DWORD cSigners; + CRYPT_SIGNED_INFO info; CSignerHandles *signerHandles; - PCMSG_SIGNER_INFO rgSignerInfo; - DWORD cCertEncoded; - PCERT_BLOB rgCertEncoded; - DWORD cCrlEncoded; - PCRL_BLOB rgCrlEncoded; } CSignedEncodeMsg; static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) @@ -782,17 +777,17 @@ static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) DWORD i; CryptMemFree(msg->data.pbData); - CRYPT_FreeBlobArray((BlobArray *)&msg->cCertEncoded); - CRYPT_FreeBlobArray((BlobArray *)&msg->cCrlEncoded); - for (i = 0; i < msg->cSigners; i++) + CRYPT_FreeBlobArray((BlobArray *)&msg->info.cCertEncoded); + CRYPT_FreeBlobArray((BlobArray *)&msg->info.cCrlEncoded); + for (i = 0; i < msg->info.cSignerInfo; i++) { - CSignerInfo_Free(&msg->rgSignerInfo[i]); + CSignerInfo_Free(&msg->info.rgSignerInfo[i]); CryptDestroyKey(msg->signerHandles[i].key); CryptDestroyHash(msg->signerHandles[i].hash); CryptReleaseContext(msg->signerHandles[i].prov, 0); } CryptMemFree(msg->signerHandles); - CryptMemFree(msg->rgSignerInfo); + CryptMemFree(msg->info.rgSignerInfo); } static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, @@ -836,14 +831,7 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, CRYPT_SIGNED_INFO info; char oid_rsa_data[] = szOID_RSA_data; - /* Note: needs to change if CMS fields are supported */ - info.version = CMSG_SIGNED_DATA_V1; - info.cCertEncoded = msg->cCertEncoded; - info.rgCertEncoded = msg->rgCertEncoded; - info.cCrlEncoded = msg->cCrlEncoded; - info.rgCrlEncoded = msg->rgCrlEncoded; - info.cAttrCertEncoded = 0; - info.cSignerInfo = msg->cSigners; + memcpy(&info, &msg->info, sizeof(info)); /* Quirk: OID is only encoded messages if an update has happened */ if (msg->base.state != MsgStateInit) info.content.pszObjId = oid_rsa_data; @@ -865,14 +853,13 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, } if (ret) { - info.rgSignerInfo = msg->rgSignerInfo; - ret = CRYPT_AsnEncodePKCSSignedInfo(&info, pvData, pcbData); + ret = CRYPT_AsnEncodePKCSSignedInfo(&info, pvData, pcbData); LocalFree(info.content.Content.pbData); } break; } case CMSG_COMPUTED_HASH_PARAM: - if (dwIndex >= msg->cSigners) + if (dwIndex >= msg->info.cSignerInfo) SetLastError(CRYPT_E_INVALID_INDEX); else ret = CryptGetHashParam(msg->signerHandles[dwIndex].hash, @@ -893,7 +880,7 @@ static BOOL CSignedEncodeMsg_UpdateHash(CSignedEncodeMsg *msg, TRACE("(%p, %p, %d)\n", msg, pbData, cbData); - for (i = 0; ret && i < msg->cSigners; i++) + for (i = 0; ret && i < msg->info.cSignerInfo; i++) ret = CryptHashData(msg->signerHandles[i].hash, pbData, cbData, 0); return ret; } @@ -918,21 +905,21 @@ static BOOL CSignedEncodeMsg_Sign(CSignedEncodeMsg *msg) TRACE("(%p)\n", msg); - for (i = 0; ret && i < msg->cSigners; i++) + for (i = 0; ret && i < msg->info.cSignerInfo; i++) { ret = CryptSignHashW(msg->signerHandles[i].hash, AT_SIGNATURE, NULL, 0, - NULL, &msg->rgSignerInfo[i].EncryptedHash.cbData); + NULL, &msg->info.rgSignerInfo[i].EncryptedHash.cbData); if (ret) { - msg->rgSignerInfo[i].EncryptedHash.pbData = - CryptMemAlloc(msg->rgSignerInfo[i].EncryptedHash.cbData); - if (msg->rgSignerInfo[i].EncryptedHash.pbData) + msg->info.rgSignerInfo[i].EncryptedHash.pbData = + CryptMemAlloc(msg->info.rgSignerInfo[i].EncryptedHash.cbData); + if (msg->info.rgSignerInfo[i].EncryptedHash.pbData) { ret = CryptSignHashW(msg->signerHandles[i].hash, AT_SIGNATURE, - NULL, 0, msg->rgSignerInfo[i].EncryptedHash.pbData, - &msg->rgSignerInfo[i].EncryptedHash.cbData); + NULL, 0, msg->info.rgSignerInfo[i].EncryptedHash.pbData, + &msg->info.rgSignerInfo[i].EncryptedHash.cbData); if (ret) - CRYPT_ReverseBytes(&msg->rgSignerInfo[i].EncryptedHash); + CRYPT_ReverseBytes(&msg->info.rgSignerInfo[i].EncryptedHash); } else ret = FALSE; @@ -1017,38 +1004,39 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, CSignedEncodeMsg_Update); msg->data.cbData = 0; msg->data.pbData = NULL; - msg->cSigners = 0; + memset(&msg->info, 0, sizeof(msg->info)); + msg->info.version = CMSG_SIGNED_DATA_V1; if (info->cSigners) { msg->signerHandles = CryptMemAlloc(info->cSigners * sizeof(CSignerHandles)); if (msg->signerHandles) - msg->rgSignerInfo = + msg->info.rgSignerInfo = CryptMemAlloc(info->cSigners * sizeof(CMSG_SIGNER_INFO)); else { ret = FALSE; - msg->rgSignerInfo = NULL; + msg->info.rgSignerInfo = NULL; } - if (msg->rgSignerInfo) + if (msg->info.rgSignerInfo) { - msg->cSigners = info->cSigners; + msg->info.cSignerInfo = info->cSigners; memset(msg->signerHandles, 0, - msg->cSigners * sizeof(CSignerHandles)); - memset(msg->rgSignerInfo, 0, - msg->cSigners * sizeof(CMSG_SIGNER_INFO)); - for (i = 0; ret && i < msg->cSigners; i++) + msg->info.cSignerInfo * sizeof(CSignerHandles)); + memset(msg->info.rgSignerInfo, 0, + msg->info.cSignerInfo * sizeof(CMSG_SIGNER_INFO)); + for (i = 0; ret && i < msg->info.cSignerInfo; i++) ret = CSignerInfo_Construct(&msg->signerHandles[i], - &msg->rgSignerInfo[i], &info->rgSigners[i], dwFlags); + &msg->info.rgSignerInfo[i], &info->rgSigners[i], dwFlags); } else ret = FALSE; } if (ret) - ret = CRYPT_CopyBlobArray((BlobArray *)&msg->cCertEncoded, + ret = CRYPT_CopyBlobArray((BlobArray *)&msg->info.cCertEncoded, (const BlobArray *)&info->cCertEncoded); if (ret) - ret = CRYPT_CopyBlobArray((BlobArray *)&msg->cCrlEncoded, + ret = CRYPT_CopyBlobArray((BlobArray *)&msg->info.cCrlEncoded, (const BlobArray *)&info->cCrlEncoded); if (!ret) {

1 0

Juan Lang : crypt32: Add tests for getting an encoded signed message' s parameters.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 8c81a386987236250a44786e3390f12f350bbb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c81a386987236250a44786e3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 18:22:02 2007 -0700 crypt32: Add tests for getting an encoded signed message's parameters. --- dlls/crypt32/tests/msg.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index f7c863c..6ee0de6 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1332,11 +1332,112 @@ static void test_signed_msg_encoding(void) CRYPT_DELETEKEYSET); } +static void test_signed_msg_get_param(void) +{ + BOOL ret; + HCRYPTMSG msg; + DWORD size, value = 0; + CMSG_SIGNED_ENCODE_INFO signInfo = { sizeof(signInfo), 0 }; + CMSG_SIGNER_ENCODE_INFO signer = { sizeof(signer), 0 }; + CERT_INFO certInfo = { 0 }; + + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, + NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + + /* Content and bare content are always gettable */ + size = 0; + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + size = 0; + ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + /* For "signed" messages, so is the version. */ + size = 0; + ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, NULL, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + size = sizeof(value); + ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, (LPBYTE)&value, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(value == CMSG_SIGNED_DATA_V1, "Expected version 1, got %d\n", value); + } + /* But for this message, with no signers, the hash and signer aren't + * available. + */ + size = 0; + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); + /* As usual, the type isn't available. */ + ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + + CryptMsgClose(msg); + + certInfo.SerialNumber.cbData = sizeof(serialNum); + certInfo.SerialNumber.pbData = serialNum; + certInfo.Issuer.cbData = sizeof(encodedCommonName); + certInfo.Issuer.pbData = encodedCommonName; + signer.pCertInfo = &certInfo; + signer.HashAlgorithm.pszObjId = oid_rsa_md5; + signInfo.cSigners = 1; + signInfo.rgSigners = &signer; + ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + PROV_RSA_FULL, CRYPT_NEWKEYSET); + if (!ret && GetLastError() == NTE_EXISTS) + ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + PROV_RSA_FULL, 0); + ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, + NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + + /* This message, with one signer, has the hash and signer for index 0 + * available, but not for other indexes. + */ + size = 0; + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %x\n", GetLastError()); + size = 0; + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 1, NULL, &size); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError()); + /* As usual, the type isn't available. */ + ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + + CryptMsgClose(msg); + + CryptReleaseContext(signer.hCryptProv, 0); + CryptAcquireContextW(&signer.hCryptProv, cspNameW, MS_DEF_PROV_W, + PROV_RSA_FULL, CRYPT_DELETEKEYSET); +} + static void test_signed_msg(void) { test_signed_msg_open(); test_signed_msg_update(); test_signed_msg_encoding(); + test_signed_msg_get_param(); } static CRYPT_DATA_BLOB b4 = { 0, NULL };

1 0

Juan Lang : crypt32: Implement getting the hash for each signer of a signed encoded message.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 71a5859dedcaa774724bd775396f97e1b14d164e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a5859dedcaa774724bd7753… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 18:09:42 2007 -0700 crypt32: Implement getting the hash for each signer of a signed encoded message. --- dlls/crypt32/msg.c | 20 +++++++++++++++++--- dlls/crypt32/tests/msg.c | 2 -- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 28fb247..226c04b 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -765,9 +765,23 @@ static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { - FIXME("(%p, %d, %d, %p, %p)\n", hCryptMsg, dwParamType, dwIndex, pvData, - pcbData); - return FALSE; + CSignedEncodeMsg *msg = (CSignedEncodeMsg *)hCryptMsg; + BOOL ret = FALSE; + + switch (dwParamType) + { + case CMSG_COMPUTED_HASH_PARAM: + if (dwIndex >= msg->cSigners) + SetLastError(CRYPT_E_INVALID_INDEX); + else + ret = CryptGetHashParam(msg->signers[dwIndex].hash, HP_HASHVAL, + pvData, pcbData, 0); + break; + default: + FIXME("unimplemented for %d\n", dwParamType); + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + return ret; } static BOOL CSignedEncodeMsg_UpdateHash(CSignedEncodeMsg *msg, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index f9f2ab6..18c758b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1298,7 +1298,6 @@ static void test_signed_msg_encoding(void) signedEmptyContent, sizeof(signedEmptyContent)); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); - todo_wine check_param("detached signed hash", msg, CMSG_COMPUTED_HASH_PARAM, signedHash, sizeof(signedHash)); todo_wine @@ -1309,7 +1308,6 @@ static void test_signed_msg_encoding(void) detachedSignedContent, sizeof(detachedSignedContent)); SetLastError(0xdeadbeef); ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 1, NULL, &size); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, "Expected CRYPT_E_INVALID_INDEX, got %x\n", GetLastError());

1 0

Juan Lang : crypt32: Partially implement encoding signed messages.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: b80101eb6516e0ac778c1d61bbb26a032ccbd0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b80101eb6516e0ac778c1d61b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 18:11:17 2007 -0700 crypt32: Partially implement encoding signed messages. --- dlls/crypt32/crypt32_private.h | 17 ++++++ dlls/crypt32/encode.c | 82 +++++++++++++++++++++++++++++++ dlls/crypt32/msg.c | 106 +++++++++++++++++++++++++++++++++++----- dlls/crypt32/tests/msg.c | 4 -- 4 files changed, 193 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b80101eb6516e0ac778c1…

1 0

Juan Lang : crypt32: Implement getting outer content of a signed message.
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 937b27f3a37e45790a12f790fea9524d399be3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=937b27f3a37e45790a12f790f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 18:11:49 2007 -0700 crypt32: Implement getting outer content of a signed message. --- dlls/crypt32/msg.c | 28 ++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 4 ---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index cd1dd39..1fcf980 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -797,6 +797,34 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, switch (dwParamType) { + case CMSG_CONTENT_PARAM: + { + CRYPT_CONTENT_INFO info; + + ret = CryptMsgGetParam(hCryptMsg, CMSG_BARE_CONTENT_PARAM, 0, NULL, + &info.Content.cbData); + if (ret) + { + info.Content.pbData = CryptMemAlloc(info.Content.cbData); + if (info.Content.pbData) + { + ret = CryptMsgGetParam(hCryptMsg, CMSG_BARE_CONTENT_PARAM, 0, + info.Content.pbData, &info.Content.cbData); + if (ret) + { + char oid_rsa_signed[] = szOID_RSA_signedData; + + info.pszObjId = oid_rsa_signed; + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, + PKCS_CONTENT_INFO, &info, 0, NULL, pvData, pcbData); + } + CryptMemFree(info.Content.pbData); + } + else + ret = FALSE; + } + break; + } case CMSG_BARE_CONTENT_PARAM: { CRYPT_SIGNED_INFO info; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 7a244b5..f7c863c 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1292,7 +1292,6 @@ static void test_signed_msg_encoding(void) check_param("detached signed empty bare content", msg, CMSG_BARE_CONTENT_PARAM, signedEmptyBareContent, sizeof(signedEmptyBareContent)); - todo_wine check_param("detached signed empty content", msg, CMSG_CONTENT_PARAM, signedEmptyContent, sizeof(signedEmptyContent)); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); @@ -1301,7 +1300,6 @@ static void test_signed_msg_encoding(void) signedHash, sizeof(signedHash)); check_param("detached signed bare content", msg, CMSG_BARE_CONTENT_PARAM, detachedSignedBareContent, sizeof(detachedSignedBareContent)); - todo_wine check_param("detached signed content", msg, CMSG_CONTENT_PARAM, detachedSignedContent, sizeof(detachedSignedContent)); SetLastError(0xdeadbeef); @@ -1317,14 +1315,12 @@ static void test_signed_msg_encoding(void) check_param("signed empty bare content", msg, CMSG_BARE_CONTENT_PARAM, signedEmptyBareContent, sizeof(signedEmptyBareContent)); - todo_wine check_param("signed empty content", msg, CMSG_CONTENT_PARAM, signedEmptyContent, sizeof(signedEmptyContent)); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); check_param("signed bare content", msg, CMSG_BARE_CONTENT_PARAM, signedBareContent, sizeof(signedBareContent)); - todo_wine check_param("signed content", msg, CMSG_CONTENT_PARAM, signedContent, sizeof(signedContent));

1 0

Juan Lang : crypt32: Separate signer handles from signer info to avoid unnecessary memory allocation .
by Alexandre Julliard 24 Jul '07

24 Jul '07

Module: wine Branch: master Commit: 2d359268e60c45903eafecdb42a346c561023379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d359268e60c45903eafecdb4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 18:12:47 2007 -0700 crypt32: Separate signer handles from signer info to avoid unnecessary memory allocation. --- dlls/crypt32/msg.c | 153 +++++++++++++++++++++++++++------------------------ 1 files changed, 81 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d359268e60c45903eafe…

1 0