ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Add a couple tests that show you can't get the hash from an encoded hash message, and fix encoded hash messages to match.

This commit is contained in:
Juan Lang 2007-08-20 17:33:44 -07:00 committed by Alexandre Julliard
parent 163e8d6256
commit e7ce5ae2bc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/crypt32/msg.c
View File

@ -464,7 +464,7 @@ static BOOL CHashEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType,
} }
break; break;
default: default:
ret = FALSE; SetLastError(CRYPT_E_INVALID_MSG_TYPE);
} }
return ret; return ret;
} }

10
dlls/crypt32/tests/msg.c
View File

@ -788,6 +788,11 @@ static void test_hash_msg_get_param(void)
size = 0; size = 0;
ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size); ret = CryptMsgGetParam(msg, CMSG_BARE_CONTENT_PARAM, 0, NULL, &size);
ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError());
/* For an encoded hash message, the hash data aren't available */
SetLastError(0xdeadbeef);
ret = CryptMsgGetParam(msg, CMSG_HASH_DATA_PARAM, 0, NULL, &size);
ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE,
"Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError());
/* The hash is also available. */ /* The hash is also available. */
size = 0; size = 0;
ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size); ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, NULL, &size);
@ -801,6 +806,11 @@ static void test_hash_msg_get_param(void)
ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE); ret = CryptMsgUpdate(msg, msgData, sizeof(msgData), TRUE);
ok(!ret && GetLastError() == NTE_BAD_HASH_STATE, ok(!ret && GetLastError() == NTE_BAD_HASH_STATE,
"Expected NTE_BAD_HASH_STATE, got %x\n", GetLastError()); "Expected NTE_BAD_HASH_STATE, got %x\n", GetLastError());
/* Even after a final update, the hash data aren't available */
SetLastError(0xdeadbeef);
ret = CryptMsgGetParam(msg, CMSG_HASH_DATA_PARAM, 0, NULL, &size);
ok(!ret && GetLastError() == CRYPT_E_INVALID_MSG_TYPE,
"Expected CRYPT_E_INVALID_MSG_TYPE, got %08x\n", GetLastError());
/* The version is also available, and should be zero for this message. */ /* The version is also available, and should be zero for this message. */
size = 0; size = 0;
ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, NULL, &size); ret = CryptMsgGetParam(msg, CMSG_VERSION_PARAM, 0, NULL, &size);