wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Juan Lang : crypt32: Add an update function, use it to implement CryptMsgUpdate.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 5db6b1cc962d0ab8c3bb6e9f05ef534437c91af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db6b1cc962d0ab8c3bb6e9f0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:51:47 2007 -0700 crypt32: Add an update function, use it to implement CryptMsgUpdate. --- dlls/crypt32/msg.c | 13 +++++++++++-- dlls/crypt32/tests/msg.c | 2 ++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 3c28230..5368515 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -32,11 +32,15 @@ typedef void (*CryptMsgCloseFunc)(HCRYPTMSG msg); typedef BOOL (*CryptMsgGetParamFunc)(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData); +typedef BOOL (*CryptMsgUpdateFunc)(HCRYPTMSG hCryptMsg, const BYTE *pbData, + DWORD cbData, BOOL fFinal); + typedef struct _CryptMsgBase { LONG ref; DWORD open_flags; CryptMsgCloseFunc close; + CryptMsgUpdateFunc update; CryptMsgGetParamFunc get_param; } CryptMsgBase; @@ -171,8 +175,13 @@ BOOL WINAPI CryptMsgClose(HCRYPTMSG hCryptMsg) BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal) { - FIXME("(%p, %p, %d, %d): stub\n", hCryptMsg, pbData, cbData, fFinal); - return TRUE; + 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; } BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 9d7c3c6..df5e83f 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -314,6 +314,7 @@ static void test_data_msg_update(void) "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); /* Updating it with final = TRUE succeeds */ ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); /* Any subsequent update will fail, as the last was final */ SetLastError(0xdeadbeef); @@ -354,6 +355,7 @@ static void test_data_msg_update(void) ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Add a get param function, use it to implement CryptMsgGetParam.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: d5e784bdaf7641eafd3bed773f708f39a1eea8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e784bdaf7641eafd3bed773… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:49:55 2007 -0700 crypt32: Add a get param function, use it to implement CryptMsgGetParam. --- dlls/crypt32/msg.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index ebd7b65..3c28230 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -29,11 +29,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); */ typedef void (*CryptMsgCloseFunc)(HCRYPTMSG msg); +typedef BOOL (*CryptMsgGetParamFunc)(HCRYPTMSG hCryptMsg, DWORD dwParamType, + DWORD dwIndex, void *pvData, DWORD *pcbData); + typedef struct _CryptMsgBase { - LONG ref; - DWORD open_flags; - CryptMsgCloseFunc close; + LONG ref; + DWORD open_flags; + CryptMsgCloseFunc close; + CryptMsgGetParamFunc get_param; } CryptMsgBase; static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags) @@ -174,7 +178,12 @@ BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData) { - FIXME("(%p, %d, %d, %p, %p): stub\n", hCryptMsg, dwParamType, dwIndex, + CryptMsgBase *msg = (CryptMsgBase *)hCryptMsg; + BOOL ret = FALSE; + + TRACE("(%p, %d, %d, %p, %p)\n", hCryptMsg, dwParamType, dwIndex, pvData, pcbData); - return FALSE; + if (msg && msg->get_param) + ret = msg->get_param(hCryptMsg, dwParamType, dwIndex, pvData, pcbData); + return ret; }

1 0

Juan Lang : crypt32: Stub CryptMsgOpenToEncode for data messages.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: fa0f5bd066b6514a14e877fad9dd7836ef5f4ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0f5bd066b6514a14e877fad… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:49:06 2007 -0700 crypt32: Stub CryptMsgOpenToEncode for data messages. --- dlls/crypt32/msg.c | 27 +++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 3 --- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f806838..ebd7b65 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -42,6 +42,30 @@ static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags) msg->open_flags = dwFlags; } +typedef struct _CDataEncodeMsg +{ + CryptMsgBase base; +} CDataEncodeMsg; + +static HCRYPTMSG CDataEncodeMsg_Open(DWORD dwFlags, const void *pvMsgEncodeInfo, + LPSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo) +{ + CDataEncodeMsg *msg; + + if (pvMsgEncodeInfo) + { + SetLastError(E_INVALIDARG); + return NULL; + } + FIXME("semi-stub\n"); + msg = CryptMemAlloc(sizeof(CDataEncodeMsg)); + if (msg) + { + CryptMsgBase_Init((CryptMsgBase *)msg, dwFlags); + } + return (HCRYPTMSG)msg; +} + static inline const char *MSG_TYPE_STR(DWORD type) { switch (type) @@ -76,6 +100,9 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, switch (dwMsgType) { case CMSG_DATA: + msg = CDataEncodeMsg_Open(dwFlags, pvMsgEncodeInfo, + pszInnerContentObjID, pStreamInfo); + break; case CMSG_SIGNED: case CMSG_ENVELOPED: case CMSG_HASHED: diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 1895f82..9d7c3c6 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -275,7 +275,6 @@ static void test_msg_close(void) ret = CryptMsgClose((HCRYPTMSG)1); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); - todo_wine ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); ret = CryptMsgClose(msg); ok(ret, "CryptMsgClose failed: %x\n", GetLastError()); @@ -290,13 +289,11 @@ static void test_data_msg_open(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, &hashInfo, NULL, NULL); - todo_wine { ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, NULL); ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); - } CryptMsgClose(msg); }

1 0

Juan Lang : crypt32: Test CryptMsgGetParam for data messages opened to encode.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: e829833986de44ee1ab950594589243dce6815c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e829833986de44ee1ab950594… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:46:55 2007 -0700 crypt32: Test CryptMsgGetParam for data messages opened to encode. --- dlls/crypt32/tests/msg.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 2b0b3fe..1895f82 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -361,10 +361,48 @@ static void test_data_msg_update(void) CryptMsgClose(msg); } +static void test_data_msg_get_param(void) +{ + HCRYPTMSG msg; + DWORD size; + BOOL ret; + + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, + NULL); + + /* Content and bare content are always gettable */ + size = 0; + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, NULL, &size); + todo_wine { + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + size = 0; + ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + /* But for this type of message, the signer and hash aren't applicable, + * and the type isn't available. + */ + size = 0; + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_ENCODED_SIGNER, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, + "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); + } + + CryptMsgClose(msg); +} + static void test_data_msg(void) { test_data_msg_open(); test_data_msg_update(); + test_data_msg_get_param(); } START_TEST(msg)

1 0

Juan Lang : crypt32: Test CryptMsgUpdate for data messages opened to encode .
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: bd05e2abe33d042675b56a3d066a3762463e15ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd05e2abe33d042675b56a3d0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:46:33 2007 -0700 crypt32: Test CryptMsgUpdate for data messages opened to encode. --- dlls/crypt32/tests/msg.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 8bebdb9..2b0b3fe 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -300,9 +300,71 @@ static void test_data_msg_open(void) CryptMsgClose(msg); } +static const BYTE msgData[] = { 1, 2, 3, 4 }; + +static void test_data_msg_update(void) +{ + HCRYPTMSG msg; + BOOL ret; + + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, + NULL); + /* Can't update a message that wasn't opened detached with final = FALSE */ + 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()); + /* Updating it with final = TRUE succeeds */ + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + /* Any subsequent update will fail, as the last was final */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "Expected CRYPT_E_MSG_ERROR, got %x\n", GetLastError()); + CryptMsgClose(msg); + + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, + NULL); + /* Can't update a message with no data */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, TRUE); + todo_wine { + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %x\n", GetLastError()); + /* Curiously, a valid update will now fail as well, presumably because of + * the last (invalid, but final) update. + */ + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), 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_DATA, NULL, NULL, NULL); + /* Dont appear to be able to update CMSG-DATA with non-final updates */ + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, NULL, 0, FALSE); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %x\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), FALSE); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %x\n", GetLastError()); + ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); + ok(ret, "CryptMsgUpdate failed: %x\n", GetLastError()); + CryptMsgClose(msg); +} + static void test_data_msg(void) { test_data_msg_open(); + test_data_msg_update(); } START_TEST(msg)

1 0

Juan Lang : crypt32: Test CryptMsgOpenToEncode for data messages.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: a581855d263ad259ba63e19856a55a8b0cd420a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a581855d263ad259ba63e1985… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:46:08 2007 -0700 crypt32: Test CryptMsgOpenToEncode for data messages. --- dlls/crypt32/tests/msg.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 035a40c..8bebdb9 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -281,6 +281,30 @@ static void test_msg_close(void) ok(ret, "CryptMsgClose failed: %x\n", GetLastError()); } +static void test_data_msg_open(void) +{ + HCRYPTMSG msg; + CMSG_HASHED_ENCODE_INFO hashInfo = { 0 }; + + /* The data message type takes no additional info */ + SetLastError(0xdeadbeef); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, &hashInfo, + NULL, NULL); + todo_wine { + ok(!msg && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %x\n", GetLastError()); + msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, NULL, NULL, + NULL); + ok(msg != NULL, "CryptMsgOpenToEncode failed: %x\n", GetLastError()); + } + CryptMsgClose(msg); +} + +static void test_data_msg(void) +{ + test_data_msg_open(); +} + START_TEST(msg) { /* Basic parameter checking tests */ @@ -288,4 +312,7 @@ START_TEST(msg) test_msg_open_to_decode(); test_msg_get_param(); test_msg_close(); + + /* Message-type specific tests */ + test_data_msg(); }

1 0

Juan Lang : crypt32: Add base message type and use it to implement CryptMsgDuplicate and CryptMsgClose .
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: b790a09efbd02369b2e3bf0db8a946a15e0a502c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b790a09efbd02369b2e3bf0db… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:45:29 2007 -0700 crypt32: Add base message type and use it to implement CryptMsgDuplicate and CryptMsgClose. --- dlls/crypt32/msg.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index a25affa..f806838 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -24,6 +24,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); +/* Called when a message's ref count reaches zero. Free any message-specific + * data here. + */ +typedef void (*CryptMsgCloseFunc)(HCRYPTMSG msg); + +typedef struct _CryptMsgBase +{ + LONG ref; + DWORD open_flags; + CryptMsgCloseFunc close; +} CryptMsgBase; + +static inline void CryptMsgBase_Init(CryptMsgBase *msg, DWORD dwFlags) +{ + msg->ref = 1; + msg->open_flags = dwFlags; +} + static inline const char *MSG_TYPE_STR(DWORD type) { switch (type) @@ -89,13 +107,33 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, HCRYPTMSG WINAPI CryptMsgDuplicate(HCRYPTMSG hCryptMsg) { - FIXME("(%p): stub\n", hCryptMsg); + TRACE("(%p)\n", hCryptMsg); + + if (hCryptMsg) + { + CryptMsgBase *msg = (CryptMsgBase *)hCryptMsg; + + InterlockedIncrement(&msg->ref); + } return hCryptMsg; } BOOL WINAPI CryptMsgClose(HCRYPTMSG hCryptMsg) { - FIXME("(%p): stub\n", hCryptMsg); + TRACE("(%p)\n", hCryptMsg); + + if (hCryptMsg) + { + CryptMsgBase *msg = (CryptMsgBase *)hCryptMsg; + + if (InterlockedDecrement(&msg->ref) == 0) + { + TRACE("freeing %p\n", msg); + if (msg->close) + msg->close(msg); + CryptMemFree(msg); + } + } return TRUE; }

1 0

Juan Lang : crypt32: Add basic parameter checking to CryptMsgOpenTo*.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 1c837f16ace9217bcad618149c85d6932542fde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c837f16ace9217bcad618149… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:44:33 2007 -0700 crypt32: Add basic parameter checking to CryptMsgOpenTo*. --- dlls/crypt32/msg.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/msg.c | 7 ------ 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index d00d68e..a25affa 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -24,13 +24,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); +static inline const char *MSG_TYPE_STR(DWORD type) +{ + switch (type) + { +#define _x(x) case (x): return #x + _x(CMSG_DATA); + _x(CMSG_SIGNED); + _x(CMSG_ENVELOPED); + _x(CMSG_SIGNED_AND_ENVELOPED); + _x(CMSG_HASHED); + _x(CMSG_ENCRYPTED); +#undef _x + default: + return wine_dbg_sprintf("unknown (%d)", type); + } +} + HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo) { - FIXME("(%08x, %08x, %08x, %p, %s, %p): stub\n", dwMsgEncodingType, dwFlags, + HCRYPTMSG msg = NULL; + + TRACE("(%08x, %08x, %08x, %p, %s, %p)\n", dwMsgEncodingType, dwFlags, dwMsgType, pvMsgEncodeInfo, debugstr_a(pszInnerContentObjID), pStreamInfo); - return NULL; + + if (GET_CMSG_ENCODING_TYPE(dwMsgEncodingType) != PKCS_7_ASN_ENCODING) + { + SetLastError(E_INVALIDARG); + return NULL; + } + switch (dwMsgType) + { + case CMSG_DATA: + case CMSG_SIGNED: + case CMSG_ENVELOPED: + case CMSG_HASHED: + FIXME("unimplemented for type %s\n", MSG_TYPE_STR(dwMsgType)); + break; + case CMSG_SIGNED_AND_ENVELOPED: + case CMSG_ENCRYPTED: + /* defined but invalid, fall through */ + default: + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + } + return msg; } HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, @@ -39,6 +78,12 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, { FIXME("(%08x, %08x, %08x, %08lx, %p, %p): stub\n", dwMsgEncodingType, dwFlags, dwMsgType, hCryptProv, pRecipientInfo, pStreamInfo); + + if (GET_CMSG_ENCODING_TYPE(dwMsgEncodingType) != PKCS_7_ASN_ENCODING) + { + SetLastError(E_INVALIDARG); + return NULL; + } return NULL; } diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index acdbeca..035a40c 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -43,19 +43,16 @@ static void test_msg_open_to_encode(void) /* Bad encodings */ SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(0, 0, 0, NULL, NULL, NULL); - todo_wine { ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(X509_ASN_ENCODING, 0, 0, NULL, NULL, NULL); ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); - } /* Bad message types */ SetLastError(0xdeadbeef); msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, 0, NULL, NULL, NULL); - todo_wine { ok(!msg && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); SetLastError(0xdeadbeef); @@ -73,7 +70,6 @@ static void test_msg_open_to_encode(void) NULL, NULL); ok(!msg && GetLastError() == CRYPT_E_INVALID_MSG_TYPE, "Expected CRYPT_E_INVALID_MSG_TYPE, got %x\n", GetLastError()); - } } static void test_msg_open_to_decode(void) @@ -83,13 +79,11 @@ static void test_msg_open_to_decode(void) SetLastError(0xdeadbeef); msg = CryptMsgOpenToDecode(0, 0, 0, 0, NULL, NULL); - todo_wine ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); /* Bad encodings */ SetLastError(0xdeadbeef); - todo_wine { msg = CryptMsgOpenToDecode(X509_ASN_ENCODING, 0, 0, 0, NULL, NULL); ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); @@ -97,7 +91,6 @@ static void test_msg_open_to_decode(void) msg = CryptMsgOpenToDecode(X509_ASN_ENCODING, 0, CMSG_DATA, 0, NULL, NULL); ok(!msg && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", GetLastError()); - } /* The message type can be explicit... */ msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, CMSG_DATA, 0, NULL,

1 0

Juan Lang : crypt32: Add basic tests for CryptMsg functions.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 3de0e4ac48bedb67c0402ad8ad1de38521eecc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de0e4ac48bedb67c0402ad8a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:43:17 2007 -0700 crypt32: Add basic tests for CryptMsg functions. --- dlls/crypt32/tests/Makefile.in | 1 + dlls/crypt32/tests/msg.c | 298 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 299 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3de0e4ac48bedb67c0402…

1 0

Juan Lang : crypt32: Don't return fake HCRYPTMSG from CryptMsgOpenTo*.
by Alexandre Julliard 29 Jun '07

29 Jun '07

Module: wine Branch: master Commit: 6c054f057b75cf0257d78d50f70db5eafb5fc658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c054f057b75cf0257d78d50f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jun 28 16:41:43 2007 -0700 crypt32: Don't return fake HCRYPTMSG from CryptMsgOpenTo*. --- dlls/crypt32/msg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 2377ae2..d00d68e 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -30,7 +30,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, { FIXME("(%08x, %08x, %08x, %p, %s, %p): stub\n", dwMsgEncodingType, dwFlags, dwMsgType, pvMsgEncodeInfo, debugstr_a(pszInnerContentObjID), pStreamInfo); - return (HCRYPTMSG)1; + return NULL; } HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, @@ -39,7 +39,7 @@ HCRYPTMSG WINAPI CryptMsgOpenToDecode(DWORD dwMsgEncodingType, DWORD dwFlags, { FIXME("(%08x, %08x, %08x, %08lx, %p, %p): stub\n", dwMsgEncodingType, dwFlags, dwMsgType, hCryptProv, pRecipientInfo, pStreamInfo); - return (HCRYPTMSG)2; + return NULL; } HCRYPTMSG WINAPI CryptMsgDuplicate(HCRYPTMSG hCryptMsg)

1 0

← Newer
1
2
3
4
5
6
7
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007