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

Michael Stefaniuc : wined3d: Remove unreachable code: break after return. Found by Smatch.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 82a52308acd9938e77d052548d18bbf16404c438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a52308acd9938e77d052548… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 18 00:14:36 2007 +0200 wined3d: Remove unreachable code: break after return. Found by Smatch. --- dlls/wined3d/utils.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 99835dc..613bff1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -615,7 +615,6 @@ const char* debug_d3dtexturestate(DWORD state) { case 12: /* Note WINED3DTSS are not consecutive, so skip these */ return "unused"; - break; default: FIXME("Unrecognized %u texture state!\n", state); return "unrecognized"; @@ -2518,11 +2517,11 @@ int D3DFmtMakeGlCfg(WINED3DFORMAT BackBufferFormat, WINED3DFORMAT StencilBufferF /* DirectDraw stuff */ WINED3DFORMAT pixelformat_for_depth(DWORD depth) { switch(depth) { - case 8: return WINED3DFMT_P8; break; - case 15: return WINED3DFMT_X1R5G5B5; break; - case 16: return WINED3DFMT_R5G6B5; break; - case 24: return WINED3DFMT_R8G8B8; break; - case 32: return WINED3DFMT_X8R8G8B8; break; + case 8: return WINED3DFMT_P8; + case 15: return WINED3DFMT_X1R5G5B5; + case 16: return WINED3DFMT_R5G6B5; + case 24: return WINED3DFMT_R8G8B8; + case 32: return WINED3DFMT_X8R8G8B8; default: return WINED3DFMT_UNKNOWN; } }

1 0

Juan Lang : crypt32: Fix typo.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: c59d51ab24b5b508ca00fbc4c66ba82dfb9a3ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59d51ab24b5b508ca00fbc4c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 17 07:36:52 2007 -0700 crypt32: Fix typo. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index d3fe0f9..2c71c08 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3169,7 +3169,7 @@ typedef struct _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA #define CMSG_TYPE_PARAM 1 #define CMSG_CONTENT_PARAM 2 #define CMSG_BARE_CONTENT_PARAM 3 -#define CMSG_INNER_CONTENT_PARAM 4 +#define CMSG_INNER_CONTENT_TYPE_PARAM 4 #define CMSG_SIGNER_COUNT_PARAM 5 #define CMSG_SIGNER_INFO_PARAM 6 #define CMSG_SIGNER_CERT_INFO_PARAM 7

1 0

Juan Lang : crypt32: Add a couple more parameter tests for hash messages.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 056b4f10dd0c7dd44457cc2115b6b8436edf903b URL: http://source.winehq.org/git/wine.git/?a=commit;h=056b4f10dd0c7dd44457cc211… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 17 07:37:26 2007 -0700 crypt32: Add a couple more parameter tests for hash messages. --- dlls/crypt32/tests/msg.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 53c1235..b80a74a 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1208,7 +1208,7 @@ static void test_decode_msg_get_param(void) { HCRYPTMSG msg; BOOL ret; - DWORD size = 0; + DWORD size = 0, version; msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); SetLastError(0xdeadbeef); @@ -1241,6 +1241,14 @@ static void test_decode_msg_get_param(void) todo_wine check_param("hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, hashParam, sizeof(hashParam)); + size = strlen(szOID_RSA_data) + 1; + todo_wine + check_param("hash inner OID", msg, CMSG_INNER_CONTENT_TYPE_PARAM, + (const BYTE *)szOID_RSA_data, strlen(szOID_RSA_data) + 1); + version = CMSG_HASHED_DATA_V0; + todo_wine + check_param("hash version", msg, CMSG_VERSION_PARAM, (const BYTE *)&version, + sizeof(version)); CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Add a few tests for decoded message parameters.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 95bb1be2b72515c2c7dfa2dfd4f57fdd3f3e065b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95bb1be2b72515c2c7dfa2dfd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 17 07:31:51 2007 -0700 crypt32: Add a few tests for decoded message parameters. --- dlls/crypt32/tests/msg.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 265205b..8458c9b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -268,7 +268,7 @@ static void check_param(LPCSTR test, HCRYPTMSG msg, DWORD param, LPBYTE buf; BOOL ret; - size = 0; + size = 0xdeadbeef; ret = CryptMsgGetParam(msg, param, 0, NULL, &size); ok(ret, "%s: CryptMsgGetParam failed: %08x\n", test, GetLastError()); buf = HeapAlloc(GetProcessHeap(), 0, size); @@ -276,7 +276,7 @@ static void check_param(LPCSTR test, HCRYPTMSG msg, DWORD param, ok(ret, "%s: CryptMsgGetParam failed: %08x\n", test, GetLastError()); ok(size == expectedSize, "%s: expected size %d, got %d\n", test, expectedSize, size); - if (size) + if (size == expectedSize && size) ok(!memcmp(buf, expected, size), "%s: unexpected data\n", test); HeapFree(GetProcessHeap(), 0, buf); } @@ -1201,9 +1201,49 @@ static void test_decode_msg_update(void) CryptMsgClose(msg); } +static const BYTE hashParam[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1, + 0xdf,0xeb,0x9d,0x2a,0x8f,0x26,0x2f }; + +static void test_decode_msg_get_param(void) +{ + HCRYPTMSG msg; + BOOL ret; + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, dataContent, sizeof(dataContent), TRUE); + todo_wine + check_param("data content", msg, CMSG_CONTENT_PARAM, msgData, + sizeof(msgData)); + CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); + todo_wine + check_param("empty hash content", msg, CMSG_CONTENT_PARAM, NULL, 0); + todo_wine + check_param("empty hash hash data", msg, CMSG_HASH_DATA_PARAM, NULL, 0); + todo_wine + check_param("empty hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, + emptyHashParam, sizeof(emptyHashParam)); + CryptMsgClose(msg); + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); + todo_wine + check_param("hash content", msg, CMSG_CONTENT_PARAM, msgData, + sizeof(msgData)); + todo_wine + check_param("hash hash data", msg, CMSG_HASH_DATA_PARAM, hashParam, + sizeof(hashParam)); + todo_wine + check_param("hash computed hash", msg, CMSG_COMPUTED_HASH_PARAM, + hashParam, sizeof(hashParam)); + CryptMsgClose(msg); +} + static void test_decode_msg(void) { test_decode_msg_update(); + test_decode_msg_get_param(); } START_TEST(msg)

1 0

Juan Lang : crypt32: Implement getting content of a data message.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 4e2894493414da24429f557ae307791592ca216a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2894493414da24429f557ae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 17 07:33:01 2007 -0700 crypt32: Implement getting content of a data message. --- dlls/crypt32/msg.c | 7 +++++++ dlls/crypt32/tests/msg.c | 6 +++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 4f2aeaa..f5b65de 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -743,6 +743,13 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, sizeof(msg->type)); break; + case CMSG_CONTENT_PARAM: + if (msg->data) + ret = CRYPT_CopyParam(pvData, pcbData, msg->data->pbData, + msg->data->cbData); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; default: FIXME("unimplemented for parameter %d\n", dwParamType); SetLastError(CRYPT_E_INVALID_MSG_TYPE); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8458c9b..53c1235 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1208,10 +1208,14 @@ static void test_decode_msg_get_param(void) { HCRYPTMSG msg; BOOL ret; + DWORD size = 0; msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); ret = CryptMsgUpdate(msg, dataContent, sizeof(dataContent), TRUE); - todo_wine check_param("data content", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); CryptMsgClose(msg);

1 0

Juan Lang : crypt32: Use property list for decoded message parameters.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 8df323f84a8d22fea63ee565065096cf67fd5f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8df323f84a8d22fea63ee5650… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 17 07:36:24 2007 -0700 crypt32: Use property list for decoded message parameters. --- dlls/crypt32/msg.c | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f5b65de..93cce83 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -591,11 +591,11 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, typedef struct _CDecodeMsg { - CryptMsgBase base; - DWORD type; - HCRYPTPROV crypt_prov; - CRYPT_DATA_BLOB msg_data; - PCRYPT_DATA_BLOB data; /* for type == CMSG_DATA */ + CryptMsgBase base; + DWORD type; + HCRYPTPROV crypt_prov; + CRYPT_DATA_BLOB msg_data; + PCONTEXT_PROPERTY_LIST properties; } CDecodeMsg; static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) @@ -605,7 +605,7 @@ static void CDecodeMsg_Close(HCRYPTMSG hCryptMsg) if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(msg->crypt_prov, 0); CryptMemFree(msg->msg_data.pbData); - LocalFree(msg->data); + ContextPropertyList_Free(msg->properties); } static BOOL CDecodeMsg_CopyData(CDecodeMsg *msg, const BYTE *pbData, @@ -645,12 +645,21 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, switch (type) { case CMSG_DATA: + { + CRYPT_DATA_BLOB *data; + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, - (LPBYTE)&msg->data, &size); + (LPBYTE)&data, &size); if (ret) + { + ret = ContextPropertyList_SetProperty(msg->properties, + CMSG_CONTENT_PARAM, data->pbData, data->cbData); + LocalFree(data); msg->type = CMSG_DATA; + } break; + } case CMSG_HASHED: { CRYPT_DIGESTED_DATA *digestedData; @@ -743,16 +752,17 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, sizeof(msg->type)); break; - case CMSG_CONTENT_PARAM: - if (msg->data) - ret = CRYPT_CopyParam(pvData, pcbData, msg->data->pbData, - msg->data->cbData); + default: + { + CRYPT_DATA_BLOB blob; + + ret = ContextPropertyList_FindProperty(msg->properties, dwParamType, + &blob); + if (ret) + ret = CRYPT_CopyParam(pvData, pcbData, blob.pbData, blob.cbData); else SetLastError(CRYPT_E_INVALID_MSG_TYPE); - break; - default: - FIXME("unimplemented for parameter %d\n", dwParamType); - SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } } return ret; } @@ -786,7 +796,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, } msg->msg_data.cbData = 0; msg->msg_data.pbData = NULL; - msg->data = NULL; + msg->properties = ContextPropertyList_Create(); } return msg; }

1 0

Juan Lang : crypt32: Add tests for decoding a hash message.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 60c6a9e3816822f481ba5383a64a21215f283326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60c6a9e3816822f481ba5383a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 17 07:23:19 2007 -0700 crypt32: Add tests for decoding a hash message. --- dlls/crypt32/tests/msg.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 1293070..9e8aac5 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -977,6 +977,12 @@ static const struct update_accum a4 = { 1, &b4 }; static const BYTE bogusOIDContent[] = { 0x30,0x0f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x07,0xa0,0x02, 0x04,0x00 }; +static const BYTE bogusHashContent[] = { +0x30,0x47,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x05,0xa0,0x3a, +0x30,0x38,0x02,0x01,0x00,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,0x04,0x10,0x00,0xd6,0xc0, +0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26,0x2f }; static void test_decode_msg_update(void) { @@ -1120,6 +1126,81 @@ static void test_decode_msg_update(void) ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); CryptMsgClose(msg); + + /* Similarly, opening an empty hash with unspecified type succeeds.. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + /* while with specified type it fails. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, + NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); + CryptMsgClose(msg); + /* On the other hand, decoding the bare content of an empty hash message + * fails with unspecified type.. + */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, hashEmptyBareContent, + sizeof(hashEmptyBareContent), TRUE); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); + CryptMsgClose(msg); + /* but succeeds with explicit type. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, + NULL); + ret = CryptMsgUpdate(msg, hashEmptyBareContent, + sizeof(hashEmptyBareContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + CryptMsgClose(msg); + + /* And again, opening a (non-empty) hash message with unspecified type + * succeeds.. + */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + /* while with specified type it fails.. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, + NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); + CryptMsgClose(msg); + /* and decoding the bare content of a non-empty hash message fails with + * unspecified type.. + */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, hashBareContent, sizeof(hashBareContent), TRUE); + ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, + "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); + CryptMsgClose(msg); + /* but succeeds with explicit type. */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, 0, NULL, + NULL); + ret = CryptMsgUpdate(msg, hashBareContent, sizeof(hashBareContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + CryptMsgClose(msg); + + /* Opening a (non-empty) hash message with unspecified type and a bogus + * hash value succeeds.. + */ + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, bogusHashContent, sizeof(bogusHashContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); } static void test_decode_msg(void)

1 0

Juan Lang : crypt32: Remove a redundant line.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 8cf82d8a0e7a6278a9a49294bb051f3c0664592d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cf82d8a0e7a6278a9a49294b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 17 07:24:20 2007 -0700 crypt32: Remove a redundant line. --- dlls/crypt32/decode.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 3a3a195..22fd06e 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2339,7 +2339,6 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfo(DWORD dwCertEncodingType, } __ENDTRY return ret; - return ret; } static BOOL WINAPI CRYPT_AsnDecodeAltName(DWORD dwCertEncodingType,

1 0

Juan Lang : crypt32: Implement decoding hash messages.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 35abf3adf3d7daa0914df8d57c19fbaea2a00547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35abf3adf3d7daa0914df8d57… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 17 07:25:31 2007 -0700 crypt32: Implement decoding hash messages. --- dlls/crypt32/crypt32_private.h | 4 ++ dlls/crypt32/decode.c | 81 ++++++++++++++++++++++++++++++++++------ dlls/crypt32/msg.c | 13 ++++++ dlls/crypt32/tests/msg.c | 2 - 4 files changed, 86 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index d65c4ad..a26b366 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -90,6 +90,10 @@ BOOL CRYPT_AsnEncodePKCSDigestedData(CRYPT_DIGESTED_DATA *digestedData, BOOL CRYPT_EncodeEnsureSpace(DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded, DWORD bytesNeeded); +BOOL CRYPT_AsnDecodePKCSDigestedData(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, + CRYPT_DIGESTED_DATA *digestedData, DWORD *pcbDigestedData); + /* The following aren't defined in wincrypt.h, as they're "reserved" */ #define CERT_CERT_PROP_ID 32 #define CERT_CRL_PROP_ID 33 diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 22fd06e..deedaf1 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2308,6 +2308,27 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSContent(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfoInternal( + DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + CRYPT_CONTENT_INFO *info = (CRYPT_CONTENT_INFO *)pvStructInfo; + struct AsnDecodeSequenceItem items[] = { + { ASN_OBJECTIDENTIFIER, offsetof(CRYPT_CONTENT_INFO, pszObjId), + CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), FALSE, TRUE, + offsetof(CRYPT_CONTENT_INFO, pszObjId), 0 }, + { ASN_CONTEXT | ASN_CONSTRUCTOR | 0, + offsetof(CRYPT_CONTENT_INFO, Content), CRYPT_AsnDecodePKCSContent, + sizeof(CRYPT_DER_BLOB), TRUE, TRUE, + offsetof(CRYPT_CONTENT_INFO, Content.pbData), 0 }, + }; + + return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pcbStructInfo, info ? info->pszObjId : NULL); +} + static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfo(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) @@ -2319,19 +2340,28 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfo(DWORD dwCertEncodingType, __TRY { - struct AsnDecodeSequenceItem items[] = { - { ASN_OBJECTIDENTIFIER, offsetof(CRYPT_CONTENT_INFO, pszObjId), - CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), FALSE, TRUE, - offsetof(CRYPT_CONTENT_INFO, pszObjId), 0 }, - { ASN_CONTEXT | ASN_CONSTRUCTOR | 0, - offsetof(CRYPT_CONTENT_INFO, Content), CRYPT_AsnDecodePKCSContent, - sizeof(CRYPT_DER_BLOB), TRUE, TRUE, - offsetof(CRYPT_CONTENT_INFO, Content.pbData), 0 }, - }; + ret = CRYPT_AsnDecodePKCSContentInfoInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, pcbStructInfo); + if (ret && pvStructInfo) + { + ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, *pcbStructInfo); + if (ret) + { + CRYPT_CONTENT_INFO *info; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pDecodePara, pvStructInfo, pcbStructInfo, NULL); + if (dwFlags & CRYPT_DECODE_ALLOC_FLAG) + pvStructInfo = *(BYTE **)pvStructInfo; + info = (CRYPT_CONTENT_INFO *)pvStructInfo; + info->pszObjId = (LPSTR)((BYTE *)info + + sizeof(CRYPT_CONTENT_INFO)); + ret = CRYPT_AsnDecodePKCSContentInfoInternal(dwCertEncodingType, + lpszStructType, pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo, + pcbStructInfo); + } + } } __EXCEPT_PAGE_FAULT { @@ -2341,6 +2371,33 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSContentInfo(DWORD dwCertEncodingType, return ret; } +BOOL CRYPT_AsnDecodePKCSDigestedData(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, + CRYPT_DIGESTED_DATA *digestedData, DWORD *pcbDigestedData) +{ + BOOL ret; + struct AsnDecodeSequenceItem items[] = { + { ASN_INTEGER, offsetof(CRYPT_DIGESTED_DATA, version), CRYPT_AsnDecodeInt, + sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_SEQUENCEOF, offsetof(CRYPT_DIGESTED_DATA, DigestAlgorithm), + CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER), + FALSE, TRUE, offsetof(CRYPT_DIGESTED_DATA, DigestAlgorithm.pszObjId), + 0 }, + { ASN_SEQUENCEOF, offsetof(CRYPT_DIGESTED_DATA, ContentInfo), + CRYPT_AsnDecodePKCSContentInfoInternal, + sizeof(CRYPT_CONTENT_INFO), FALSE, TRUE, offsetof(CRYPT_DIGESTED_DATA, + ContentInfo.pszObjId), 0 }, + { ASN_OCTETSTRING, offsetof(CRYPT_DIGESTED_DATA, hash), + CRYPT_AsnDecodeOctetsInternal, sizeof(CRYPT_HASH_BLOB), FALSE, TRUE, + offsetof(CRYPT_DIGESTED_DATA, hash.pbData), 0 }, + }; + + ret = CRYPT_AsnDecodeSequence(X509_ASN_ENCODING, items, + sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, + pDecodePara, digestedData, pcbDigestedData, NULL); + return ret; +} + static BOOL WINAPI CRYPT_AsnDecodeAltName(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 81b9cdd..4f2aeaa 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -652,6 +652,19 @@ static BOOL CDecodeMsg_DecodeContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob, msg->type = CMSG_DATA; break; case CMSG_HASHED: + { + CRYPT_DIGESTED_DATA *digestedData; + + ret = CRYPT_AsnDecodePKCSDigestedData(blob->pbData, blob->cbData, + CRYPT_DECODE_ALLOC_FLAG, NULL, (CRYPT_DIGESTED_DATA *)&digestedData, + &size); + if (ret) + { + FIXME("need to store data for CMSG_HASHED\n"); + LocalFree(digestedData); + } + break; + } case CMSG_ENVELOPED: case CMSG_SIGNED: FIXME("unimplemented for type %s\n", MSG_TYPE_STR(type)); diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 9e8aac5..265205b 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1138,7 +1138,6 @@ static void test_decode_msg_update(void) NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashEmptyContent, sizeof(hashEmptyContent), TRUE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); CryptMsgClose(msg); @@ -1173,7 +1172,6 @@ static void test_decode_msg_update(void) NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, hashContent, sizeof(hashContent), TRUE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG, "Expected CRYPT_E_ASN1_BADTAG, got %x\n", GetLastError()); CryptMsgClose(msg);

1 0

Juan Lang : crypt32: Fix a bad comment.
by Alexandre Julliard 18 Jul '07

18 Jul '07

Module: wine Branch: master Commit: 8099ff4bced2f5c7bf84d17150a503840899ae02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8099ff4bced2f5c7bf84d1715… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 17 07:25:56 2007 -0700 crypt32: Fix a bad comment. --- dlls/crypt32/decode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index deedaf1..29687ef 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -278,9 +278,9 @@ static BOOL CRYPT_DecodeEnsureSpace(DWORD dwFlags, * If true, and the tag doesn't match the expected tag for this item, * or the decodeFunc fails with CRYPT_E_ASN1_BADTAG, then minSize space is * filled with 0 for this member. - * hasPointer, pointerOffset, minSize: + * hasPointer, pointerOffset: * If the item has dynamic data, set hasPointer to TRUE, pointerOffset to - * the offset within the (outer) struct of the data pointer (or to the + * the offset within the struct of the data pointer (or to the * first data pointer, if more than one exist). * size: * Used by CRYPT_AsnDecodeSequence, not for your use.

1 0