crypt32: Allow messages to be opened when compiled with…

crypt32: Allow messages to be opened when compiled with CMSG_SIGNED_ENCODE_INFO_HAS_CMS_FIELDS if CMS fields aren't actually used.

crypt32: Allow messages to be opened when compiled with…
32970800 · Juan Lang · Alexandre Julliard · 427b3fbd · 32970800 · 32970800
Commit 32970800 authored Aug 14, 2008 by Juan Lang Committed by Alexandre Julliard Aug 20, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

msg.c dlls/crypt32/msg.c +2 -1

msg.c dlls/crypt32/tests/msg.c +1 -0

No files found.
--- a/dlls/crypt32/msg.c
+++ b/dlls/crypt32/msg.c
@@ -1259,7 +1259,8 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags,
        SetLastError(E_INVALIDARG);
        return NULL;
    }
-    if (info->cbSize == sizeof(CMSG_SIGNED_ENCODE_INFO_WITH_CMS))
+    if (info->cbSize == sizeof(CMSG_SIGNED_ENCODE_INFO_WITH_CMS) &&
+     info->rgAttrCertEncoded)
    {
        FIXME("CMSG_SIGNED_ENCODE_INFO with CMS fields unsupported\n");
        return NULL;

--- a/dlls/crypt32/tests/msg.c
+++ b/dlls/crypt32/tests/msg.c
@@ -24,6 +24,7 @@
 #include <winbase.h>
 #include <winerror.h>
 #define CMSG_SIGNER_ENCODE_INFO_HAS_CMS_FIELDS
+#define CMSG_SIGNED_ENCODE_INFO_HAS_CMS_FIELDS
 #include <wincrypt.h>

 #include "wine/test.h"