Juan Lang : crypt32: Simplify hash value tests.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c2f8191a648621f41831fb7e30c6898c5e994153
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c2f8191a648621f41831fb7e30...

Author: Juan Lang 
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);
 }