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

Juan Lang : crypt32: Add a helper function to construct a signer handles structure.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: c4dd74d84c8bf2f52532ae76eb7e32a61d682dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4dd74d84c8bf2f52532ae76e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:46:13 2007 -0700 crypt32: Add a helper function to construct a signer handles structure. --- dlls/crypt32/msg.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 9eab762..27d0007 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -722,23 +722,38 @@ static BOOL CRYPT_ConstructAttributes(CRYPT_ATTRIBUTES *out, return ret; } +/* Constructs a CSignerHandles with a copy of crypt_prov (not add-ref'ed - the + * caller must do this if necessary), a hash handle based on HashAlgorithm, and + * an authenticated attributes hash handle if hasAuthAttrs is TRUE. + */ +static BOOL CSignerHandles_Construct(CSignerHandles *handles, + HCRYPTPROV crypt_prov, CRYPT_ALGORITHM_IDENTIFIER *HashAlgorithm, + BOOL hasAuthAttrs) +{ + ALG_ID algID; + BOOL ret; + + handles->prov = crypt_prov; + algID = CertOIDToAlgId(HashAlgorithm->pszObjId); + ret = CryptCreateHash(handles->prov, algID, 0, 0, &handles->contentHash); + if (ret && hasAuthAttrs) + ret = CryptCreateHash(handles->prov, algID, 0, 0, + &handles->authAttrHash); + return ret; +} + /* Constructs both a CSignerHandles and a CMSG_SIGNER_INFO from a * CMSG_SIGNER_ENCODE_INFO_WITH_CMS. */ static BOOL CSignerInfo_Construct(CSignerHandles *handles, CMSG_SIGNER_INFO *info, CMSG_SIGNER_ENCODE_INFO_WITH_CMS *in, DWORD open_flags) { - ALG_ID algID; BOOL ret; - handles->prov = in->hCryptProv; if (!(open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG)) - CryptContextAddRef(handles->prov, NULL, 0); - algID = CertOIDToAlgId(in->HashAlgorithm.pszObjId); - ret = CryptCreateHash(handles->prov, algID, 0, 0, &handles->contentHash); - if (ret && in->cAuthAttr) - ret = CryptCreateHash(handles->prov, algID, 0, 0, - &handles->authAttrHash); + CryptContextAddRef(in->hCryptProv, NULL, 0); + ret = CSignerHandles_Construct(handles, in->hCryptProv, &in->HashAlgorithm, + in->cAuthAttr > 0); if (ret) { /* Note: needs to change if CMS fields are supported */

1 0

Juan Lang : crypt32: Use signed message data type for decoded signed messages.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 5e9299d980fc240a2781bcfc4de0c9ac6282aa3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9299d980fc240a2781bcfc4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:42:31 2007 -0700 crypt32: Use signed message data type for decoded signed messages. --- dlls/crypt32/msg.c | 72 ++++++++++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 35 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index a7e43e4..9b9b843 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1278,8 +1278,8 @@ typedef struct _CDecodeMsg DWORD type; HCRYPTPROV crypt_prov; union { - HCRYPTHASH hash; - CRYPT_SIGNED_INFO *signedInfo; + HCRYPTHASH hash; + CSignedMsgData signed_data; } u; CRYPT_DATA_BLOB msg_data; PCONTEXT_PROPERTY_LIST properties; @@ -1298,7 +1298,8 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) CryptDestroyHash(msg->u.hash); break; case CMSG_SIGNED: - LocalFree(msg->u.signedInfo); + if (msg->u.signed_data.info) + LocalFree(msg->u.signed_data.info); break; } CryptMemFree(msg->msg_data.pbData); @@ -1433,7 +1434,7 @@ static BOOL CDecodeMsg_DecodeSignedContent(CDecodeMsg *msg, CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_SIGNED_INFO *)&signedInfo, &size); if (ret) - msg->u.signedInfo = signedInfo; + msg->u.signed_data.info = signedInfo; return ret; } /* Decodes the content in blob as the type given, and updates the value @@ -1778,16 +1779,17 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type)); break; case CMSG_CONTENT_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) { - if (!strcmp(msg->u.signedInfo->content.pszObjId, szOID_RSA_data)) + if (!strcmp(msg->u.signed_data.info->content.pszObjId, + szOID_RSA_data)) { CRYPT_DATA_BLOB *blob; DWORD size; ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, - msg->u.signedInfo->content.Content.pbData, - msg->u.signedInfo->content.Content.cbData, + msg->u.signed_data.info->content.Content.pbData, + msg->u.signed_data.info->content.Content.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, (LPBYTE)&blob, &size); if (ret) { @@ -1798,93 +1800,93 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, } else ret = CRYPT_CopyParam(pvData, pcbData, - msg->u.signedInfo->content.Content.pbData, - msg->u.signedInfo->content.Content.cbData); + msg->u.signed_data.info->content.Content.pbData, + msg->u.signed_data.info->content.Content.cbData); } else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_INNER_CONTENT_TYPE_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) ret = CRYPT_CopyParam(pvData, pcbData, - msg->u.signedInfo->content.pszObjId, - strlen(msg->u.signedInfo->content.pszObjId) + 1); + msg->u.signed_data.info->content.pszObjId, + strlen(msg->u.signed_data.info->content.pszObjId) + 1); else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_SIGNER_COUNT_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) ret = CRYPT_CopyParam(pvData, pcbData, - &msg->u.signedInfo->cSignerInfo, sizeof(DWORD)); + &msg->u.signed_data.info->cSignerInfo, sizeof(DWORD)); else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_SIGNER_INFO_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) { - if (dwIndex >= msg->u.signedInfo->cSignerInfo) + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) SetLastError(CRYPT_E_INVALID_INDEX); else ret = CRYPT_CopySignerInfo(pvData, pcbData, - &msg->u.signedInfo->rgSignerInfo[dwIndex]); + &msg->u.signed_data.info->rgSignerInfo[dwIndex]); } else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_SIGNER_CERT_INFO_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) { - if (dwIndex >= msg->u.signedInfo->cSignerInfo) + if (dwIndex >= msg->u.signed_data.info->cSignerInfo) SetLastError(CRYPT_E_INVALID_INDEX); else ret = CRYPT_CopySignerCertInfo(pvData, pcbData, - &msg->u.signedInfo->rgSignerInfo[dwIndex]); + &msg->u.signed_data.info->rgSignerInfo[dwIndex]); } else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_CERT_COUNT_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) ret = CRYPT_CopyParam(pvData, pcbData, - &msg->u.signedInfo->cCertEncoded, sizeof(DWORD)); + &msg->u.signed_data.info->cCertEncoded, sizeof(DWORD)); else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_CERT_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) { - if (dwIndex >= msg->u.signedInfo->cCertEncoded) + if (dwIndex >= msg->u.signed_data.info->cCertEncoded) SetLastError(CRYPT_E_INVALID_INDEX); else ret = CRYPT_CopyParam(pvData, pcbData, - msg->u.signedInfo->rgCertEncoded[dwIndex].pbData, - msg->u.signedInfo->rgCertEncoded[dwIndex].cbData); + msg->u.signed_data.info->rgCertEncoded[dwIndex].pbData, + msg->u.signed_data.info->rgCertEncoded[dwIndex].cbData); } else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_CRL_COUNT_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) ret = CRYPT_CopyParam(pvData, pcbData, - &msg->u.signedInfo->cCrlEncoded, sizeof(DWORD)); + &msg->u.signed_data.info->cCrlEncoded, sizeof(DWORD)); else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_CRL_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) { - if (dwIndex >= msg->u.signedInfo->cCrlEncoded) + if (dwIndex >= msg->u.signed_data.info->cCrlEncoded) SetLastError(CRYPT_E_INVALID_INDEX); else ret = CRYPT_CopyParam(pvData, pcbData, - msg->u.signedInfo->rgCrlEncoded[dwIndex].pbData, - msg->u.signedInfo->rgCrlEncoded[dwIndex].cbData); + msg->u.signed_data.info->rgCrlEncoded[dwIndex].pbData, + msg->u.signed_data.info->rgCrlEncoded[dwIndex].cbData); } else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_ATTR_CERT_COUNT_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) { DWORD attrCertCount = 0; @@ -1895,7 +1897,7 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; case CMSG_ATTR_CERT_PARAM: - if (msg->u.signedInfo) + if (msg->u.signed_data.info) SetLastError(CRYPT_E_INVALID_INDEX); else SetLastError(CRYPT_E_INVALID_MSG_TYPE);

1 0

Juan Lang : crypt32: Make a helper function to a free a signed message' s handles.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 0080d3d691913577538801696a4b70edc930b4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0080d3d691913577538801696… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:43:12 2007 -0700 crypt32: Make a helper function to a free a signed message's handles. --- dlls/crypt32/msg.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 9b9b843..b67dbbd 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -805,6 +805,20 @@ typedef struct _CSignedEncodeMsg CSignedMsgData msg_data; } CSignedEncodeMsg; +static void CSignedMsgData_CloseHandles(CSignedMsgData *msg_data) +{ + DWORD i; + + for (i = 0; i < msg_data->info->cSignerInfo; i++) + { + CryptDestroyKey(msg_data->signerHandles[i].key); + CryptDestroyHash(msg_data->signerHandles[i].contentHash); + CryptDestroyHash(msg_data->signerHandles[i].authAttrHash); + CryptReleaseContext(msg_data->signerHandles[i].prov, 0); + } + CryptMemFree(msg_data->signerHandles); +} + static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) { CSignedEncodeMsg *msg = (CSignedEncodeMsg *)hCryptMsg; @@ -814,14 +828,8 @@ static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCertEncoded); CRYPT_FreeBlobArray((BlobArray *)&msg->msg_data.info->cCrlEncoded); for (i = 0; i < msg->msg_data.info->cSignerInfo; i++) - { CSignerInfo_Free(&msg->msg_data.info->rgSignerInfo[i]); - CryptDestroyKey(msg->msg_data.signerHandles[i].key); - CryptDestroyHash(msg->msg_data.signerHandles[i].contentHash); - CryptDestroyHash(msg->msg_data.signerHandles[i].authAttrHash); - CryptReleaseContext(msg->msg_data.signerHandles[i].prov, 0); - } - CryptMemFree(msg->msg_data.signerHandles); + CSignedMsgData_CloseHandles(&msg->msg_data); CryptMemFree(msg->msg_data.info->rgSignerInfo); CryptMemFree(msg->msg_data.info); }

1 0

Juan Lang : crypt32: Make updating a hash a member of signed message data, not signed message.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: bfde05d8b69f12b00f5cc286110f2388fa33ed1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfde05d8b69f12b00f5cc2861… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:44:12 2007 -0700 crypt32: Make updating a hash a member of signed message data, not signed message. --- dlls/crypt32/msg.c | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index b67dbbd..0afb662 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -819,6 +819,18 @@ static void CSignedMsgData_CloseHandles(CSignedMsgData *msg_data) CryptMemFree(msg_data->signerHandles); } +static BOOL CSignedMsgData_UpdateHash(CSignedMsgData *msg_data, + const BYTE *pbData, DWORD cbData) +{ + DWORD i; + BOOL ret = TRUE; + + for (i = 0; ret && i < msg_data->info->cSignerInfo; i++) + ret = CryptHashData(msg_data->signerHandles[i].contentHash, pbData, + cbData, 0); + return ret; +} + static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) { CSignedEncodeMsg *msg = (CSignedEncodeMsg *)hCryptMsg; @@ -928,20 +940,6 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, return ret; } -static BOOL CSignedEncodeMsg_UpdateHash(CSignedEncodeMsg *msg, - const BYTE *pbData, DWORD cbData) -{ - DWORD i; - BOOL ret = TRUE; - - TRACE("(%p, %p, %d)\n", msg, pbData, cbData); - - for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++) - ret = CryptHashData(msg->msg_data.signerHandles[i].contentHash, pbData, - cbData, 0); - return ret; -} - static BOOL CRYPT_AppendAttribute(CRYPT_ATTRIBUTES *out, const CRYPT_ATTRIBUTE *in) { @@ -1099,7 +1097,7 @@ static BOOL CSignedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) { - ret = CSignedEncodeMsg_UpdateHash(msg, pbData, cbData); + ret = CSignedMsgData_UpdateHash(&msg->msg_data, pbData, cbData); if (ret && fFinal) { ret = CSignedEncodeMsg_UpdateAuthenticatedAttributes(msg); @@ -1128,7 +1126,7 @@ static BOOL CSignedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, else ret = TRUE; if (ret) - ret = CSignedEncodeMsg_UpdateHash(msg, pbData, cbData); + ret = CSignedMsgData_UpdateHash(&msg->msg_data, pbData, cbData); if (ret) ret = CSignedEncodeMsg_UpdateAuthenticatedAttributes(msg); if (ret)

1 0

Juan Lang : crypt32: Add a couple tests that show you can' t get the hash from an encoded hash message, and fix encoded hash messages to match.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: e7ce5ae2bcca233dede16ccaa675036dcfd9b9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7ce5ae2bcca233dede16ccaa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:33:44 2007 -0700 crypt32: Add a couple tests that show you can't get the hash from an encoded hash message, and fix encoded hash messages to match. --- dlls/crypt32/msg.c | 2 +- dlls/crypt32/tests/msg.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 79c8f9b..036f2f7 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -464,7 +464,7 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, } break; default: - ret = FALSE; + SetLastError(CRYPT_E_INVALID_MSG_TYPE); } return ret; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index e705824..b373470 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -788,6 +788,11 @@ static void test_hash_msg_get_param(void) size = 0; ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + /* For an encoded hash message, the hash data aren't available */ + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_HASH_DATA_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); /* The hash is also available. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); @@ -801,6 +806,11 @@ static void test_hash_msg_get_param(void) ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ok(!ret && GetLastError() == NTE_BAD_HASH_STATE, "Expected NTE_BAD_HASH_STATE, got %x\n", GetLastError()); + /* Even after a final update, the hash data aren't available */ + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_HASH_DATA_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); /* The version is also available, and should be zero for this message. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, NULL, &size);

1 0

Juan Lang : crypt32: Implement verifying the hash of a decoded hash message .
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 3e88838b606a93c67e92ee1a50e5b1d53a8df730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e88838b606a93c67e92ee1a5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:40:25 2007 -0700 crypt32: Implement verifying the hash of a decoded hash message. --- dlls/crypt32/msg.c | 34 +++++++++++++++++++++++++++++++++- dlls/crypt32/tests/msg.c | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 036f2f7..516bc1b 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1926,6 +1926,38 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, return ret; } +static BOOL CDecodeHashMsg_VerifyHash(CDecodeMsg *msg) +{ + BOOL ret; + CRYPT_DATA_BLOB hashBlob; + + ret = ContextPropertyList_FindProperty(msg->properties, + CMSG_HASH_DATA_PARAM, &hashBlob); + if (ret) + { + DWORD computedHashSize = 0; + + ret = CDecodeHashMsg_GetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, + &computedHashSize); + if (hashBlob.cbData == computedHashSize) + { + LPBYTE computedHash = CryptMemAlloc(computedHashSize); + + if (computedHash) + { + ret = CDecodeHashMsg_GetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, + computedHash, &computedHashSize); + if (ret) + ret = !memcmp(hashBlob.pbData, computedHash, + hashBlob.cbData); + } + else + ret = FALSE; + } + } + return ret; +} + static BOOL CDecodeMsg_Control(HCRYPTMSG hCryptMsg, DWORD dwFlags, DWORD dwCtrlType, const void *pvCtrlPara) { @@ -1955,7 +1987,7 @@ static BOOL CDecodeMsg_Control(HCRYPTMSG hCryptMsg, DWORD dwFlags, switch (msg->type) { case CMSG_HASHED: - FIXME("CMSG_CTRL_VERIFY_HASH: stub\n"); + ret = CDecodeHashMsg_VerifyHash(msg); break; default: SetLastError(CRYPT_E_INVALID_MSG_TYPE); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index b373470..72932fe 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2246,13 +2246,13 @@ 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, NULL); CryptMsgUpdate(msg, hashBareContent, sizeof(hashBareContent), TRUE); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - todo_wine ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); /* Can't decrypt an indeterminate-type message */ SetLastError(0xdeadbeef);

1 0

Juan Lang : crypt32: Make a signed message data type.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 7748905743a497ac5215f9289b555061406675d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7748905743a497ac5215f9289… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:41:23 2007 -0700 crypt32: Make a signed message data type. --- dlls/crypt32/msg.c | 161 +++++++++++++++++++++++++++++---------------------- 1 files changed, 91 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7748905743a497ac5215f…

1 0

Juan Lang : crypt32: Add a default message control function pointer.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 31c414f4b483c424dbf7244ad3dca08651b2a667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c414f4b483c424dbf7244ad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:27:06 2007 -0700 crypt32: Add a default message control function pointer. --- dlls/crypt32/msg.c | 33 ++++++++++++++++++++++++++------- dlls/crypt32/tests/msg.c | 8 +------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index a68bf52..02377b6 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -38,6 +38,17 @@ typedef BOOL (*CryptMsgGetParamFunc)(HCRYPTMSG hCryptMsg, DWORD dwParamType, typedef BOOL (*CryptMsgUpdateFunc)(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal); +typedef BOOL (*CryptMsgControlFunc)(HCRYPTMSG hCryptMsg, DWORD dwFlags, + DWORD dwCtrlType, const void *pvCtrlPara); + +BOOL CRYPT_DefaultMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, + DWORD dwCtrlType, const void *pvCtrlPara) +{ + TRACE("(%p, %08x, %d, %p)\n", hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara); + SetLastError(E_INVALIDARG); + return FALSE; +} + typedef enum _CryptMsgState { MsgStateInit, MsgStateUpdated, @@ -54,11 +65,13 @@ typedef struct _CryptMsgBase CryptMsgCloseFunc close; CryptMsgUpdateFunc update; CryptMsgGetParamFunc get_param; + CryptMsgControlFunc control; } CryptMsgBase; static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags, PCMSG_STREAM_INFO pStreamInfo, CryptMsgCloseFunc close, - CryptMsgGetParamFunc get_param, CryptMsgUpdateFunc update) + CryptMsgGetParamFunc get_param, CryptMsgUpdateFunc update, + CryptMsgControlFunc control) { msg->ref = 1; msg->open_flags = dwFlags; @@ -75,6 +88,7 @@ static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags, msg->close = close; msg->get_param = get_param; msg->update = update; + msg->control = control; msg->state = MsgStateInit; } @@ -313,7 +327,8 @@ static HCRYPTMSG CDataEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, if (msg) { CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, - CDataEncodeMsg_Close, CDataEncodeMsg_GetParam, CDataEncodeMsg_Update); + CDataEncodeMsg_Close, CDataEncodeMsg_GetParam, CDataEncodeMsg_Update, + CRYPT_DefaultMsgControl); msg->bare_content_len = sizeof(empty_data_content); msg->bare_content = (LPBYTE)empty_data_content; } @@ -522,7 +537,8 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, if (msg) { CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, - CHashEncodeMsg_Close, CHashEncodeMsg_GetParam, CHashEncodeMsg_Update); + CHashEncodeMsg_Close, CHashEncodeMsg_GetParam, CHashEncodeMsg_Update, + CRYPT_DefaultMsgControl); msg->prov = prov; msg->data.cbData = 0; msg->data.pbData = NULL; @@ -1132,7 +1148,7 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, CSignedEncodeMsg_Close, CSignedEncodeMsg_GetParam, - CSignedEncodeMsg_Update); + CSignedEncodeMsg_Update, CRYPT_DefaultMsgControl); msg->data.cbData = 0; msg->data.pbData = NULL; memset(&msg->info, 0, sizeof(msg->info)); @@ -1928,7 +1944,8 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, if (msg) { CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, - CDecodeMsg_Close, CDecodeMsg_GetParam, CDecodeMsg_Update); + CDecodeMsg_Close, CDecodeMsg_GetParam, CDecodeMsg_Update, + CRYPT_DefaultMsgControl); msg->type = dwMsgType; if (hCryptProv) msg->crypt_prov = hCryptProv; @@ -2010,7 +2027,9 @@ BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, BOOL WINAPI CryptMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, DWORD dwCtrlType, const void *pvCtrlPara) { - FIXME("(%p, %08x, %d, %p): stub\n", hCryptMsg, dwFlags, dwCtrlType, + CryptMsgBase *msg = (CryptMsgBase *)hCryptMsg; + + TRACE("(%p, %08x, %d, %p)\n", hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara); - return TRUE; + return msg->control(hCryptMsg, dwFlags, dwCtrlType, pvCtrlPara); } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 66b4eca..729aee6 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2132,7 +2132,6 @@ static void test_msg_control(void) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } @@ -2141,7 +2140,6 @@ static void test_msg_control(void) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } @@ -2157,7 +2155,6 @@ static void test_msg_control(void) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } @@ -2167,7 +2164,6 @@ static void test_msg_control(void) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } @@ -2182,7 +2178,6 @@ static void test_msg_control(void) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } @@ -2192,7 +2187,6 @@ static void test_msg_control(void) { SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, i, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } @@ -2247,13 +2241,13 @@ 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, NULL); CryptMsgUpdate(msg, hashBareContent, sizeof(hashBareContent), TRUE); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); + todo_wine ok(ret, "CryptMsgControl failed: %08x\n", GetLastError()); /* Can't decrypt an indeterminate-type message */ SetLastError(0xdeadbeef);

1 0

Juan Lang : crypt32: Add a mostly stub control function for decode messages .
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: 163e8d6256224fa4e6bc65a3f7ddc434b97bfdf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163e8d6256224fa4e6bc65a3f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Aug 20 17:33:04 2007 -0700 crypt32: Add a mostly stub control function for decode messages. --- dlls/crypt32/msg.c | 43 ++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/msg.c | 8 -------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 02377b6..79c8f9b 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1926,6 +1926,47 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, return ret; } +static BOOL CDecodeMsg_Control(HCRYPTMSG hCryptMsg, DWORD dwFlags, + DWORD dwCtrlType, const void *pvCtrlPara) +{ + CDecodeMsg *msg = (CDecodeMsg *)hCryptMsg; + BOOL ret = FALSE; + + switch (dwCtrlType) + { + case CMSG_CTRL_VERIFY_SIGNATURE: + switch (msg->type) + { + case CMSG_SIGNED: + FIXME("CMSG_CTRL_VERIFY_SIGNATURE: stub\n"); + break; + default: + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + break; + case CMSG_CTRL_DECRYPT: + switch (msg->type) + { + default: + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + break; + case CMSG_CTRL_VERIFY_HASH: + switch (msg->type) + { + case CMSG_HASHED: + FIXME("CMSG_CTRL_VERIFY_HASH: stub\n"); + break; + default: + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + break; + default: + SetLastError(CRYPT_E_CONTROL_TYPE); + } + return ret; +} + HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, HCRYPTPROV_LEGACY hCryptProv, PCERT_INFO pRecipientInfo, PCMSG_STREAM_INFO pStreamInfo) @@ -1945,7 +1986,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, { CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, CDecodeMsg_Close, CDecodeMsg_GetParam, CDecodeMsg_Update, - CRYPT_DefaultMsgControl); + CDecodeMsg_Control); msg->type = dwMsgType; if (hCryptProv) msg->crypt_prov = hCryptProv; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 729aee6..e705824 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2197,18 +2197,15 @@ static void test_msg_control(void) /* Bad control type */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, 0, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_CONTROL_TYPE, "Expected CRYPT_E_CONTROL_TYPE, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 1, 0, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_CONTROL_TYPE, "Expected CRYPT_E_CONTROL_TYPE, got %08x\n", GetLastError()); /* Can't verify the hash of an indeterminate-type message */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); /* Crashes @@ -2216,7 +2213,6 @@ static void test_msg_control(void) */ /* Can't decrypt an indeterminate-type message */ ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); CryptMsgClose(msg); @@ -2234,7 +2230,6 @@ static void test_msg_control(void) */ /* Can't verify the signature of a hash message */ ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_SIGNATURE, &certInfo); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); CryptMsgUpdate(msg, hashEmptyBareContent, sizeof(hashEmptyBareContent), @@ -2252,7 +2247,6 @@ static void test_msg_control(void) /* Can't decrypt an indeterminate-type message */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); CryptMsgClose(msg); @@ -2262,13 +2256,11 @@ static void test_msg_control(void) /* Can't verify the hash of a signed message */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_VERIFY_HASH, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); /* Can't decrypt a signed message */ SetLastError(0xdeadbeef); ret = CryptMsgControl(msg, 0, CMSG_CTRL_DECRYPT, &decryptPara); - todo_wine ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError()); /* Crash

1 0

Vitaliy Margolen : dinput: Fix compile with old input. h that missing input_absinfo.
by Alexandre Julliard 21 Aug '07

21 Aug '07

Module: wine Branch: master Commit: fc0298429a403e76eb6c9b6fb25b6556f08799aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0298429a403e76eb6c9b6fb… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Aug 21 07:06:17 2007 -0600 dinput: Fix compile with old input.h that missing input_absinfo. --- dlls/dinput/joystick_linuxinput.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c025219..37ae4a7 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -119,6 +119,14 @@ LONG joystick_map_axis(ObjProps *props, int val) #define WINE_JOYSTICK_MAX_POVS 4 #define WINE_JOYSTICK_MAX_BUTTONS 128 +struct wine_input_absinfo { + LONG value; + LONG minimum; + LONG maximum; + LONG fuzz; + LONG flat; +}; + typedef struct EffectListItem EffectListItem; struct EffectListItem { @@ -150,7 +158,7 @@ struct JoyDev { BYTE ffbits[(FF_MAX+7)/8]; /* data returned by the EVIOCGABS() ioctl */ - struct input_absinfo axes[ABS_MAX]; + struct wine_input_absinfo axes[ABS_MAX]; }; struct JoystickImpl

1 0