From ec47c6d5d6514cbd84106b563e465b83340031a8 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang@gmail.com>
Date: Wed, 23 Jul 2008 17:42:09 -0700
Subject: [PATCH] Don't assume input file is a PE file in CryptSIPGetSignedDataMsg
---
 dlls/wintrust/crypt.c |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c
index 8819ea8..b9c4ebf 100644
--- a/dlls/wintrust/crypt.c
+++ b/dlls/wintrust/crypt.c
@@ -202,11 +202,9 @@ BOOL WINAPI CryptSIPCreateIndirectData(S
     return FALSE;
 }
 
-/***********************************************************************
- *      CryptSIPGetSignedDataMsg  (WINTRUST.@)
- */
-BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType,
-                                       DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg)
+static BOOL WINTRUST_GetSignedMsgFromPEFile(SIP_SUBJECTINFO *pSubjectInfo,
+ DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg,
+ BYTE *pbSignedDataMsg)
 {
     BOOL ret;
     WIN_CERTIFICATE *pCert = NULL;
@@ -264,9 +262,34 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP
             }
         }
     }
-
 error:
     HeapFree(GetProcessHeap(), 0, pCert);
+    return ret;
+}
+
+/***********************************************************************
+ *      CryptSIPGetSignedDataMsg  (WINTRUST.@)
+ */
+BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEncodingType,
+                                       DWORD dwIndex, DWORD* pcbSignedDataMsg, BYTE* pbSignedDataMsg)
+{
+    static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,
+     0x00,0xC0,0x4F,0xC2,0x95,0xEE } };
+    BOOL ret;
+
+    TRACE("(%p %p %d %p %p)\n", pSubjectInfo, pdwEncodingType, dwIndex,
+          pcbSignedDataMsg, pbSignedDataMsg);
+ 
+    if (!memcmp(pSubjectInfo->pgSubjectType, &unknown, sizeof(unknown)))
+        ret = WINTRUST_GetSignedMsgFromPEFile(pSubjectInfo, pdwEncodingType,
+         dwIndex, pcbSignedDataMsg, pbSignedDataMsg);
+    else
+    {
+        FIXME("unimplemented for subject type %s\n",
+         debugstr_guid(pSubjectInfo->pgSubjectType));
+        ret = FALSE;
+    }
+
     TRACE("returning %d\n", ret);
     return ret;
 }
-- 
1.4.1