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

crypt32: Add cab file checking to CryptSIPRetrieveSubjectGUID.

This commit is contained in:
Juan Lang 2008-07-23 21:47:42 -07:00 committed by Alexandre Julliard
parent 210c91f919
commit d3beb5056e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/crypt32/sip.c
View File

@ -283,6 +283,8 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid
IMAGE_DOS_HEADER *dos; IMAGE_DOS_HEADER *dos;
/* FIXME, find out if there is a name for this GUID */ /* FIXME, find out if there is a name for this GUID */
static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; static const GUID unknown = { 0xC689AAB8, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }};
static const GUID cabGUID = { 0xc689aaba, 0x8e78, 0x11d0, {0x8c,0x47,0x00,0xc0,0x4f,0xc2,0x95,0xee }};
static const BYTE cabHdr[] = { 'M','S','C','F' };
TRACE("(%s %p %p)\n", wine_dbgstr_w(FileName), hFileIn, pgSubject); TRACE("(%s %p %p)\n", wine_dbgstr_w(FileName), hFileIn, pgSubject);
@ -330,10 +332,17 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid
bRet = TRUE; bRet = TRUE;
goto cleanup1; goto cleanup1;
} }
/* Quick-n-dirty check for a cab file. FIXME: use FDIIsCabinet instead? */
if (!memcmp(pMapped, cabHdr, sizeof(cabHdr)))
{
*pgSubject = cabGUID;
SetLastError(S_OK);
bRet = TRUE;
goto cleanup1;
}
/* FIXME /* FIXME
* There is a lot more to be checked: * There is a lot more to be checked:
* - Check for MSFC in the header
* - Check for the keys CryptSIPDllIsMyFileType and CryptSIPDllIsMyFileType2 * - Check for the keys CryptSIPDllIsMyFileType and CryptSIPDllIsMyFileType2
* under HKLM\Software\Microsoft\Cryptography\OID\EncodingType 0. Here are * under HKLM\Software\Microsoft\Cryptography\OID\EncodingType 0. Here are
* functions listed that need check if a SIP Provider can deal with the * functions listed that need check if a SIP Provider can deal with the

2
dlls/crypt32/tests/sip.c
View File

@ -274,10 +274,8 @@ static void test_SIPRetrieveSubjectGUID(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
memset(&subject, 1, sizeof(GUID)); memset(&subject, 1, sizeof(GUID));
ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject);
todo_wine
ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n", ok( ret, "CryptSIPRetrieveSubjectGuid failed: %d (0x%08x)\n",
GetLastError(), GetLastError() ); GetLastError(), GetLastError() );
todo_wine
ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)), ok ( !memcmp(&subject, &cabGUID, sizeof(GUID)),
"Expected GUID %s for cabinet file, not %s\n", show_guid(&cabGUID, guid1), show_guid(&subject, guid2)); "Expected GUID %s for cabinet file, not %s\n", show_guid(&cabGUID, guid1), show_guid(&subject, guid2));
/* Clean up */ /* Clean up */