wintrust: Partially implement SoftpubLoadMessage for catalog files.
This commit is contained in:
parent
153066c64a
commit
12a848e54b
|
@ -329,6 +329,43 @@ error:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static BOOL SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data)
|
||||||
|
{
|
||||||
|
BOOL ret;
|
||||||
|
HANDLE catalog = INVALID_HANDLE_VALUE;
|
||||||
|
|
||||||
|
if (!data->pWintrustData->u.pCatalog)
|
||||||
|
{
|
||||||
|
SetLastError(ERROR_INVALID_PARAMETER);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
catalog = CreateFileW(data->pWintrustData->u.pCatalog->pcwszCatalogFilePath,
|
||||||
|
GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
|
||||||
|
NULL);
|
||||||
|
if (catalog == INVALID_HANDLE_VALUE)
|
||||||
|
return FALSE;
|
||||||
|
ret = CryptSIPRetrieveSubjectGuid(
|
||||||
|
data->pWintrustData->u.pCatalog->pcwszCatalogFilePath, catalog,
|
||||||
|
&data->u.pPDSip->gSubject);
|
||||||
|
if (!ret)
|
||||||
|
goto error;
|
||||||
|
ret = SOFTPUB_GetSIP(data);
|
||||||
|
if (!ret)
|
||||||
|
goto error;
|
||||||
|
ret = SOFTPUB_GetMessageFromFile(data, catalog,
|
||||||
|
data->pWintrustData->u.pCatalog->pcwszCatalogFilePath);
|
||||||
|
if (!ret)
|
||||||
|
goto error;
|
||||||
|
ret = SOFTPUB_CreateStoreFromMessage(data);
|
||||||
|
if (!ret)
|
||||||
|
goto error;
|
||||||
|
ret = SOFTPUB_DecodeInnerContent(data);
|
||||||
|
/* FIXME: this loads the catalog file, but doesn't validate the member. */
|
||||||
|
error:
|
||||||
|
CloseHandle(catalog);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data)
|
HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data)
|
||||||
{
|
{
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
|
@ -346,6 +383,9 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data)
|
||||||
case WTD_CHOICE_FILE:
|
case WTD_CHOICE_FILE:
|
||||||
ret = SOFTPUB_LoadFileMessage(data);
|
ret = SOFTPUB_LoadFileMessage(data);
|
||||||
break;
|
break;
|
||||||
|
case WTD_CHOICE_CATALOG:
|
||||||
|
ret = SOFTPUB_LoadCatalogMessage(data);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
FIXME("unimplemented for %d\n", data->pWintrustData->dwUnionChoice);
|
FIXME("unimplemented for %d\n", data->pWintrustData->dwUnionChoice);
|
||||||
SetLastError(ERROR_INVALID_PARAMETER);
|
SetLastError(ERROR_INVALID_PARAMETER);
|
||||||
|
|
Loading…
Reference in New Issue