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

Juan Lang : crypt32: Add a partial stub for updating a signed encoded message.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: d11ddebc763bbccb5b07f952085fdb5d342f5ec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11ddebc763bbccb5b07f9520… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 17:33:09 2007 -0700 crypt32: Add a partial stub for updating a signed encoded message. --- dlls/crypt32/msg.c | 42 ++++++++++++++++++++++++++++++++++++++---- dlls/crypt32/tests/msg.c | 7 ------- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 08b3ce8..c134e68 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -592,12 +592,15 @@ static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer) typedef struct _CSignedEncodeMsg { - CryptMsgBase base; + CryptMsgBase base; + CRYPT_DATA_BLOB data; } CSignedEncodeMsg; static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) { - FIXME("(%p)\n", hCryptMsg); + CSignedEncodeMsg *msg = (CSignedEncodeMsg *)hCryptMsg; + + CryptMemFree(msg->data.pbData); } static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, @@ -611,8 +614,37 @@ static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, static BOOL CSignedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal) { - FIXME("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); - return FALSE; + CSignedEncodeMsg *msg = (CSignedEncodeMsg *)hCryptMsg; + BOOL ret = FALSE; + + if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) + { + FIXME("streamed / detached update unimplemented\n"); + ret = TRUE; + } + else + { + if (!fFinal) + SetLastError(CRYPT_E_MSG_ERROR); + else + { + if (cbData) + { + msg->data.pbData = CryptMemAlloc(cbData); + if (msg->data.pbData) + { + memcpy(msg->data.pbData, pbData, cbData); + msg->data.cbData = cbData; + ret = TRUE; + } + } + else + ret = TRUE; + if (ret) + FIXME("non-streamed final update: partial stub\n"); + } + } + return ret; } static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, @@ -644,6 +676,8 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, CSignedEncodeMsg_Close, CSignedEncodeMsg_GetParam, CSignedEncodeMsg_Update); + msg->data.cbData = 0; + msg->data.pbData = NULL; } return msg; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8ef97e8..94864c1 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1112,11 +1112,9 @@ static void test_signed_msg_update(void) ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); /* CMSG_SIGNED allows non-final updates. */ ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* CMSG_SIGNED also allows non-final updates with no data. */ ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* The final update requires a private key in the hCryptProv, in order to * generate the signature. @@ -1143,17 +1141,14 @@ static void test_signed_msg_update(void) ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); /* CMSG_SIGNED allows non-final updates. */ ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* CMSG_SIGNED also allows non-final updates with no data. */ ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* Now that the private key exists, the final update can succeed (even * with no data.) */ ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* But no updates are allowed after the final update. */ SetLastError(0xdeadbeef); @@ -1282,7 +1277,6 @@ static void test_signed_msg_encoding(void) check_param("detached signed empty content", msg, CMSG_CONTENT_PARAM, signedEmptyContent, sizeof(signedEmptyContent)); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); todo_wine check_param("detached signed hash", msg, CMSG_COMPUTED_HASH_PARAM, @@ -1312,7 +1306,6 @@ static void test_signed_msg_encoding(void) check_param("signed empty content", msg, CMSG_CONTENT_PARAM, signedEmptyContent, sizeof(signedEmptyContent)); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); todo_wine check_param("signed bare content", msg, CMSG_BARE_CONTENT_PARAM,

1 0

Juan Lang : crypt32: Add tests for signed message encoding.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 014f282b724eeaa8609677c0b621e4f33ea917c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014f282b724eeaa8609677c0b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 17:29:06 2007 -0700 crypt32: Add tests for signed message encoding. --- dlls/crypt32/tests/msg.c | 166 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 160 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=014f282b724eeaa860967…

1 0

Juan Lang : crypt32: Check for and fail on indefinite-length encoding.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 45652e08029970f6991e0aab7c365eb6b2bb6343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45652e08029970f6991e0aab7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 15:30:20 2007 -0700 crypt32: Check for and fail on indefinite-length encoding. --- dlls/crypt32/decode.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 29687ef..8a062ce 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -193,6 +193,12 @@ static BOOL WINAPI CRYPT_GetLen(const BYTE *pbEncoded, DWORD cbEncoded, ret = TRUE; } } + else if (pbEncoded[1] == 0x80) + { + FIXME("unimplemented for indefinite-length encoding\n"); + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } else { BYTE lenLen = GET_LEN_BYTES(pbEncoded[1]);

1 0

Juan Lang : crypt32: Introduce function to encode an array of items as a set.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: dc28f99d22841cd529ec35b3307a5823dd3977ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc28f99d22841cd529ec35b33… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 15:29:15 2007 -0700 crypt32: Introduce function to encode an array of items as a set. --- dlls/crypt32/encode.c | 126 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 89 insertions(+), 37 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index a7cb661..e2fcc99 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1210,6 +1210,91 @@ static BOOL WINAPI CRYPT_DEREncodeSet(DWORD dwCertEncodingType, return ret; } +struct DERSetDescriptor +{ + DWORD cItems; + const void *items; + size_t itemSize; + off_t itemOffset; + CryptEncodeObjectExFunc encode; +}; + +static BOOL WINAPI CRYPT_DEREncodeItemsAsSet(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + const struct DERSetDescriptor *desc = + (const struct DERSetDescriptor *)pvStructInfo; + CRYPT_SET_OF setOf = { 0, NULL }; + BOOL ret = TRUE; + DWORD i; + + if (desc->cItems) + { + setOf.rgValue = CryptMemAlloc(setOf.cValue * sizeof(CRYPT_DER_BLOB)); + if (!setOf.rgValue) + ret = FALSE; + else + { + setOf.cValue = desc->cItems; + memset(setOf.rgValue, 0, setOf.cValue * sizeof(CRYPT_DER_BLOB)); + } + } + for (i = 0; ret && i < setOf.cValue; i++) + { + ret = desc->encode(dwCertEncodingType, lpszStructType, + (const BYTE *)desc->items + i * desc->itemSize + desc->itemOffset, + 0, NULL, NULL, &setOf.rgValue[i].cbData); + if (ret) + { + setOf.rgValue[i].pbData = CryptMemAlloc(setOf.rgValue[i].cbData); + if (!setOf.rgValue[i].pbData) + ret = FALSE; + else + ret = desc->encode(dwCertEncodingType, lpszStructType, + (const BYTE *)desc->items + i * desc->itemSize + + desc->itemOffset, 0, NULL, setOf.rgValue[i].pbData, + &setOf.rgValue[i].cbData); + } + /* Some functions propagate their errors through the size */ + if (!ret) + *pcbEncoded = setOf.rgValue[i].cbData; + } + if (ret) + { + DWORD bytesNeeded = 0, lenBytes; + BOOL ret; + + for (i = 0; i < setOf.cValue; i++) + bytesNeeded += setOf.rgValue[i].cbData; + CRYPT_EncodeLen(bytesNeeded, NULL, &lenBytes); + bytesNeeded += 1 + lenBytes; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + qsort(setOf.rgValue, setOf.cValue, sizeof(CRYPT_DER_BLOB), + BLOBComp); + *pbEncoded++ = ASN_CONSTRUCTOR | ASN_SETOF; + CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < setOf.cValue; i++) + { + memcpy(pbEncoded, setOf.rgValue[i].pbData, + setOf.rgValue[i].cbData); + pbEncoded += setOf.rgValue[i].cbData; + } + } + } + for (i = 0; i < setOf.cValue; i++) + CryptMemFree(setOf.rgValue[i].pbData); + CryptMemFree(setOf.rgValue); + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, CERT_RDN *rdn, CryptEncodeObjectExFunc nameValueEncodeFunc, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -1394,55 +1479,22 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSAttributes(DWORD dwCertEncodingType, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { BOOL ret = FALSE; - CRYPT_SET_OF setOf = { 0, NULL }; __TRY { - DWORD i; const CRYPT_ATTRIBUTES *attributes = (const CRYPT_ATTRIBUTES *)pvStructInfo; + struct DERSetDescriptor desc = { attributes->cAttr, attributes->rgAttr, + sizeof(CRYPT_ATTRIBUTE), 0, CRYPT_AsnEncodePKCSAttribute }; - ret = TRUE; - if (attributes->cAttr) - { - setOf.cValue = attributes->cAttr; - setOf.rgValue = CryptMemAlloc(attributes->cAttr * - sizeof(CRYPT_DER_BLOB)); - if (!setOf.rgValue) - ret = FALSE; - else - memset(setOf.rgValue, 0, setOf.cValue * sizeof(CRYPT_DER_BLOB)); - } - for (i = 0; ret && i < attributes->cAttr; i++) - { - ret = CRYPT_AsnEncodePKCSAttribute(dwCertEncodingType, NULL, - &attributes->rgAttr[i], 0, NULL, NULL, &setOf.rgValue[i].cbData); - if (ret) - { - setOf.rgValue[i].pbData = - CryptMemAlloc(setOf.rgValue[i].cbData); - if (!setOf.rgValue[i].pbData) - ret = FALSE; - else - { - ret = CRYPT_AsnEncodePKCSAttribute(dwCertEncodingType, NULL, - &attributes->rgAttr[i], 0, NULL, setOf.rgValue[i].pbData, - &setOf.rgValue[i].cbData); - } - } - } - if (ret) - ret = CRYPT_DEREncodeSet(X509_ASN_ENCODING, NULL, &setOf, dwFlags, - pEncodePara, pbEncoded, pcbEncoded); - for (i = 0; i < setOf.cValue; i++) - CryptMemFree(setOf.rgValue[i].pbData); + ret = CRYPT_DEREncodeItemsAsSet(X509_ASN_ENCODING, lpszStructType, + &desc, dwFlags, pEncodePara, pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT { SetLastError(STATUS_ACCESS_VIOLATION); } __ENDTRY - CryptMemFree(setOf.rgValue); return ret; }

1 0

Juan Lang : crypt32: More parameter checking for opening signed encoded messages.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 0b0df876b2f306d298ca6bc93877cbb3dcd69072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0df876b2f306d298ca6bc93… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 17:35:17 2007 -0700 crypt32: More parameter checking for opening signed encoded messages. --- dlls/crypt32/msg.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index c134e68..ce2ac3d 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -567,6 +567,17 @@ typedef struct _CMSG_SIGNED_ENCODE_INFO_WITH_CMS static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer) { + if (signer->cbSize != sizeof(CMSG_SIGNER_ENCODE_INFO) && + signer->cbSize != sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (signer->cbSize == sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS)) + { + FIXME("CMSG_SIGNER_ENCODE_INFO with CMS fields unsupported\n"); + return FALSE; + } if (!signer->pCertInfo->SerialNumber.cbData) { SetLastError(E_INVALIDARG);

1 0

Juan Lang : crypt32: Add tests for opening non-detached signed messages, and clarify detached open.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 19e63d900484fe49fddbaf02cb872b7a60709a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e63d900484fe49fddbaf02c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 17:34:14 2007 -0700 crypt32: Add tests for opening non-detached signed messages, and clarify detached open. --- dlls/crypt32/tests/msg.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 94864c1..44c3098 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1110,10 +1110,10 @@ static void test_signed_msg_update(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); - /* CMSG_SIGNED allows non-final updates. */ + /* Detached CMSG_SIGNED allows non-final updates. */ ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); - /* CMSG_SIGNED also allows non-final updates with no data. */ + /* Detached CMSG_SIGNED also allows non-final updates with no data. */ ret = CryptMsgUpdate(msg, NULL, 0, FALSE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* The final update requires a private key in the hCryptProv, in order to @@ -1139,10 +1139,10 @@ static void test_signed_msg_update(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); - /* CMSG_SIGNED allows non-final updates. */ + /* Detached CMSG_SIGNED allows non-final updates. */ ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); - /* CMSG_SIGNED also allows non-final updates with no data. */ + /* Detached CMSG_SIGNED also allows non-final updates with no data. */ ret = CryptMsgUpdate(msg, NULL, 0, FALSE); ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* Now that the private key exists, the final update can succeed (even @@ -1161,6 +1161,26 @@ static void test_signed_msg_update(void) "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); CryptMsgClose(msg); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, + NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + /* Non-detached messages don't allow non-final updates.. */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); + /* but they do allow final ones. */ + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, + NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + /* They also allow final updates with no data. */ + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); + CryptDestroyKey(key); CryptReleaseContext(signer.hCryptProv, 0); CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL,

1 0

Juan Lang : crypt32: Add tests for updating signed encoded messages.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: cc4005829da1ab4837985fad419de6e3741f4791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4005829da1ab4837985fad4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 17:26:14 2007 -0700 crypt32: Add tests for updating signed encoded messages. --- dlls/crypt32/tests/msg.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index d2d9488..250ac9f 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1061,9 +1061,125 @@ static void test_signed_msg_open(void) PROV_RSA_FULL, CRYPT_DELETEKEYSET); } +static const BYTE privKey[] = { + 0x07, 0x02, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x52, 0x53, 0x41, 0x32, 0x00, + 0x02, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x79, 0x10, 0x1c, 0xd0, 0x6b, 0x10, + 0x18, 0x30, 0x94, 0x61, 0xdc, 0x0e, 0xcb, 0x96, 0x4e, 0x21, 0x3f, 0x79, 0xcd, + 0xa9, 0x17, 0x62, 0xbc, 0xbb, 0x61, 0x4c, 0xe0, 0x75, 0x38, 0x6c, 0xf3, 0xde, + 0x60, 0x86, 0x03, 0x97, 0x65, 0xeb, 0x1e, 0x6b, 0xdb, 0x53, 0x85, 0xad, 0x68, + 0x21, 0xf1, 0x5d, 0xe7, 0x1f, 0xe6, 0x53, 0xb4, 0xbb, 0x59, 0x3e, 0x14, 0x27, + 0xb1, 0x83, 0xa7, 0x3a, 0x54, 0xe2, 0x8f, 0x65, 0x8e, 0x6a, 0x4a, 0xcf, 0x3b, + 0x1f, 0x65, 0xff, 0xfe, 0xf1, 0x31, 0x3a, 0x37, 0x7a, 0x8b, 0xcb, 0xc6, 0xd4, + 0x98, 0x50, 0x36, 0x67, 0xe4, 0xa1, 0xe8, 0x7e, 0x8a, 0xc5, 0x23, 0xf2, 0x77, + 0xf5, 0x37, 0x61, 0x49, 0x72, 0x59, 0xe8, 0x3d, 0xf7, 0x60, 0xb2, 0x77, 0xca, + 0x78, 0x54, 0x6d, 0x65, 0x9e, 0x03, 0x97, 0x1b, 0x61, 0xbd, 0x0c, 0xd8, 0x06, + 0x63, 0xe2, 0xc5, 0x48, 0xef, 0xb3, 0xe2, 0x6e, 0x98, 0x7d, 0xbd, 0x4e, 0x72, + 0x91, 0xdb, 0x31, 0x57, 0xe3, 0x65, 0x3a, 0x49, 0xca, 0xec, 0xd2, 0x02, 0x4e, + 0x22, 0x7e, 0x72, 0x8e, 0xf9, 0x79, 0x84, 0x82, 0xdf, 0x7b, 0x92, 0x2d, 0xaf, + 0xc9, 0xe4, 0x33, 0xef, 0x89, 0x5c, 0x66, 0x99, 0xd8, 0x80, 0x81, 0x47, 0x2b, + 0xb1, 0x66, 0x02, 0x84, 0x59, 0x7b, 0xc3, 0xbe, 0x98, 0x45, 0x4a, 0x3d, 0xdd, + 0xea, 0x2b, 0xdf, 0x4e, 0xb4, 0x24, 0x6b, 0xec, 0xe7, 0xd9, 0x0c, 0x45, 0xb8, + 0xbe, 0xca, 0x69, 0x37, 0x92, 0x4c, 0x38, 0x6b, 0x96, 0x6d, 0xcd, 0x86, 0x67, + 0x5c, 0xea, 0x54, 0x94, 0xa4, 0xca, 0xa4, 0x02, 0xa5, 0x21, 0x4d, 0xae, 0x40, + 0x8f, 0x9d, 0x51, 0x83, 0xf2, 0x3f, 0x33, 0xc1, 0x72, 0xb4, 0x1d, 0x94, 0x6e, + 0x7d, 0xe4, 0x27, 0x3f, 0xea, 0xff, 0xe5, 0x9b, 0xa7, 0x5e, 0x55, 0x8e, 0x0d, + 0x69, 0x1c, 0x7a, 0xff, 0x81, 0x9d, 0x53, 0x52, 0x97, 0x9a, 0x76, 0x79, 0xda, + 0x93, 0x32, 0x16, 0xec, 0x69, 0x51, 0x1a, 0x4e, 0xc3, 0xf1, 0x72, 0x80, 0x78, + 0x5e, 0x66, 0x4a, 0x8d, 0x85, 0x2f, 0x3f, 0xb2, 0xa7 }; + +static void test_signed_msg_update(void) +{ + HCRYPTMSG msg; + BOOL ret; + CMSG_SIGNED_ENCODE_INFO signInfo = { sizeof(signInfo), 0 }; + CMSG_SIGNER_ENCODE_INFO signer = { sizeof(signer), 0 }; + CERT_INFO certInfo = { 0 }; + HCRYPTKEY key; + char oid_rsa_md5[] = szOID_RSA_MD5; + + certInfo.SerialNumber.cbData = sizeof(serialNum); + certInfo.SerialNumber.pbData = serialNum; + certInfo.Issuer.cbData = sizeof(encodedCommonName); + certInfo.Issuer.pbData = encodedCommonName; + signer.pCertInfo = &certInfo; + signer.HashAlgorithm.pszObjId = oid_rsa_md5; + signInfo.cSigners = 1; + signInfo.rgSigners = &signer; + ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + PROV_RSA_FULL, CRYPT_NEWKEYSET); + if (!ret && GetLastError() == NTE_EXISTS) + ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, + PROV_RSA_FULL, 0); + ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, + CMSG_DETACHED_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + /* CMSG_SIGNED allows non-final updates. */ + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + /* CMSG_SIGNED also allows non-final updates with no data. */ + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + /* The final update requires a private key in the hCryptProv, in order to + * generate the signature. + */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + todo_wine + ok(!ret && GetLastError() == NTE_BAD_KEYSET, + "Expected NTE_BAD_KEYSET, got %x\n", GetLastError()); + ret = CryptImportKey(signer.hCryptProv, (LPBYTE)privKey, sizeof(privKey), + 0, 0, &key); + ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); + /* The final update should be able to succeed now that a key exists, but + * the previous (invalid) final update prevents it. + */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); + CryptMsgClose(msg); + + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, + CMSG_DETACHED_FLAG, CMSG_SIGNED, &signInfo, NULL, NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + /* CMSG_SIGNED allows non-final updates. */ + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + /* CMSG_SIGNED also allows non-final updates with no data. */ + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + /* Now that the private key exists, the final update can succeed (even + * with no data.) + */ + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + /* But no updates are allowed after the final update. */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); + CryptMsgClose(msg); + + CryptDestroyKey(key); + CryptReleaseContext(signer.hCryptProv, 0); + CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); +} + static void test_signed_msg(void) { test_signed_msg_open(); + test_signed_msg_update(); } static CRYPT_DATA_BLOB b4 = { 0, NULL };

1 0

Juan Lang : crypt32: Hash and sign data when updating signed messages.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 4e2b3ab9e18ad79f47fb568ef2212cbaff9c664c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2b3ab9e18ad79f47fb568ef… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 23 17:56:12 2007 -0700 crypt32: Hash and sign data when updating signed messages. --- dlls/crypt32/msg.c | 239 +++++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/msg.c | 6 +- 2 files changed, 239 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e2b3ab9e18ad79f47fb5…

1 0

Juan Lang : crypt32: Add stub encoded signed message.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: 223bad2312bc22dff601bbe9240ea33afbb36d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223bad2312bc22dff601bbe92… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jul 20 17:31:11 2007 -0700 crypt32: Add stub encoded signed message. --- dlls/crypt32/msg.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 19 +++----- 2 files changed, 123 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 67a4024..08b3ce8 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -535,6 +535,119 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, return (HCRYPTMSG)msg; } +typedef struct _CMSG_SIGNER_ENCODE_INFO_WITH_CMS +{ + DWORD cbSize; + PCERT_INFO pCertInfo; + HCRYPTPROV hCryptProv; + DWORD dwKeySpec; + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + void *pvHashAuxInfo; + DWORD cAuthAttr; + PCRYPT_ATTRIBUTE rgAuthAttr; + DWORD cUnauthAttr; + PCRYPT_ATTRIBUTE rgUnauthAttr; + CERT_ID SignerId; + CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm; + void *pvHashEncryptionAuxInfo; +} CMSG_SIGNER_ENCODE_INFO_WITH_CMS, *PCMSG_SIGNER_ENCODE_INFO_WITH_CMS; + +typedef struct _CMSG_SIGNED_ENCODE_INFO_WITH_CMS +{ + DWORD cbSize; + DWORD cSigners; + PCMSG_SIGNER_ENCODE_INFO_WITH_CMS rgSigners; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; + DWORD cCrlEncoded; + PCRL_BLOB rgCrlEncoded; + DWORD cAttrCertEncoded; + PCERT_BLOB rgAttrCertEncoded; +} CMSG_SIGNED_ENCODE_INFO_WITH_CMS, *PCMSG_SIGNED_ENCODE_INFO_WITH_CMS; + +static BOOL CRYPT_IsValidSigner(CMSG_SIGNER_ENCODE_INFO_WITH_CMS *signer) +{ + if (!signer->pCertInfo->SerialNumber.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!signer->pCertInfo->Issuer.cbData) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!signer->hCryptProv) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if (!CertOIDToAlgId(signer->HashAlgorithm.pszObjId)) + { + SetLastError(CRYPT_E_UNKNOWN_ALGO); + return FALSE; + } + return TRUE; +} + +typedef struct _CSignedEncodeMsg +{ + CryptMsgBase base; +} CSignedEncodeMsg; + +static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg) +{ + FIXME("(%p)\n", hCryptMsg); +} + +static BOOL CSignedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData) +{ + FIXME("(%p, %d, %d, %p, %p)\n", hCryptMsg, dwParamType, dwIndex, pvData, + pcbData); + return FALSE; +} + +static BOOL CSignedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, + DWORD cbData, BOOL fFinal) +{ + FIXME("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); + return FALSE; +} + +static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, + const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, + PCMSG_STREAM_INFO pStreamInfo) +{ + const CMSG_SIGNED_ENCODE_INFO_WITH_CMS *info = + (const CMSG_SIGNED_ENCODE_INFO_WITH_CMS *)pvMsgEncodeInfo; + DWORD i; + CSignedEncodeMsg *msg; + + if (info->cbSize != sizeof(CMSG_SIGNED_ENCODE_INFO) && + info->cbSize != sizeof(CMSG_SIGNED_ENCODE_INFO_WITH_CMS)) + { + SetLastError(E_INVALIDARG); + return NULL; + } + if (info->cbSize == sizeof(CMSG_SIGNED_ENCODE_INFO_WITH_CMS)) + { + FIXME("CMSG_SIGNED_ENCODE_INFO with CMS fields unsupported\n"); + return NULL; + } + for (i = 0; i < info->cSigners; i++) + if (!CRYPT_IsValidSigner(&info->rgSigners[i])) + return NULL; + msg = CryptMemAlloc(sizeof(CSignedEncodeMsg)); + if (msg) + { + CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, + CSignedEncodeMsg_Close, CSignedEncodeMsg_GetParam, + CSignedEncodeMsg_Update); + } + return msg; +} + static inline const char *MSG_TYPE_STR(DWORD type) { switch (type) @@ -577,6 +690,9 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, pszInnerContentObjID, pStreamInfo); break; case CMSG_SIGNED: + msg = CSignedEncodeMsg_Open(dwFlags, pvMsgEncodeInfo, + pszInnerContentObjID, pStreamInfo); + break; case CMSG_ENVELOPED: FIXME("unimplemented for type %s\n", MSG_TYPE_STR(dwMsgType)); break; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 893f49d..d2d9488 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -989,13 +989,11 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); signInfo.cbSize = sizeof(signInfo); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); CryptMsgClose(msg); @@ -1009,7 +1007,6 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); certInfo.SerialNumber.cbData = sizeof(serialNum); @@ -1017,7 +1014,6 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); certInfo.Issuer.cbData = sizeof(encodedCommonName); @@ -1025,7 +1021,6 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); @@ -1037,17 +1032,18 @@ static void test_signed_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(!msg && GetLastError() == CRYPT_E_UNKNOWN_ALGO, "Expected CRYPT_E_UNKNOWN_ALGO, got %x\n", GetLastError()); /* The signer's hash algorithm must also be set. */ signer.HashAlgorithm.pszObjId = oid_rsa_md5; SetLastError(0xdeadbeef); - msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, - NULL, NULL); - todo_wine - ok(!msg && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + /* Crashes in advapi32 in wine, don't do it */ + if (0) { + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, + &signInfo, NULL, NULL); + ok(!msg && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %x\n", GetLastError()); + } /* The signer's hCryptProv must also be valid. */ ret = CryptAcquireContextW(&signer.hCryptProv, cspNameW, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET); @@ -1057,7 +1053,6 @@ static void test_signed_msg_open(void) ok(ret, "CryptAcquireContextW failed: %x\n", GetLastError()); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_SIGNED, &signInfo, NULL, NULL); - todo_wine ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); CryptMsgClose(msg);

1 0

Jason Edmeades : user32: MDI tile and cascade should not resize non-resizable windows.
by Alexandre Julliard July 24, 2007

July 24, 2007

Module: wine Branch: master Commit: ca710edc345b3b03d2a534fe40f651b576741b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca710edc345b3b03d2a534fe4… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Mon Jul 23 22:59:46 2007 +0100 user32: MDI tile and cascade should not resize non-resizable windows. --- dlls/user32/mdi.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index a269292..1fc2fbd 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -726,13 +726,17 @@ static LONG MDICascade( HWND client, MDICLIENTINFO *ci ) /* walk the list (backwards) and move windows */ for (i = total - 1; i >= 0; i--) { + LONG style; + LONG posOptions = SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER; MDI_CalcDefaultChildPos(client, n++, pos, delta, NULL); TRACE("move %p to (%d,%d) size [%d,%d]\n", win_array[i], pos[0].x, pos[0].y, pos[1].x, pos[1].y); + style = GetWindowLongW(win_array[i], GWL_STYLE); + if (!(style & WS_SIZEBOX)) posOptions |= SWP_NOSIZE; SetWindowPos( win_array[i], 0, pos[0].x, pos[0].y, pos[1].x, pos[1].y, - SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); + posOptions); } } HeapFree( GetProcessHeap(), 0, win_array ); @@ -812,8 +816,11 @@ static void MDITile( HWND client, MDICLIENTINFO *ci, WPARAM wParam ) y = 0; for (r = 1; r <= rows && *pWnd; r++, i++) { - SetWindowPos(*pWnd, 0, x, y, xsize, ysize, - SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER); + LONG posOptions = SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER; + LONG style = GetWindowLongW(win_array[i], GWL_STYLE); + if (!(style & WS_SIZEBOX)) posOptions |= SWP_NOSIZE; + + SetWindowPos(*pWnd, 0, x, y, xsize, ysize, posOptions); y += ysize; pWnd++; }

1 0