August 2008 - Wine-Commits - list.winehq.org

Juan Lang : cryptuiapi.h: Add missing definitions.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 918303a308eda47695a622db6ffa73f5ddc8b1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=918303a308eda47695a622db6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 26 10:13:03 2008 -0700 cryptuiapi.h: Add missing definitions. --- include/cryptuiapi.h | 271 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 271 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=918303a308eda47695a62…

1 0

Juan Lang : crypt32: Implement CryptVerifyDetachedMessageHash.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 4e6515e0276c7b2e7cc498bea8bf9fec84246fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e6515e0276c7b2e7cc498bea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 26 09:40:37 2008 -0700 crypt32: Implement CryptVerifyDetachedMessageHash. --- dlls/crypt32/message.c | 52 ++++++++++++++++++++++++++++++++++++++--- dlls/crypt32/tests/message.c | 12 --------- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index b139094..9413dd6 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -269,8 +269,52 @@ BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, const BYTE *rgpbToBeHashed[], DWORD rgcbToBeHashed[], BYTE *pbComputedHash, DWORD *pcbComputedHash) { - FIXME("(%p, %p, %d, %d, %p, %p, %p, %p): stub\n", pHashPara, - pbDetachedHashBlob, cbDetachedHashBlob, cToBeHashed, rgpbToBeHashed, - rgcbToBeHashed, pbComputedHash, pcbComputedHash); - return FALSE; + HCRYPTMSG msg; + BOOL ret = FALSE; + + TRACE("(%p, %p, %d, %d, %p, %p, %p, %p)\n", pHashPara, pbDetachedHashBlob, + cbDetachedHashBlob, cToBeHashed, rgpbToBeHashed, rgcbToBeHashed, + pbComputedHash, pcbComputedHash); + + if (pHashPara->cbSize != sizeof(CRYPT_HASH_MESSAGE_PARA)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (GET_CMSG_ENCODING_TYPE(pHashPara->dwMsgEncodingType) != + PKCS_7_ASN_ENCODING) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + msg = CryptMsgOpenToDecode(pHashPara->dwMsgEncodingType, CMSG_DETACHED_FLAG, + 0, pHashPara->hCryptProv, NULL, NULL); + if (msg) + { + DWORD i; + + ret = CryptMsgUpdate(msg, pbDetachedHashBlob, cbDetachedHashBlob, TRUE); + if (ret) + { + if (cToBeHashed) + { + for (i = 0; ret && i < cToBeHashed; i++) + { + ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], + rgcbToBeHashed[i], i == cToBeHashed - 1 ? TRUE : FALSE); + } + } + else + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + } + if (ret) + { + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + if (ret && pcbComputedHash) + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, + pbComputedHash, pcbComputedHash); + } + CryptMsgClose(msg); + } + return ret; } diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index b3b6abe..adfa0eb 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -109,35 +109,30 @@ static void test_verify_detached_message_hash(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); para.cbSize = sizeof(para); SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); para.dwMsgEncodingType = X509_ASN_ENCODING; SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); para.dwMsgEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); /* Curiously, passing no data to hash succeeds.. */ @@ -150,7 +145,6 @@ static void test_verify_detached_message_hash(void) pMsgData = msgData; ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, sizeof(detachedHashContent), 1, &pMsgData, &size, NULL, NULL); - todo_wine ok(ret, "CryptVerifyDetachedMessageHash failed: %08x\n", GetLastError()); /* while passing data to hash that isn't the content of the message fails. */ @@ -159,7 +153,6 @@ static void test_verify_detached_message_hash(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, sizeof(detachedHashContent), 1, &pMsgData, &size, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_HASH_VALUE, "expected CRYPT_E_HASH_VALUE, got %08x\n", GetLastError()); /* Getting the size of the hash while passing no hash data causes the @@ -168,28 +161,23 @@ static void test_verify_detached_message_hash(void) SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, sizeof(detachedHashContent), 0, NULL, NULL, NULL, &hashSize); - todo_wine ok(!ret && GetLastError() == CRYPT_E_HASH_VALUE, "expected CRYPT_E_HASH_VALUE, got %08x\n", GetLastError()); size = sizeof(msgData); pMsgData = msgData; ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, sizeof(detachedHashContent), 1, &pMsgData, &size, NULL, &hashSize); - todo_wine { ok(ret, "CryptVerifyDetachedMessageHash failed: %08x\n", GetLastError()); ok(hashSize == sizeof(hash), "unexpected size %d\n", hashSize); - } hashSize = 1; SetLastError(0xdeadbeef); ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, sizeof(detachedHashContent), 1, &pMsgData, &size, hash, &hashSize); - todo_wine ok(!ret && GetLastError() == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %08x\n", GetLastError()); hashSize = sizeof(hash); ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, sizeof(detachedHashContent), 1, &pMsgData, &size, hash, &hashSize); - todo_wine ok(ret, "CryptVerifyDetachedMessageHash failed: %08x\n", GetLastError()); }

1 0

Juan Lang : crypt32: Add stub for CryptVerifyDetachedMessageHash.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 6372b628635a34ec46d05b37eaa167ec99b327f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6372b628635a34ec46d05b37e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 26 09:38:09 2008 -0700 crypt32: Add stub for CryptVerifyDetachedMessageHash. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/message.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index fab52a0..a5af07d 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -185,7 +185,7 @@ @ stub CryptUnregisterOIDInfo @ stdcall CryptVerifyCertificateSignature(long long ptr long ptr) @ stdcall CryptVerifyCertificateSignatureEx(long long long ptr long ptr long ptr) -@ stub CryptVerifyDetachedMessageHash +@ stdcall CryptVerifyDetachedMessageHash(ptr ptr long long ptr ptr ptr ptr) @ stub CryptVerifyDetachedMessageSignature @ stub CryptVerifyMessageHash @ stdcall CryptVerifyMessageSignature(ptr long ptr long ptr ptr ptr) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 2aeb3cf..b139094 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -263,3 +263,14 @@ BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara, } return ret; } + +BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara, + BYTE *pbDetachedHashBlob, DWORD cbDetachedHashBlob, DWORD cToBeHashed, + const BYTE *rgpbToBeHashed[], DWORD rgcbToBeHashed[], BYTE *pbComputedHash, + DWORD *pcbComputedHash) +{ + FIXME("(%p, %p, %d, %d, %p, %p, %p, %p): stub\n", pHashPara, + pbDetachedHashBlob, cbDetachedHashBlob, cToBeHashed, rgpbToBeHashed, + rgcbToBeHashed, pbComputedHash, pcbComputedHash); + return FALSE; +}

1 0

Juan Lang : crypt32: Fix verifying the hash of a detached hash message.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 13545bee2ddbc2201ea52fb15fe90e6b4fc6d378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13545bee2ddbc2201ea52fb15… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 17:17:52 2008 -0700 crypt32: Fix verifying the hash of a detached hash message. --- dlls/crypt32/msg.c | 43 +++++++++++++++++++++++++++++++++++-------- dlls/crypt32/tests/msg.c | 3 --- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 53fff29..82bed31 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1607,12 +1607,15 @@ static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg, (const BYTE *)digestedData->ContentInfo.pszObjId, digestedData->ContentInfo.pszObjId ? strlen(digestedData->ContentInfo.pszObjId) + 1 : 0); - if (digestedData->ContentInfo.Content.cbData) - CDecodeMsg_DecodeDataContent(msg, - &digestedData->ContentInfo.Content); - else - ContextPropertyList_SetProperty(msg->properties, - CMSG_CONTENT_PARAM, NULL, 0); + if (!(msg->base.open_flags & CMSG_DETACHED_FLAG)) + { + if (digestedData->ContentInfo.Content.cbData) + CDecodeMsg_DecodeDataContent(msg, + &digestedData->ContentInfo.Content); + else + ContextPropertyList_SetProperty(msg->properties, + CMSG_CONTENT_PARAM, NULL, 0); + } ContextPropertyList_SetProperty(msg->properties, CMSG_HASH_DATA_PARAM, digestedData->hash.pbData, digestedData->hash.cbData); LocalFree(digestedData); @@ -1715,6 +1718,17 @@ static BOOL CDecodeMsg_FinalizeHashedContent(CDecodeMsg *msg, { CRYPT_DATA_BLOB content; + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + { + /* Unlike for non-detached messages, the data were never stored as + * the content param, but were saved in msg->detached_data instead. + * Set the content property with the detached data so the data may + * be hashed. + */ + ContextPropertyList_SetProperty(msg->properties, + CMSG_CONTENT_PARAM, msg->detached_data.pbData, + msg->detached_data.cbData); + } ret = ContextPropertyList_FindProperty(msg->properties, CMSG_CONTENT_PARAM, &content); if (ret) @@ -2480,12 +2494,25 @@ static BOOL CDecodeHashMsg_VerifyHash(CDecodeMsg *msg) ret = CDecodeHashMsg_GetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, computedHash, &computedHashSize); if (ret) - ret = !memcmp(hashBlob.pbData, computedHash, - hashBlob.cbData); + { + if (memcmp(hashBlob.pbData, computedHash, hashBlob.cbData)) + { + SetLastError(CRYPT_E_HASH_VALUE); + ret = FALSE; + } + } CryptMemFree(computedHash); } else + { + SetLastError(ERROR_OUTOFMEMORY); ret = FALSE; + } + } + else + { + SetLastError(CRYPT_E_HASH_VALUE); + ret = FALSE; } } return ret; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8cab0eb..c734e6f 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2660,7 +2660,6 @@ static void test_msg_control(void) TRUE); /* Oddly enough, this fails */ ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - todo_wine ok(!ret, "Expected failure\n"); CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, @@ -2690,7 +2689,6 @@ static void test_msg_control(void) */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_HASH_VALUE, "Expected CRYPT_E_HASH_VALUE, got %08x\n", GetLastError()); /* and giving the content of the message after attempting to verify the @@ -2718,7 +2716,6 @@ static void test_msg_control(void) ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - todo_wine ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); CryptMsgClose(msg);

1 0

Juan Lang : crypt32: Add tests for CryptVerifyDetachedHashMessage.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 10975136970b03183bf2fa31c2452e0c30f768ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=10975136970b03183bf2fa31c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 26 09:38:38 2008 -0700 crypt32: Add tests for CryptVerifyDetachedHashMessage. --- dlls/crypt32/tests/message.c | 110 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 11b8c1c..b3b6abe 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -84,6 +84,115 @@ static void test_msg_get_signer_count(void) ok(count == 1, "Expected 1, got %d\n", count); } +static BYTE detachedHashContent[] = { +0x30,0x3f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x05,0xa0,0x32, +0x30,0x30,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x07,0x01,0x04,0x10,0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb, +0x9d,0x2a,0x8f,0x26,0x2f }; +static const BYTE msgData[] = { 1, 2, 3, 4 }; + +static void test_verify_detached_message_hash(void) +{ + BOOL ret; + CRYPT_HASH_MESSAGE_PARA para; + DWORD size, hashSize; + const BYTE *pMsgData = msgData; + BYTE hash[16]; + + if (0) + { + ret = CryptVerifyDetachedMessageHash(NULL, NULL, 0, 0, NULL, NULL, NULL, + NULL); + } + memset(&para, 0, sizeof(para)); + SetLastError(0xdeadbeef); + ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, + NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + para.cbSize = sizeof(para); + SetLastError(0xdeadbeef); + ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, + NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; + SetLastError(0xdeadbeef); + ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, + NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + para.dwMsgEncodingType = X509_ASN_ENCODING; + SetLastError(0xdeadbeef); + ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, + NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + para.dwMsgEncodingType = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING; + SetLastError(0xdeadbeef); + ret = CryptVerifyDetachedMessageHash(&para, NULL, 0, 0, NULL, NULL, NULL, + NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, + "expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + /* Curiously, passing no data to hash succeeds.. */ + ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, + sizeof(detachedHashContent), 0, NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptVerifyDetachedMessageHash failed: %08x\n", GetLastError()); + /* as does passing the actual content of the message to hash.. */ + size = sizeof(msgData); + pMsgData = msgData; + ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, + sizeof(detachedHashContent), 1, &pMsgData, &size, NULL, NULL); + todo_wine + ok(ret, "CryptVerifyDetachedMessageHash failed: %08x\n", GetLastError()); + /* while passing data to hash that isn't the content of the message fails. + */ + size = sizeof(detachedHashContent); + pMsgData = detachedHashContent; + SetLastError(0xdeadbeef); + ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, + sizeof(detachedHashContent), 1, &pMsgData, &size, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_HASH_VALUE, + "expected CRYPT_E_HASH_VALUE, got %08x\n", GetLastError()); + /* Getting the size of the hash while passing no hash data causes the + * hash to be checked (and fail.) + */ + SetLastError(0xdeadbeef); + ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, + sizeof(detachedHashContent), 0, NULL, NULL, NULL, &hashSize); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_HASH_VALUE, + "expected CRYPT_E_HASH_VALUE, got %08x\n", GetLastError()); + size = sizeof(msgData); + pMsgData = msgData; + ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, + sizeof(detachedHashContent), 1, &pMsgData, &size, NULL, &hashSize); + todo_wine { + ok(ret, "CryptVerifyDetachedMessageHash failed: %08x\n", GetLastError()); + ok(hashSize == sizeof(hash), "unexpected size %d\n", hashSize); + } + hashSize = 1; + SetLastError(0xdeadbeef); + ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, + sizeof(detachedHashContent), 1, &pMsgData, &size, hash, &hashSize); + todo_wine + ok(!ret && GetLastError() == ERROR_MORE_DATA, + "expected ERROR_MORE_DATA, got %08x\n", GetLastError()); + hashSize = sizeof(hash); + ret = CryptVerifyDetachedMessageHash(&para, detachedHashContent, + sizeof(detachedHashContent), 1, &pMsgData, &size, hash, &hashSize); + todo_wine + ok(ret, "CryptVerifyDetachedMessageHash failed: %08x\n", GetLastError()); +} + static const BYTE signedContent[] = { 0x30,0x81,0xb2,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x02,0xa0, 0x81,0xa4,0x30,0x81,0xa1,0x02,0x01,0x01,0x31,0x0e,0x30,0x0c,0x06,0x08,0x2a, @@ -404,6 +513,7 @@ static void test_hash_message(void) START_TEST(message) { test_msg_get_signer_count(); + test_verify_detached_message_hash(); test_verify_message_signature(); test_hash_message(); }

1 0

Juan Lang : crypt32: Add tests for verifying the hash of a detached hash message.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 9db120d0153b109c36015c70dbea7e64fc5b7df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db120d0153b109c36015c70d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 13:12:59 2008 -0700 crypt32: Add tests for verifying the hash of a detached hash message. --- dlls/crypt32/tests/msg.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index ba35b89..8cab0eb 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2675,6 +2675,53 @@ static void test_msg_control(void) "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, 0, 0, + NULL, NULL); + /* Can't verify the hash of a detached message before it's been updated. */ + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); + ret = CryptMsgUpdate(msg, detachedHashContent, sizeof(detachedHashContent), + TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + /* Still can't verify the hash of a detached message with the content + * of the detached hash given.. + */ + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_HASH_VALUE, + "Expected CRYPT_E_HASH_VALUE, got %08x\n", GetLastError()); + /* and giving the content of the message after attempting to verify the + * hash fails. + */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine + ok(!ret && GetLastError() == NTE_BAD_HASH_STATE, + "Expected NTE_BAD_HASH_STATE, got %08x\n", GetLastError()); + CryptMsgClose(msg); + + /* Finally, verifying the hash of a detached message in the correct order: + * 1. Update with the detached hash message + * 2. Update with the content of the message + * 3. Verifying the hash of the message + * succeeds. + */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, 0, 0, + NULL, NULL); + ret = CryptMsgUpdate(msg, detachedHashContent, sizeof(detachedHashContent), + TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + todo_wine + ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, 0, NULL, NULL); /* Can't verify the hash of a signed message */

1 0

Juan Lang : crypt32: Separate decoding data from finalizing ( hashing or signing) it.
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 0fbef45f55b0b6a4527a2f8e458c21ca73d6e388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbef45f55b0b6a4527a2f8e4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Aug 20 16:29:06 2008 -0700 crypt32: Separate decoding data from finalizing (hashing or signing) it. --- dlls/crypt32/msg.c | 184 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 106 insertions(+), 78 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 8ac4b14..53fff29 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1631,54 +1631,7 @@ static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_SIGNED_INFO *)&signedInfo, &size); if (ret) - { - DWORD i; - msg->u.signed_data.info = signedInfo; - ret = CSignedMsgData_AllocateHandles(&msg->u.signed_data); - for (i = 0; ret && i < msg->u.signed_data.info->cSignerInfo; i++) - ret = CSignedMsgData_ConstructSignerHandles(&msg->u.signed_data, i, - msg->crypt_prov); - if (ret) - { - CRYPT_DATA_BLOB *content; - - /* Now that we have all the content, update the hash handles with - * it. If the message is a detached message, the content is stored - * in msg->detached_data rather than in the signed message's - * content. - */ - if (msg->base.open_flags & CMSG_DETACHED_FLAG) - content = &msg->detached_data; - else - content = &msg->u.signed_data.info->content.Content; - if (content->cbData) - { - /* If the message is not detached, have to decode the message's - * content if the type is szOID_RSA_data. - */ - if (!(msg->base.open_flags & CMSG_DETACHED_FLAG) && - !strcmp(msg->u.signed_data.info->content.pszObjId, - szOID_RSA_data)) - { - CRYPT_DATA_BLOB *blob; - - ret = CryptDecodeObjectEx(X509_ASN_ENCODING, - X509_OCTET_STRING, content->pbData, content->cbData, - CRYPT_DECODE_ALLOC_FLAG, NULL, (LPBYTE)&blob, &size); - if (ret) - { - ret = CSignedMsgData_Update(&msg->u.signed_data, - blob->pbData, blob->cbData, TRUE, Verify); - LocalFree(blob); - } - } - else - ret = CSignedMsgData_Update(&msg->u.signed_data, - content->pbData, content->cbData, TRUE, Verify); - } - } - } return ret; } @@ -1743,6 +1696,104 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, return ret; } +static BOOL CDecodeMsg_FinalizeHashedContent(CDecodeMsg *msg, + CRYPT_DER_BLOB *blob) +{ + CRYPT_ALGORITHM_IDENTIFIER *hashAlgoID = NULL; + DWORD size = 0; + ALG_ID algID = 0; + BOOL ret; + + CryptMsgGetParam(msg, CMSG_HASH_ALGORITHM_PARAM, 0, NULL, &size); + hashAlgoID = CryptMemAlloc(size); + ret = CryptMsgGetParam(msg, CMSG_HASH_ALGORITHM_PARAM, 0, hashAlgoID, + &size); + if (ret) + algID = CertOIDToAlgId(hashAlgoID->pszObjId); + ret = CryptCreateHash(msg->crypt_prov, algID, 0, 0, &msg->u.hash); + if (ret) + { + CRYPT_DATA_BLOB content; + + ret = ContextPropertyList_FindProperty(msg->properties, + CMSG_CONTENT_PARAM, &content); + if (ret) + ret = CryptHashData(msg->u.hash, content.pbData, content.cbData, 0); + } + CryptMemFree(hashAlgoID); + return ret; +} + +static BOOL CDecodeMsg_FinalizeSignedContent(CDecodeMsg *msg, + CRYPT_DER_BLOB *blob) +{ + BOOL ret; + DWORD i, size; + + ret = CSignedMsgData_AllocateHandles(&msg->u.signed_data); + for (i = 0; ret && i < msg->u.signed_data.info->cSignerInfo; i++) + ret = CSignedMsgData_ConstructSignerHandles(&msg->u.signed_data, i, + msg->crypt_prov); + if (ret) + { + CRYPT_DATA_BLOB *content; + + /* Now that we have all the content, update the hash handles with + * it. If the message is a detached message, the content is stored + * in msg->detached_data rather than in the signed message's + * content. + */ + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + content = &msg->detached_data; + else + content = &msg->u.signed_data.info->content.Content; + if (content->cbData) + { + /* If the message is not detached, have to decode the message's + * content if the type is szOID_RSA_data. + */ + if (!(msg->base.open_flags & CMSG_DETACHED_FLAG) && + !strcmp(msg->u.signed_data.info->content.pszObjId, + szOID_RSA_data)) + { + CRYPT_DATA_BLOB *blob; + + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, + X509_OCTET_STRING, content->pbData, content->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, (LPBYTE)&blob, &size); + if (ret) + { + ret = CSignedMsgData_Update(&msg->u.signed_data, + blob->pbData, blob->cbData, TRUE, Verify); + LocalFree(blob); + } + } + else + ret = CSignedMsgData_Update(&msg->u.signed_data, + content->pbData, content->cbData, TRUE, Verify); + } + } + return ret; +} + +static BOOL CDecodeMsg_FinalizeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob) +{ + BOOL ret = FALSE; + + switch (msg->type) + { + case CMSG_HASHED: + ret = CDecodeMsg_FinalizeHashedContent(msg, blob); + break; + case CMSG_SIGNED: + ret = CDecodeMsg_FinalizeSignedContent(msg, blob); + break; + default: + ret = TRUE; + } + return ret; +} + static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal) { @@ -1815,8 +1866,14 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } } } - if (ret && msg->base.state == MsgStateFinalized) + if (ret && + ((msg->base.open_flags & CMSG_DETACHED_FLAG && msg->base.state == + MsgStateDataFinalized) || + (!(msg->base.open_flags & CMSG_DETACHED_FLAG) && msg->base.state == + MsgStateFinalized))) ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, msg->type); + if (ret && msg->base.state == MsgStateFinalized) + ret = CDecodeMsg_FinalizeContent(msg, &msg->msg_data); return ret; } @@ -1847,36 +1904,7 @@ static BOOL CDecodeHashMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, break; } case CMSG_COMPUTED_HASH_PARAM: - if (!msg->u.hash) - { - CRYPT_ALGORITHM_IDENTIFIER *hashAlgoID = NULL; - DWORD size = 0; - ALG_ID algID = 0; - - CryptMsgGetParam(msg, CMSG_HASH_ALGORITHM_PARAM, 0, NULL, &size); - hashAlgoID = CryptMemAlloc(size); - ret = CryptMsgGetParam(msg, CMSG_HASH_ALGORITHM_PARAM, 0, - hashAlgoID, &size); - if (ret) - algID = CertOIDToAlgId(hashAlgoID->pszObjId); - ret = CryptCreateHash(msg->crypt_prov, algID, 0, 0, &msg->u.hash); - if (ret) - { - CRYPT_DATA_BLOB content; - - ret = ContextPropertyList_FindProperty(msg->properties, - CMSG_CONTENT_PARAM, &content); - if (ret) - ret = CryptHashData(msg->u.hash, content.pbData, - content.cbData, 0); - } - CryptMemFree(hashAlgoID); - } - else - ret = TRUE; - if (ret) - ret = CryptGetHashParam(msg->u.hash, HP_HASHVAL, pvData, pcbData, - 0); + ret = CryptGetHashParam(msg->u.hash, HP_HASHVAL, pvData, pcbData, 0); break; default: {

1 0

Rob Shearman : msxml3: Use CP_UNIXCP instead of CP_ACP in libxmlFatalError as the input string is one generated by a native OS function .
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: fd75c21c6d8ce83b1609f08721c718cc169e6a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd75c21c6d8ce83b1609f0872… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Aug 26 20:06:09 2008 +0100 msxml3: Use CP_UNIXCP instead of CP_ACP in libxmlFatalError as the input string is one generated by a native OS function. --- dlls/msxml3/saxreader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index ef62c9f..554b048 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1272,10 +1272,10 @@ void libxmlFatalError(void *ctx, const char *msg, ...) vsprintf(message, msg, args); va_end(args); - len = MultiByteToWideChar(CP_ACP, 0, message, -1, NULL, 0); + len = MultiByteToWideChar(CP_UNIXCP, 0, message, -1, NULL, 0); wszError = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); if(wszError) - MultiByteToWideChar(CP_ACP, 0, message, -1, (LPWSTR)wszError, len); + MultiByteToWideChar(CP_UNIXCP, 0, message, -1, (LPWSTR)wszError, len); if(This->vbInterface) {

1 0

Rob Shearman : winealsa.drv: Use CP_UNIXCP instead of CP_ACP for strings obtained from native OS functions .
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: a7e1753d7b577074fd3116d3c2fed71450b53ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e1753d7b577074fd3116d3c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Aug 26 20:05:56 2008 +0100 winealsa.drv: Use CP_UNIXCP instead of CP_ACP for strings obtained from native OS functions. --- dlls/winealsa.drv/midi.c | 4 ++-- dlls/winealsa.drv/wavein.c | 6 +++--- dlls/winealsa.drv/waveinit.c | 4 ++-- dlls/winealsa.drv/waveout.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 7c51d34..068165e 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1158,7 +1158,7 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN-1); midiPortName[MAXPNAMELEN-1] = 0; } - MultiByteToWideChar(CP_ACP, 0, midiPortName, -1, + MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiOutDev[MODM_NumDevs].caps.szPname, sizeof(MidiOutDev[MODM_NumDevs].caps.szPname) / sizeof(WCHAR)); @@ -1223,7 +1223,7 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN-1); midiPortName[MAXPNAMELEN-1] = 0; } - MultiByteToWideChar(CP_ACP, 0, midiPortName, -1, + MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiInDev[MIDM_NumDevs].caps.szPname, sizeof(MidiInDev[MIDM_NumDevs].caps.szPname) / sizeof(WCHAR)); MidiInDev[MIDM_NumDevs].state = 0; diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index af62bcf..603d62c 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -719,7 +719,7 @@ static DWORD widDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) { TRACE("(%u, %p)\n", wDevID, dwParam1); - *dwParam1 = MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1, + *dwParam1 = MultiByteToWideChar(CP_UNIXCP, 0, WInDev[wDevID].interface_name, -1, NULL, 0 ) * sizeof(WCHAR); return MMSYSERR_NOERROR; } @@ -729,10 +729,10 @@ static DWORD widDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) */ static DWORD widDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2) { - if (dwParam2 >= MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1, + if (dwParam2 >= MultiByteToWideChar(CP_UNIXCP, 0, WInDev[wDevID].interface_name, -1, NULL, 0 ) * sizeof(WCHAR)) { - MultiByteToWideChar(CP_ACP, 0, WInDev[wDevID].interface_name, -1, + MultiByteToWideChar(CP_UNIXCP, 0, WInDev[wDevID].interface_name, -1, dwParam1, dwParam2 / sizeof(WCHAR)); return MMSYSERR_NOERROR; } diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index 1516aa6..4bdaeff 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -490,7 +490,7 @@ static int ALSA_AddPlaybackDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pc if (rc) return(rc); - MultiByteToWideChar(CP_ACP, 0, wwo.ds_desc.szDesc, -1, + MultiByteToWideChar(CP_UNIXCP, 0, wwo.ds_desc.szDesc, -1, wwo.outcaps.szPname, sizeof(wwo.outcaps.szPname)/sizeof(WCHAR)); wwo.outcaps.szPname[sizeof(wwo.outcaps.szPname)/sizeof(WCHAR) - 1] = '\0'; @@ -530,7 +530,7 @@ static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcm if (rc) return(rc); - MultiByteToWideChar(CP_ACP, 0, wwi.ds_desc.szDesc, -1, + MultiByteToWideChar(CP_UNIXCP, 0, wwi.ds_desc.szDesc, -1, wwi.incaps.szPname, sizeof(wwi.incaps.szPname) / sizeof(WCHAR)); wwi.incaps.szPname[sizeof(wwi.incaps.szPname)/sizeof(WCHAR) - 1] = '\0'; diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 8f18d3c..9dae6f4 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -1131,7 +1131,7 @@ static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) { TRACE("(%u, %p)\n", wDevID, dwParam1); - *dwParam1 = MultiByteToWideChar(CP_ACP, 0, WOutDev[wDevID].interface_name, -1, + *dwParam1 = MultiByteToWideChar(CP_UNIXCP, 0, WOutDev[wDevID].interface_name, -1, NULL, 0 ) * sizeof(WCHAR); return MMSYSERR_NOERROR; } @@ -1141,10 +1141,10 @@ static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) */ static DWORD wodDevInterface(UINT wDevID, PWCHAR dwParam1, DWORD dwParam2) { - if (dwParam2 >= MultiByteToWideChar(CP_ACP, 0, WOutDev[wDevID].interface_name, -1, + if (dwParam2 >= MultiByteToWideChar(CP_UNIXCP, 0, WOutDev[wDevID].interface_name, -1, NULL, 0 ) * sizeof(WCHAR)) { - MultiByteToWideChar(CP_ACP, 0, WOutDev[wDevID].interface_name, -1, + MultiByteToWideChar(CP_UNIXCP, 0, WOutDev[wDevID].interface_name, -1, dwParam1, dwParam2 / sizeof(WCHAR)); return MMSYSERR_NOERROR; }

1 0

Rob Shearman : widl: Raise RPC_X_SS_IN_NULL_CONTEXT exception for NULL in-only context handles instead of RPC_X_NULL_REF_PTR .
by Alexandre Julliard Aug. 27, 2008

Aug. 27, 2008

Module: wine Branch: master Commit: 6f2687a389861fbedbbb8c8e3b3c376aef1e3676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2687a389861fbedbbb8c8e3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Aug 26 20:05:17 2008 +0100 widl: Raise RPC_X_SS_IN_NULL_CONTEXT exception for NULL in-only context handles instead of RPC_X_NULL_REF_PTR. Based on a patch by Michael Martin. --- tools/widl/client.c | 8 ++++++++ tools/widl/proxy.c | 5 +++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 779492e..6f148c1 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -188,6 +188,14 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) indent++; print_client("_Handle = NDRCContextBinding(%s%s);\n", is_ch_ptr ? "*" : "", context_handle_var->name); indent--; + if (is_attr(context_handle_var->attrs, ATTR_IN) && + !is_attr(context_handle_var->attrs, ATTR_OUT)) + { + print_client("else\n"); + indent++; + print_client("RpcRaiseException(RPC_X_SS_IN_NULL_CONTEXT);\n"); + indent--; + } fprintf(client, "\n"); } else if (implicit_handle) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 60ee3c0..c5c79c3 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -199,6 +199,11 @@ int cant_be_null(const var_t *v) const attr_list_t *attrs = v->attrs; const type_t *type = v->type; + /* context handles have their own checking so they can be null for the + * purposes of null ref pointer checking */ + if (is_aliaschain_attr(type, ATTR_CONTEXTHANDLE)) + return 0; + if (! attrs && type) { attrs = type->attrs;

1 0