>From 8067b3c43d46ad89ef8247ac56923e352fee851d Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Mon, 23 Feb 2009 11:05:20 +0100 Subject: [PATCH] Don't crash on Win9x (test_msg_get_and_verify_signer) --- dlls/crypt32/tests/msg.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index a8193cd..2188e6d 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2968,11 +2968,14 @@ static void test_msg_get_and_verify_signer(void) msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); /* A "signed" message created with no signer cert likewise has no signer */ - CryptMsgUpdate(msg, signedEmptyContent, sizeof(signedEmptyContent), TRUE); - SetLastError(0xdeadbeef); - ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, - "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + ret = CryptMsgUpdate(msg, signedEmptyContent, sizeof(signedEmptyContent), TRUE); + if (ret) + { + /* Crashes on most Win9x */ + ret = CryptMsgGetAndVerifySigner(msg, 0, NULL, 0, NULL, NULL); + ok(!ret && GetLastError() == CRYPT_E_NO_TRUSTED_SIGNER, + "expected CRYPT_E_NO_TRUSTED_SIGNER, got 0x%08x\n", GetLastError()); + } CryptMsgClose(msg); msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); -- 1.6.0.6