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

Juan Lang : crypt32: Add a helper function to copy params.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: a468e6f6c3be2d7de4c55e79ff7fe9f7fc16f870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a468e6f6c3be2d7de4c55e79f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:54:56 2007 -0700 crypt32: Add a helper function to copy params. --- dlls/crypt32/msg.c | 73 ++++++++++++++++++++------------------------------- 1 files changed, 29 insertions(+), 44 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f247b23..e69c624 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -242,6 +242,27 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, return ret; } +static BOOL CRYPT_CopyParam(void *pvData, DWORD *pcbData, const BYTE *src, + DWORD len) +{ + BOOL ret = TRUE; + + if (!pvData) + *pcbData = len; + else if (*pcbData < len) + { + *pcbData = len; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbData = len; + memcpy(pvData, src, len); + } + return ret; +} + static BOOL CDataEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { @@ -268,22 +289,9 @@ static BOOL CDataEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, case CMSG_BARE_CONTENT_PARAM: if (msg->base.streamed) SetLastError(E_INVALIDARG); - else if (!pvData) - { - *pcbData = msg->bare_content_len; - ret = TRUE; - } - else if (*pcbData < msg->bare_content_len) - { - *pcbData = msg->bare_content_len; - SetLastError(ERROR_MORE_DATA); - } else - { - *pcbData = msg->bare_content_len; - memcpy(pvData, msg->bare_content, msg->bare_content_len); - ret = TRUE; - } + ret = CRYPT_CopyParam(pvData, pcbData, msg->bare_content, + msg->bare_content_len); break; default: SetLastError(CRYPT_E_INVALID_MSG_TYPE); @@ -349,22 +357,13 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, case CMSG_VERSION_PARAM: if (!msg->base.finalized) SetLastError(CRYPT_E_MSG_ERROR); - else if (!pvData) - { - *pcbData = sizeof(DWORD); - ret = TRUE; - } - else if (*pcbData < sizeof(DWORD)) - { - SetLastError(ERROR_MORE_DATA); - *pcbData = sizeof(DWORD); - } else { /* FIXME: under what circumstances is this CMSG_HASHED_DATA_V2? */ - *(DWORD *)pvData = CMSG_HASHED_DATA_PKCS_1_5_VERSION; - *pcbData = sizeof(DWORD); - ret = TRUE; + DWORD version = CMSG_HASHED_DATA_PKCS_1_5_VERSION; + + ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&version, + sizeof(version)); } break; default: @@ -552,22 +551,8 @@ static BOOL CDecodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, switch (dwParamType) { case CMSG_TYPE_PARAM: - if (!pvData) - { - *pcbData = sizeof(DWORD); - ret = TRUE; - } - else if (*pcbData < sizeof(DWORD)) - { - *pcbData = sizeof(DWORD); - SetLastError(ERROR_MORE_DATA); - } - else - { - *pcbData = sizeof(DWORD); - *(DWORD *)pvData = msg->type; - ret = TRUE; - } + ret = CRYPT_CopyParam(pvData, pcbData, (const BYTE *)&msg->type, + sizeof(msg->type)); break; default: FIXME("unimplemented for parameter %d\n", dwParamType);

1 0

Juan Lang : crypt32: Don't check if msg is NULL, tests show native doesn' t either.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: f83da5cc0757a67b1e5fe3726014330774efdd69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83da5cc0757a67b1e5fe3726… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:55:44 2007 -0700 crypt32: Don't check if msg is NULL, tests show native doesn't either. --- dlls/crypt32/msg.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index e69c624..0bc3d0b 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -621,23 +621,17 @@ BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal) { CryptMsgBase *msg = (CryptMsgBase *)hCryptMsg; - BOOL ret = FALSE; TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); - if (msg && msg->update) - ret = msg->update(hCryptMsg, pbData, cbData, fFinal); - return ret; + return msg->update(hCryptMsg, pbData, cbData, fFinal); } BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { CryptMsgBase *msg = (CryptMsgBase *)hCryptMsg; - BOOL ret = FALSE; TRACE("(%p, %d, %d, %p, %p)\n", hCryptMsg, dwParamType, dwIndex, pvData, pcbData); - if (msg && msg->get_param) - ret = msg->get_param(hCryptMsg, dwParamType, dwIndex, pvData, pcbData); - return ret; + return msg->get_param(hCryptMsg, dwParamType, dwIndex, pvData, pcbData); }

1 0

Juan Lang : crypt32: Detached hash messages don't contain the content, so don't make a copy of it.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 3ffb4b1c4871011631a1d580fd77aa0e5fc7cbb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ffb4b1c4871011631a1d580f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:56:30 2007 -0700 crypt32: Detached hash messages don't contain the content, so don't make a copy of it. --- dlls/crypt32/msg.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 0bc3d0b..36194a3 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -387,27 +387,23 @@ static BOOL CHashEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, { if (fFinal) msg->base.finalized = TRUE; - if (msg->base.streamed) + if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) { - /* Doesn't do anything, as stream output is never called, and you + /* Doesn't do much, as stream output is never called, and you * can't get the content. */ ret = CryptHashData(msg->hash, pbData, cbData, 0); } else { - if (!(msg->base.open_flags & CMSG_DETACHED_FLAG) && !fFinal) + if (!fFinal) SetLastError(CRYPT_E_MSG_ERROR); else { ret = CryptHashData(msg->hash, pbData, cbData, 0); if (ret) { - if (msg->data.pbData) - msg->data.pbData = CryptMemRealloc(msg->data.pbData, - msg->data.cbData + cbData); - else - msg->data.pbData = CryptMemAlloc(cbData); + msg->data.pbData = CryptMemAlloc(cbData); if (msg->data.pbData) { memcpy(msg->data.pbData + msg->data.cbData, pbData,

1 0

Juan Lang : crypt32: Add more missing defines.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: e3d6f771e85792833e96c57d8a05ad53405e3980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d6f771e85792833e96c57d8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:49:47 2007 -0700 crypt32: Add more missing defines. --- include/wincrypt.h | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 4dfbf27..d3fe0f9 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3202,6 +3202,26 @@ typedef struct _CMSG_CTRL_DEL_SIGNER_UNAUTH_ATTR_PARA #define CMSG_SIGNER_CERT_ID_PARAM 38 #define CMSG_CMS_SIGNER_INFO_PARAM 39 +#define CMSG_SIGNED_DATA_V1 1 +#define CMSG_SIGNED_DATA_V3 3 +#define CMSG_SIGNED_DATA_PKCS_1_5_VERSION CMSG_SIGNED_DATA_V1 +#define CMSG_SIGNED_DATA_CMS_VERSION CMSG_SIGNED_DATA_V3 + +#define CMSG_SIGNER_INFO_V1 1 +#define CMSG_SIGNER_INFO_V3 3 +#define CMSG_SIGNER_INFO_PKCS_1_5_VERSION CMSG_SIGNER_INFO_V1 +#define CMSG_SIGNER_INFO_CMS_VERSION CMSG_SIGNER_INFO_V3 + +#define CMSG_HASHED_DATA_V0 0 +#define CMSG_HASHED_DATA_V2 2 +#define CMSG_HASHED_DATA_PKCS_1_5_VERSION CMSG_HASHED_DATA_V0 +#define CMSG_HASHED_DATA_CMS_VERSION CMSG_HASHED_DATA_V2 + +#define CMSG_ENVELOPED_DATA_V0 0 +#define CMSG_ENVELOPED_DATA_V2 2 +#define CMSG_ENVELOPED_DATA_PKCS_1_5_VERSION CMSG_ENVELOPED_DATA_V0 +#define CMSG_ENVELOPED_DATA_CMS_VERSION CMSG_ENVELOPED_DATA_V2 + /* function declarations */ /* advapi32.dll */ BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer,

1 0

Juan Lang : crypt32: Copy data in hash message update.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: fef57dad46893908e4bf956bb5ad4f13340c72f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef57dad46893908e4bf956bb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:52:41 2007 -0700 crypt32: Copy data in hash message update. --- dlls/crypt32/msg.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 4668d2f..f247b23 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -315,15 +315,17 @@ static HCRYPTMSG CDataEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, typedef struct _CHashEncodeMsg { - CryptMsgBase base; - HCRYPTPROV prov; - HCRYPTHASH hash; + CryptMsgBase base; + HCRYPTPROV prov; + HCRYPTHASH hash; + CRYPT_DATA_BLOB data; } CHashEncodeMsg; static void CHashEncodeMsg_Close(HCRYPTMSG hCryptMsg) { CHashEncodeMsg *msg = (CHashEncodeMsg *)hCryptMsg; + CryptMemFree(msg->data.pbData); CryptDestroyHash(msg->hash); if (msg->base.open_flags & CMSG_CRYPT_RELEASE_CONTEXT_FLAG) CryptReleaseContext(msg->prov, 0); @@ -400,9 +402,22 @@ static BOOL CHashEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, else { ret = CryptHashData(msg->hash, pbData, cbData, 0); - /* Still a stub, as content isn't modified */ - FIXME("(%p, %p, %d, %d): stub\n", hCryptMsg, pbData, cbData, - fFinal); + if (ret) + { + if (msg->data.pbData) + msg->data.pbData = CryptMemRealloc(msg->data.pbData, + msg->data.cbData + cbData); + else + msg->data.pbData = CryptMemAlloc(cbData); + if (msg->data.pbData) + { + memcpy(msg->data.pbData + msg->data.cbData, pbData, + cbData); + msg->data.cbData += cbData; + } + else + ret = FALSE; + } } } } @@ -441,6 +456,8 @@ static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags, pStreamInfo, CHashEncodeMsg_Close, CHashEncodeMsg_GetParam, CHashEncodeMsg_Update); msg->prov = prov; + msg->data.cbData = 0; + msg->data.pbData = NULL; if (!CryptCreateHash(prov, algID, 0, 0, &msg->hash)) { CryptMsgClose(msg);

1 0

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

July 13, 2007

Module: wine Branch: master Commit: 72b8f8325f5df78f350137b7189281ef870edbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72b8f8325f5df78f350137b71… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:51:40 2007 -0700 crypt32: Add tests for hash message encoding. --- dlls/crypt32/tests/msg.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 1205a02..03028e4 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -834,11 +834,139 @@ static void test_hash_msg_get_param(void) CryptMsgClose(msg); } +static const BYTE hashEmptyBareContent[] = { +0x30,0x17,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x02,0x06,0x00,0x04,0x00 }; +static const BYTE hashEmptyContent[] = { +0x30,0x26,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x05,0xa0,0x19, +0x30,0x17,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x02,0x06,0x00,0x04,0x00 }; +static const BYTE hashBareContent[] = { +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,0x08,0xd6,0xc0, +0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26,0x2f }; +static const BYTE hashContent[] = { +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,0x08,0xd6,0xc0, +0x5a,0x21,0x51,0x2a,0x79,0xa1,0xdf,0xeb,0x9d,0x2a,0x8f,0x26,0x2f }; + +static const BYTE detachedHashBareContent[] = { +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 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 void test_hash_msg_encoding(void) +{ + HCRYPTMSG msg; + CMSG_HASHED_ENCODE_INFO hashInfo = { sizeof(hashInfo), 0 }; + BOOL ret; + struct update_accum accum = { 0, NULL }, empty_accum = { 0, NULL }; + CMSG_STREAM_INFO streamInfo = { 0, accumulating_stream_output, &accum }; + static char oid_rsa_md5[] = szOID_RSA_MD5; + + hashInfo.HashAlgorithm.pszObjId = oid_rsa_md5; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo, + NULL, NULL); + todo_wine { + check_param("hash empty bare content", msg, CMSG_BARE_CONTENT_PARAM, + hashEmptyBareContent, sizeof(hashEmptyBareContent)); + check_param("hash empty content", msg, CMSG_CONTENT_PARAM, + hashEmptyContent, sizeof(hashEmptyContent)); + } + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + todo_wine { + check_param("hash bare content", msg, CMSG_BARE_CONTENT_PARAM, + hashBareContent, sizeof(hashBareContent)); + check_param("hash content", msg, CMSG_CONTENT_PARAM, + hashContent, sizeof(hashContent)); + } + CryptMsgClose(msg); + /* Same test, but with CMSG_BARE_CONTENT_FLAG set */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_BARE_CONTENT_FLAG, + CMSG_HASHED, &hashInfo, NULL, NULL); + todo_wine { + check_param("hash empty bare content", msg, CMSG_BARE_CONTENT_PARAM, + hashEmptyBareContent, sizeof(hashEmptyBareContent)); + check_param("hash empty content", msg, CMSG_CONTENT_PARAM, + hashEmptyContent, sizeof(hashEmptyContent)); + } + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + todo_wine { + check_param("hash bare content", msg, CMSG_BARE_CONTENT_PARAM, + hashBareContent, sizeof(hashBareContent)); + check_param("hash content", msg, CMSG_CONTENT_PARAM, + hashContent, sizeof(hashContent)); + } + CryptMsgClose(msg); + /* Same test, but with CMSG_DETACHED_FLAG set */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, + CMSG_HASHED, &hashInfo, NULL, NULL); + todo_wine { + check_param("detached hash empty bare content", msg, + CMSG_BARE_CONTENT_PARAM, hashEmptyBareContent, + sizeof(hashEmptyBareContent)); + check_param("detached hash empty content", msg, CMSG_CONTENT_PARAM, + hashEmptyContent, sizeof(hashEmptyContent)); + } + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + todo_wine { + check_param("detached hash bare content", msg, CMSG_BARE_CONTENT_PARAM, + detachedHashBareContent, sizeof(detachedHashBareContent)); + check_param("detached hash content", msg, CMSG_CONTENT_PARAM, + detachedHashContent, sizeof(detachedHashContent)); + } + CryptMsgClose(msg); + /* In what appears to be a bug, streamed updates to hash messages don't + * call the output function. + */ + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo, + NULL, &streamInfo); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + CryptMsgClose(msg); + check_updates("empty hash message", &empty_accum, &accum); + free_updates(&accum); + + streamInfo.cbContent = sizeof(msgData); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo, + NULL, &streamInfo); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + CryptMsgClose(msg); + check_updates("hash message", &empty_accum, &accum); + free_updates(&accum); + + streamInfo.cbContent = sizeof(msgData); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, + CMSG_HASHED, &hashInfo, NULL, &streamInfo); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + CryptMsgClose(msg); + check_updates("detached hash message", &empty_accum, &accum); + free_updates(&accum); +} + static void test_hash_msg(void) { test_hash_msg_open(); test_hash_msg_update(); test_hash_msg_get_param(); + test_hash_msg_encoding(); } static CRYPT_DATA_BLOB b4 = { 0, NULL };

1 0

Juan Lang : crypt32: Implement getting hash message version.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 804b9d71656d1b478dc1b2ffad62a65e04b1e618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=804b9d71656d1b478dc1b2ffa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:51:03 2007 -0700 crypt32: Implement getting hash message version. --- dlls/crypt32/msg.c | 21 +++++++++++++++++++++ dlls/crypt32/tests/msg.c | 3 --- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index dac881c..4668d2f 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -344,6 +344,27 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, ret = CryptGetHashParam(msg->hash, HP_HASHVAL, (BYTE *)pvData, pcbData, 0); break; + case CMSG_VERSION_PARAM: + if (!msg->base.finalized) + SetLastError(CRYPT_E_MSG_ERROR); + else if (!pvData) + { + *pcbData = sizeof(DWORD); + ret = TRUE; + } + else if (*pcbData < sizeof(DWORD)) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = sizeof(DWORD); + } + else + { + /* FIXME: under what circumstances is this CMSG_HASHED_DATA_V2? */ + *(DWORD *)pvData = CMSG_HASHED_DATA_PKCS_1_5_VERSION; + *pcbData = sizeof(DWORD); + ret = TRUE; + } + break; default: FIXME("%d: stub\n", dwParamType); ret = FALSE; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index c41a4bf..1205a02 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -790,14 +790,11 @@ static void test_hash_msg_get_param(void) /* The version is also available, and should be zero for this message. */ size = 0; ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, NULL, &size); - todo_wine ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); size = sizeof(value); ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, (LPBYTE)&value, &size); - todo_wine { ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(value == 0, "Expected version 0, got %d\n", value); - } /* As usual, the type isn't available. */ ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); todo_wine

1 0

Juan Lang : crypt32: Partially implement updating hash messages.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 739cc08b3bb95b7f5a320c946f2ecb002e734f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739cc08b3bb95b7f5a320c946… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:49:23 2007 -0700 crypt32: Partially implement updating hash messages. --- dlls/crypt32/msg.c | 34 ++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/msg.c | 17 +++++++---------- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 2a401b8..dac881c 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -354,8 +354,38 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, static BOOL CHashEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal) { - FIXME("(%p, %p, %d, %d): stub\n", hCryptMsg, pbData, cbData, fFinal); - return FALSE; + CHashEncodeMsg *msg = (CHashEncodeMsg *)hCryptMsg; + BOOL ret = FALSE; + + TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); + + if (msg->base.finalized) + SetLastError(CRYPT_E_MSG_ERROR); + else + { + if (fFinal) + msg->base.finalized = TRUE; + if (msg->base.streamed) + { + /* Doesn't do anything, as stream output is never called, and you + * can't get the content. + */ + ret = CryptHashData(msg->hash, pbData, cbData, 0); + } + else + { + if (!(msg->base.open_flags & CMSG_DETACHED_FLAG) && !fFinal) + SetLastError(CRYPT_E_MSG_ERROR); + else + { + ret = CryptHashData(msg->hash, pbData, cbData, 0); + /* Still a stub, as content isn't modified */ + FIXME("(%p, %p, %d, %d): stub\n", hCryptMsg, pbData, cbData, + fFinal); + } + } + } + return ret; } static HCRYPTMSG CHashEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 3e1ed81..c41a4bf 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -701,25 +701,20 @@ static void test_hash_msg_update(void) * updates.. */ ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* including non-final updates with no data.. */ ret = CryptMsgUpdate(msg, NULL, 0, FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* and final updates 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); - todo_wine ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); CryptMsgClose(msg); @@ -730,19 +725,16 @@ static void test_hash_msg_update(void) NULL, NULL); SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - todo_wine ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); /* Final updates (including empty ones) are allowed. */ ret = CryptMsgUpdate(msg, NULL, 0, TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); /* And, of course, streaming mode allows non-final updates */ msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo, NULL, &streamInfo); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); /* Setting pfnStreamOutput to NULL results in no error. (In what appears @@ -752,7 +744,6 @@ static void test_hash_msg_update(void) msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo, NULL, &streamInfo); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - todo_wine ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); CryptMsgClose(msg); } @@ -794,7 +785,6 @@ static void test_hash_msg_get_param(void) /* By getting the hash, further updates are not allowed */ SetLastError(0xdeadbeef); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - todo_wine ok(!ret && GetLastError() == NTE_BAD_HASH_STATE, "Expected NTE_BAD_HASH_STATE, got %x\n", GetLastError()); /* The version is also available, and should be zero for this message. */ @@ -837,6 +827,13 @@ static void test_hash_msg_get_param(void) ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); if (size == sizeof(buf)) ok(!memcmp(buf, emptyHashParam, size), "Unexpected value\n"); + /* After updating the hash, further updates aren't allowed on streamed + * messages either. + */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(!ret && GetLastError() == NTE_BAD_HASH_STATE, + "Expected NTE_BAD_HASH_STATE, got %x\n", GetLastError()); CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Test updating hash messages with NULL stream output function.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: 5cb26d8e58b0640abccec28b3ee649c9bed6cdeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb26d8e58b0640abccec28b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:48:13 2007 -0700 crypt32: Test updating hash messages with NULL stream output function. --- dlls/crypt32/tests/msg.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8874d8e..3e1ed81 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -745,6 +745,16 @@ static void test_hash_msg_update(void) todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); + /* Setting pfnStreamOutput to NULL results in no error. (In what appears + * to be a bug, it isn't actually used - see encoding tests.) + */ + streamInfo.pfnStreamOutput = NULL; + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_HASHED, &hashInfo, + NULL, &streamInfo); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + CryptMsgClose(msg); } static const BYTE emptyHashParam[] = {

1 0

Juan Lang : crypt32: Simplify hash value tests.
by Alexandre Julliard July 13, 2007

July 13, 2007

Module: wine Branch: master Commit: c2f8191a648621f41831fb7e30c6898c5e994153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f8191a648621f41831fb7e3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 12 14:47:30 2007 -0700 crypt32: Simplify hash value tests. --- dlls/crypt32/tests/msg.c | 40 +++++++--------------------------------- 1 files changed, 7 insertions(+), 33 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 96e901b..8874d8e 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -781,19 +781,13 @@ static void test_hash_msg_get_param(void) ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, buf, &size); if (size == sizeof(buf)) ok(!memcmp(buf, emptyHashParam, size), "Unexpected value\n"); - - CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); - size = 0; - ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - ok(size == sizeof(buf), "Unexpected size %d\n", size); - ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, buf, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - /* The hash doesn't seem to change even after an update, which matches - * how rsaenh behaves - an update can't happen after the has is retrieved. - */ - ok(!memcmp(buf, emptyHashParam, size), "Unexpected value\n"); - /* So is the version. */ + /* By getting the hash, further updates are not allowed */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine + ok(!ret && GetLastError() == NTE_BAD_HASH_STATE, + "Expected NTE_BAD_HASH_STATE, got %x\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); todo_wine @@ -833,26 +827,6 @@ static void test_hash_msg_get_param(void) ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); if (size == sizeof(buf)) ok(!memcmp(buf, emptyHashParam, size), "Unexpected value\n"); - /* An empty update has no effect on the hash */ - CryptMsgUpdate(msg, NULL, 0, FALSE); - size = 0; - ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - ok(size == sizeof(buf), "Unexpected size %d\n", size); - ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, buf, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - if (size == sizeof(buf)) - ok(!memcmp(buf, emptyHashParam, size), "Unexpected value\n"); - /* A non-empty update doesn't either - see above comments. */ - CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); - size = 0; - ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - ok(size == sizeof(buf), "Unexpected size %d\n", size); - ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, buf, &size); - ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); - if (size == sizeof(buf)) - ok(!memcmp(buf, emptyHashParam, size), "Unexpected value\n"); CryptMsgClose(msg); }

1 0