system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 08:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

wintrust: Support WSS_GET_SECONDARY_SIG_COUNT in Softpub provider.

Browse source
This commit is contained in:
Paul Gofman 2022-09-30 21:37:51 -05:00 committed by Alexandre Julliard
parent 71f58158c1
commit 2c9ab24366
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/wintrust/softpub.c
View file

@ -909,6 +909,11 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data)
data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg);
load_secondary_signatures(data, data->pSigState->hPrimarySig);
}
if (data->pSigSettings)
{
if (data->pSigSettings->dwFlags & WSS_GET_SECONDARY_SIG_COUNT)
data->pSigSettings->cSecondarySigs = data->pSigState->cSecondarySigs;
}
}
if (!err && data->hMsg)

6
dlls/wintrust/tests/softpub.c
View file

@ -1830,7 +1830,7 @@ static void test_multiple_signatures(void)
prov = (CRYPT_PROVIDER_DATA *)data.hWVTStateData;
ok(prov->cbStruct == sizeof(*prov), "Got size %lu.\n", prov->cbStruct);
ok(prov->csSigners == 1, "Got %lu.\n", prov->csSigners);
todo_wine ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings);
ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings);
ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings);
if (prov->cbStruct == sizeof(*prov) && prov->pSigState)
{
@ -1867,7 +1867,7 @@ static void test_multiple_signatures(void)
settings.dwVerifiedSigIndex = 0xcccccccc;
status = WinVerifyTrust(NULL, &WVTPolicyGUID, &data);
todo_wine ok(status == CERT_E_UNTRUSTEDROOT || status == CERT_E_CHAINING, "Failed, ret %#lx\n", status);
todo_wine ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs);
ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs);
todo_wine ok(settings.dwVerifiedSigIndex == 2, "Got %lu.\n", settings.dwVerifiedSigIndex);
data.dwStateAction = WTD_STATEACTION_CLOSE;
@ -1881,7 +1881,7 @@ static void test_multiple_signatures(void)
settings.dwIndex = 1;
status = WinVerifyTrust(NULL, &WVTPolicyGUID, &data);
todo_wine ok(status == CERT_E_UNTRUSTEDROOT || status == CERT_E_CHAINING, "Failed, ret %#lx\n", status);
todo_wine ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs);
ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs);
todo_wine ok(settings.dwVerifiedSigIndex == 1, "Got %lu.\n", settings.dwVerifiedSigIndex);
settings.dwIndex = 0;

4
dlls/wintrust/wintrust_main.c
View file

@ -294,6 +294,10 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID,
data->hWVTStateData = provData;
provData->pWintrustData = data;
if (WVT_ISINSTRUCT(WINTRUST_DATA, data->cbStruct, pSignatureSettings))
provData->pSigSettings = data->pSignatureSettings;
if (hwnd == INVALID_HANDLE_VALUE)
provData->hWndParent = GetDesktopWindow();
else