August 2007 - Wine-Commits - list.winehq.org

Juan Lang : wintrust: Test and implement pfnAddCert2Chain.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 4f2fae1d991b08d2150709c3b16ef8fec50b7e2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2fae1d991b08d2150709c3b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:09:10 2007 -0700 wintrust: Test and implement pfnAddCert2Chain. --- dlls/wintrust/register.c | 2 +- dlls/wintrust/tests/softpub.c | 28 ++++++++++++++++++++++++++++ dlls/wintrust/wintrust_main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_priv.h | 2 ++ 4 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 9b97d9c..a3e18e0 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -838,7 +838,7 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, pPfns->pfnFree = WINTRUST_Free; pPfns->pfnAddStore2Chain = WINTRUST_AddStore; pPfns->pfnAddSgnr2Chain = WINTRUST_AddSgnr; - pPfns->pfnAddCert2Chain = NULL; + pPfns->pfnAddCert2Chain = WINTRUST_AddCert; pPfns->pfnAddPrivData2Chain = NULL; pPfns->psUIpfns = NULL; pPfns->pfnInitialize = (PFN_PROVIDER_INIT_CALL)WINTRUST_ReadProviderFromReg(GuidString, Initialization); diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index b1ca23a..fa58477 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -130,6 +130,8 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) ok(data.pasSigners != NULL, "Expected pasSigners to be allocated\n"); if (data.pasSigners) { + PCCERT_CONTEXT cert; + ok(!memcmp(&data.pasSigners[0], &sgnr, sizeof(sgnr)), "Unexpected data in signer\n"); /* Adds into the location specified by the index */ @@ -156,6 +158,32 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Crash + ret = funcs->pfnAddCert2Chain(NULL, 0, FALSE, 0, NULL); + ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, NULL); + */ + cert = CertCreateCertificateContext(X509_ASN_ENCODING, v1CertWithPubKey, + sizeof(v1CertWithPubKey)); + if (cert) + { + /* Notes on behavior that are hard to test: + * 1. If pasSigners is invalid, pfnAddCert2Chain crashes + * 2. An invalid signer index isn't checked. + */ + ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert); + ok(ret, "pfnAddCert2Chain failed: %08x\n", GetLastError()); + ok(data.pasSigners[0].csCertChain == 1, "Expected 1 cert, got %d\n", + data.pasSigners[0].csCertChain); + ok(data.pasSigners[0].pasCertChain != NULL, + "Expected pasCertChain to be allocated\n"); + if (data.pasSigners[0].pasCertChain) + ok(data.pasSigners[0].pasCertChain[0].pCert == cert, + "Unexpected cert\n"); + CertFreeCertificateContext(cert); + } + else + skip("CertCreateCertificateContext failed: %08x\n", GetLastError()); } } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 0f6dcd6..d6134b7 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -303,3 +303,40 @@ BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, SetLastError(ERROR_OUTOFMEMORY); return ret; } + +BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, + BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add) +{ + BOOL ret = FALSE; + + if (fCounterSigner) + { + FIXME("unimplemented for counter signers\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (data->pasSigners[idxSigner].csCertChain) + data->pasSigners[idxSigner].pasCertChain = + WINTRUST_ReAlloc(data->pasSigners[idxSigner].pasCertChain, + (data->pasSigners[idxSigner].csCertChain + 1) * + sizeof(CRYPT_PROVIDER_CERT)); + else + { + data->pasSigners[idxSigner].pasCertChain = + WINTRUST_Alloc(sizeof(CRYPT_PROVIDER_CERT)); + data->pasSigners[idxSigner].csCertChain = 0; + } + if (data->pasSigners[idxSigner].pasCertChain) + { + CRYPT_PROVIDER_CERT *cert = &data->pasSigners[idxSigner].pasCertChain[ + data->pasSigners[idxSigner].csCertChain]; + + cert->cbStruct = sizeof(CRYPT_PROVIDER_CERT); + cert->pCert = CertDuplicateCertificateContext(pCert2Add); + data->pasSigners[idxSigner].csCertChain++; + ret = TRUE; + } + else + SetLastError(ERROR_OUTOFMEMORY); + return ret; +} diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 75b0438..4519bd9 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -24,5 +24,7 @@ void WINAPI WINTRUST_Free(void *p); BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); +BOOL WINAPI WINTRUST_AddCert(CRYPT_PROVIDER_DATA *data, DWORD idxSigner, + BOOL fCounterSigner, DWORD idxCounterSigner, PCCERT_CONTEXT pCert2Add); #endif /* ndef __WINTRUST_PRIV_H__ */

1 0

Juan Lang : wintrust: Test and implement pfnAddSgnr2Chain.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 8c34271aaa54165e8b9ecb1395b0836e3de9388a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c34271aaa54165e8b9ecb139… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:07:30 2007 -0700 wintrust: Test and implement pfnAddSgnr2Chain. --- dlls/wintrust/register.c | 2 +- dlls/wintrust/tests/softpub.c | 39 +++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_main.c | 51 +++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/wintrust_priv.h | 2 + 4 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 0a02ed2..9b97d9c 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -837,7 +837,7 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, pPfns->pfnAlloc = WINTRUST_Alloc; pPfns->pfnFree = WINTRUST_Free; pPfns->pfnAddStore2Chain = WINTRUST_AddStore; - pPfns->pfnAddSgnr2Chain = NULL; + pPfns->pfnAddSgnr2Chain = WINTRUST_AddSgnr; pPfns->pfnAddCert2Chain = NULL; pPfns->pfnAddPrivData2Chain = NULL; pPfns->psUIpfns = NULL; diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 1eb967a..b1ca23a 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -91,6 +91,7 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) { CRYPT_PROVIDER_DATA data = { 0 }; HCERTSTORE store; + CRYPT_PROVIDER_SGNR sgnr = { 0 }; BOOL ret; /* Crash @@ -118,6 +119,44 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) } else skip("CertOpenStore failed: %08x\n", GetLastError()); + + /* Crash + ret = funcs->pfnAddSgnr2Chain(NULL, FALSE, 0, NULL); + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, NULL); + */ + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); + ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); + ok(data.csSigners == 1, "Expected 1 signer, got %d\n", data.csSigners); + ok(data.pasSigners != NULL, "Expected pasSigners to be allocated\n"); + if (data.pasSigners) + { + ok(!memcmp(&data.pasSigners[0], &sgnr, sizeof(sgnr)), + "Unexpected data in signer\n"); + /* Adds into the location specified by the index */ + sgnr.cbStruct = sizeof(CRYPT_PROVIDER_SGNR); + sgnr.sftVerifyAsOf.dwLowDateTime = 0xdeadbeef; + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 1, &sgnr); + ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); + ok(data.csSigners == 2, "Expected 2 signers, got %d\n", data.csSigners); + ok(!memcmp(&data.pasSigners[1], &sgnr, sizeof(sgnr)), + "Unexpected data in signer\n"); + /* This also adds, but the data aren't copied */ + sgnr.cbStruct = sizeof(DWORD); + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); + ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); + ok(data.csSigners == 3, "Expected 3 signers, got %d\n", data.csSigners); + ok(data.pasSigners[0].cbStruct == 0, "Unexpected data size %d\n", + data.pasSigners[0].cbStruct); + ok(data.pasSigners[0].sftVerifyAsOf.dwLowDateTime == 0, + "Unexpected verify time %d\n", + data.pasSigners[0].sftVerifyAsOf.dwLowDateTime); + /* But too large a thing isn't added */ + sgnr.cbStruct = sizeof(sgnr) + sizeof(DWORD); + SetLastError(0xdeadbeef); + ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } } static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 6ecfb1d..0f6dcd6 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -252,3 +252,54 @@ BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) SetLastError(ERROR_OUTOFMEMORY); return ret; } + +BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, + BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr) +{ + BOOL ret = FALSE; + + if (sgnr->cbStruct > sizeof(CRYPT_PROVIDER_SGNR)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (fCounterSigner) + { + FIXME("unimplemented for counter signers\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (data->csSigners) + data->pasSigners = WINTRUST_ReAlloc(data->pasSigners, + (data->csSigners + 1) * sizeof(CRYPT_PROVIDER_SGNR)); + else + { + data->pasSigners = WINTRUST_Alloc(sizeof(CRYPT_PROVIDER_SGNR)); + data->csSigners = 0; + } + if (data->pasSigners) + { + if (idxSigner < data->csSigners) + memmove(&data->pasSigners[idxSigner], + &data->pasSigners[idxSigner + 1], + (data->csSigners - idxSigner) * sizeof(CRYPT_PROVIDER_SGNR)); + ret = TRUE; + if (sgnr->cbStruct == sizeof(CRYPT_PROVIDER_SGNR)) + { + /* The PSDK says psSigner should be allocated using pfnAlloc, but + * it doesn't say anything about ownership. Since callers are + * internal, assume ownership is passed, and just store the + * pointer. + */ + memcpy(&data->pasSigners[idxSigner], sgnr, + sizeof(CRYPT_PROVIDER_SGNR)); + } + else + memset(&data->pasSigners[idxSigner], 0, + sizeof(CRYPT_PROVIDER_SGNR)); + data->csSigners++; + } + else + SetLastError(ERROR_OUTOFMEMORY); + return ret; +} diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index 40f2e5d..75b0438 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -22,5 +22,7 @@ void * WINAPI WINTRUST_Alloc(DWORD cb); void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb); void WINAPI WINTRUST_Free(void *p); BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); +BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data, + BOOL fCounterSigner, DWORD idxSigner, CRYPT_PROVIDER_SGNR *sgnr); #endif /* ndef __WINTRUST_PRIV_H__ */

1 0

Juan Lang : wintrust: Implement pfnCertificateTrust.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: b157166345693d9b4b6eceafd6edaa79c3512381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b157166345693d9b4b6eceafd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:11:14 2007 -0700 wintrust: Implement pfnCertificateTrust. --- dlls/wintrust/softpub.c | 140 +++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/softpub.c | 92 +++++++++++++++++++++++++++ dlls/wintrust/wintrust.spec | 4 +- 3 files changed, 234 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b157166345693d9b4b6ec…

1 0

Juan Lang : wintrust: Test and implement pfnAddStore2Chain.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 150ddd6bd48540dbf5bd92f3bd9b94fc7f605564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=150ddd6bd48540dbf5bd92f3b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 15:59:18 2007 -0700 wintrust: Test and implement pfnAddStore2Chain. --- dlls/wintrust/register.c | 2 +- dlls/wintrust/tests/softpub.c | 60 ++++++++++++++++++++++++++++++++--------- dlls/wintrust/wintrust_main.c | 22 +++++++++++++++ dlls/wintrust/wintrust_priv.h | 1 + 4 files changed, 71 insertions(+), 14 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 1f0054b..0a02ed2 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -836,7 +836,7 @@ BOOL WINAPI WintrustLoadFunctionPointers( GUID* pgActionID, /* Get the function pointers from the registry, where applicable */ pPfns->pfnAlloc = WINTRUST_Alloc; pPfns->pfnFree = WINTRUST_Free; - pPfns->pfnAddStore2Chain = NULL; + pPfns->pfnAddStore2Chain = WINTRUST_AddStore; pPfns->pfnAddSgnr2Chain = NULL; pPfns->pfnAddCert2Chain = NULL; pPfns->pfnAddPrivData2Chain = NULL; diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5df430b..1eb967a 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -74,6 +74,52 @@ typedef struct _SAFE_PROVIDER_FUNCTIONS SAFE_PROVIDER_CLEANUP_CALL pfnCleanupPolicy; } SAFE_PROVIDER_FUNCTIONS; +static const BYTE v1CertWithPubKey[] = { +0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x01,0x01,0x05,0x00,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, +0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06, +0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02, +0x01,0x01 }; + +static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) +{ + CRYPT_PROVIDER_DATA data = { 0 }; + HCERTSTORE store; + BOOL ret; + + /* Crash + ret = funcs->pfnAddStore2Chain(NULL, NULL); + ret = funcs->pfnAddStore2Chain(&data, NULL); + */ + store = CertOpenStore(CERT_STORE_PROV_MEMORY, X509_ASN_ENCODING, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + if (store) + { + ret = funcs->pfnAddStore2Chain(&data, store); + ok(ret, "pfnAddStore2Chain failed: %08x\n", GetLastError()); + ok(data.chStores == 1, "Expected 1 store, got %d\n", data.chStores); + ok(data.pahStores != NULL, "Expected pahStores to be allocated\n"); + if (data.pahStores) + { + ok(data.pahStores[0] == store, "Unexpected store\n"); + CertCloseStore(data.pahStores[0], 0); + funcs->pfnFree(data.pahStores); + data.pahStores = NULL; + data.chStores = 0; + CertCloseStore(store, 0); + store = NULL; + } + } + else + skip("CertOpenStore failed: %08x\n", GetLastError()); +} + static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { HRESULT ret; @@ -115,19 +161,6 @@ static void testInitialize(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) } } -static const BYTE v1CertWithPubKey[] = { -0x30,0x81,0x95,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, -0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, -0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, -0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, -0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, -0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, -0x67,0x00,0x30,0x22,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, -0x01,0x01,0x05,0x00,0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, -0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0xa3,0x16,0x30,0x14,0x30,0x12,0x06, -0x03,0x55,0x1d,0x13,0x01,0x01,0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02, -0x01,0x01 }; - static void testObjTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { HRESULT ret; @@ -216,6 +249,7 @@ START_TEST(softpub) skip("WintrustLoadFunctionPointers failed\n"); else { + test_utils(&funcs); testInitialize(&funcs, &generic_verify_v2); testObjTrust(&funcs, &generic_verify_v2); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 4b0c8ff..6ecfb1d 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -230,3 +230,25 @@ void WINAPI WINTRUST_Free(void *p) { HeapFree(GetProcessHeap(), 0, p); } + +BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store) +{ + BOOL ret = FALSE; + + if (data->chStores) + data->pahStores = WINTRUST_ReAlloc(data->pahStores, + (data->chStores + 1) * sizeof(HCERTSTORE)); + else + { + data->pahStores = WINTRUST_Alloc(sizeof(HCERTSTORE)); + data->chStores = 0; + } + if (data->pahStores) + { + data->pahStores[data->chStores++] = CertDuplicateStore(store); + ret = TRUE; + } + else + SetLastError(ERROR_OUTOFMEMORY); + return ret; +} diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h index dc6a873..40f2e5d 100644 --- a/dlls/wintrust/wintrust_priv.h +++ b/dlls/wintrust/wintrust_priv.h @@ -21,5 +21,6 @@ void * WINAPI WINTRUST_Alloc(DWORD cb); void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb); void WINAPI WINTRUST_Free(void *p); +BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store); #endif /* ndef __WINTRUST_PRIV_H__ */

1 0

Juan Lang : wintrust: Use a helper function to get a signer' s cert info from a message.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: fb07a3aa02cfb3329bce4a08b7d4e8f45e93bbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb07a3aa02cfb3329bce4a08b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 16:10:00 2007 -0700 wintrust: Use a helper function to get a signer's cert info from a message. --- dlls/wintrust/softpub.c | 74 ++++++++++++++++++++++++++++------------------- 1 files changed, 44 insertions(+), 30 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 4b6b33a..caab601 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -292,6 +292,34 @@ error: return ret ? S_OK : S_FALSE; } +static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, + DWORD signerIdx) +{ + BOOL ret; + CERT_INFO *certInfo = NULL; + DWORD size; + + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_CERT_INFO_PARAM, signerIdx, + NULL, &size); + if (ret) + { + certInfo = data->psPfns->pfnAlloc(size); + if (certInfo) + { + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_CERT_INFO_PARAM, + signerIdx, certInfo, &size); + if (!ret) + { + data->psPfns->pfnFree(certInfo); + certInfo = NULL; + } + } + else + SetLastError(ERROR_OUTOFMEMORY); + } + return certInfo; +} + HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { BOOL ret; @@ -311,45 +339,31 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) for (i = 0; ret && i < signerCount; i++) { - ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_CERT_INFO_PARAM, - i, NULL, &size); - if (ret) + CERT_INFO *certInfo = WINTRUST_GetSignerCertInfo(data, i); + + if (certInfo) { - CERT_INFO *certInfo = data->psPfns->pfnAlloc(size); + CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { sizeof(para), 0, i, + CMSG_VERIFY_SIGNER_CERT, NULL }; - if (certInfo) + para.pvSigner = (LPVOID)CertGetSubjectCertificateFromStore( + data->pahStores[0], data->dwEncoding, certInfo); + if (para.pvSigner) { - ret = CryptMsgGetParam(data->hMsg, - CMSG_SIGNER_CERT_INFO_PARAM, i, certInfo, &size); - if (ret) - { - CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA para = { - sizeof(para), 0, i, CMSG_VERIFY_SIGNER_CERT, NULL }; - - para.pvSigner = - (LPVOID)CertGetSubjectCertificateFromStore( - data->pahStores[0], data->dwEncoding, certInfo); - if (para.pvSigner) - { - ret = CryptMsgControl(data->hMsg, 0, - CMSG_CTRL_VERIFY_SIGNATURE_EX, &para); - if (!ret) - SetLastError(TRUST_E_CERT_SIGNATURE); - } - else - { - SetLastError(TRUST_E_NO_SIGNER_CERT); - ret = FALSE; - } - } - data->psPfns->pfnFree(certInfo); + ret = CryptMsgControl(data->hMsg, 0, + CMSG_CTRL_VERIFY_SIGNATURE_EX, &para); + if (!ret) + SetLastError(TRUST_E_CERT_SIGNATURE); } else { - SetLastError(ERROR_OUTOFMEMORY); + SetLastError(TRUST_E_NO_SIGNER_CERT); ret = FALSE; } + data->psPfns->pfnFree(certInfo); } + else + ret = FALSE; } } else

1 0

Juan Lang : crypt32: Set trust status on root element in chain.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: eda48d8868065d2d7debafa79ba25fd8e1d8bc59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda48d8868065d2d7debafa79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 15:52:37 2007 -0700 crypt32: Set trust status on root element in chain. --- dlls/crypt32/chain.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 161ba29..2b00ff0 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -340,20 +340,25 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, } if (ret) { - PCCERT_CONTEXT root = chain->rgpElement[chain->cElement - 1]-> - pCertContext; + PCERT_CHAIN_ELEMENT rootElement = + chain->rgpElement[chain->cElement - 1]; + PCCERT_CONTEXT root = rootElement->pCertContext; if (!(ret = CRYPT_IsCertificateSelfSigned(root))) TRACE("Last certificate is not self-signed\n"); else { - chain->rgpElement[chain->cElement - 1]->TrustStatus.dwInfoStatus - |= CERT_TRUST_IS_SELF_SIGNED; + rootElement->TrustStatus.dwInfoStatus |= + CERT_TRUST_IS_SELF_SIGNED; if (!(ret = CryptVerifyCertificateSignatureEx(0, root->dwCertEncodingType, CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, (void *)root, CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)root, 0, NULL))) + { TRACE("Last certificate's signature is invalid\n"); + rootElement->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_SIGNATURE_VALID; + } } if (ret) { @@ -367,11 +372,15 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, trustedRoot = CertFindCertificateInStore(engine->hRoot, root->dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob, NULL); if (!trustedRoot) - chain->TrustStatus.dwErrorStatus |= + rootElement->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_UNTRUSTED_ROOT; else CertFreeCertificateContext(trustedRoot); } + chain->TrustStatus.dwErrorStatus |= + rootElement->TrustStatus.dwErrorStatus; + chain->TrustStatus.dwInfoStatus |= + rootElement->TrustStatus.dwInfoStatus & ~CERT_TRUST_IS_SELF_SIGNED; } if (!ret) {

1 0

Juan Lang : wintrust: Add missing definitions.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 3db50276ab66c87ea9e8ab8548dcc5f06d6afe3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db50276ab66c87ea9e8ab854… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 28 15:52:55 2007 -0700 wintrust: Add missing definitions. --- include/wintrust.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 3290e31..fa8870f 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -136,6 +136,7 @@ typedef struct _WINTRUST_DATA #define WTD_HASH_ONLY_FLAG 0x00000200 #define WTD_USE_DEFAULT_OSVER_CHECK 0x00000400 #define WTD_LIFETIME_SIGNING_FLAG 0x00000800 +#define WTD_CACHE_ONLY_URL_RETRIEVAL 0x00001000 #define WTD_UICONTEXT_EXECUTE 0 #define WTD_UICONTEXT_INSTALL 1 @@ -199,6 +200,13 @@ typedef struct _CRYPT_PROVIDER_CERT { PCERT_CHAIN_ELEMENT pChainElement; } CRYPT_PROVIDER_CERT, *PCRYPT_PROVIDER_CERT; +#define CERT_CONFIDENCE_SIG 0x10000000 +#define CERT_CONFIDENCE_TIME 0x01000000 +#define CERT_CONFIDENCE_TIMENEST 0x00100000 +#define CERT_CONFIDENCE_AUTHIDEXT 0x00010000 +#define CERT_CONFIDENCE_HYGIENE 0x00001000 +#define CERT_CONFIDENCE_HIGHEST 0x11111000 + typedef struct _CRYPT_PROVIDER_SGNR { DWORD cbStruct; FILETIME sftVerifyAsOf; @@ -212,6 +220,8 @@ typedef struct _CRYPT_PROVIDER_SGNR { PCCERT_CHAIN_CONTEXT pChainContext; } CRYPT_PROVIDER_SGNR, *PCRYPT_PROVIDER_SGNR; +#define SGNR_TYPE_TIMESTAMP 0x00000010 + typedef struct _CRYPT_PROVIDER_PRIVDATA { DWORD cbStruct; GUID gProviderID; @@ -346,6 +356,19 @@ typedef struct _CRYPT_PROVIDER_DATA { DWORD dwUIStateFlags; } CRYPT_PROVIDER_DATA, *PCRYPT_PROVIDER_DATA; +#define CPD_CHOICE_SIP 1 + +#define CPD_USE_NT5_CHAIN_FLAG 0x80000000 +#define CPD_REVOCATION_CHECK_NONE 0x00010000 +#define CPD_REVOCATION_CHECK_END_CERT 0x00020000 +#define CPD_REVOCATION_CHECK_CHAIN 0x00040000 +#define CPD_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT 0x00080000 + +#define CPD_UISTATE_MODE_PROMPT 0x00000000 +#define CPD_UISTATE_MODE_BLOCK 0x00000001 +#define CPD_UISTATE_MODE_ALLOW 0x00000002 +#define CPD_UISTATE_MODE_MASK 0x00000003 + typedef BOOL (*PFN_PROVUI_CALL)(HWND hWndSecurityDialog, struct _CRYPT_PROVIDER_DATA *pProvData); @@ -552,6 +575,36 @@ typedef struct _WIN_CERTIFICATE { #define WIN_CERT_TYPE_RESERVED_1 0x0003 /* Reserved */ #define WIN_CERT_TYPE_TS_STACK_SIGNED 0x0004 +typedef LPVOID WIN_TRUST_SUBJECT; + +typedef struct _WIN_TRUST_ACTDATA_CONTEXT_WITH_SUBJECT +{ + HANDLE hClientToken; + GUID *SubjectType; + WIN_TRUST_SUBJECT Subject; +} WIN_TRUST_ACTDATA_CONTEXT_WITH_SUBJECT, + *LPWIN_TRUST_ACTDATA_CONTEXT_WITH_SUBJECT; + +typedef struct _WIN_TRUST_ACTDATA_CONTEXT_SUBJECT_ONLY +{ + GUID *SubjectType; + WIN_TRUST_SUBJECT Subject; +} WIN_TRUST_ACTDATA_CONTEXT_SUBJECT_ONLY, + *LPWIN_TRUST_ACTDATA_CONTEXT_SUBJECT_ONLY; + +typedef struct _WIN_TRUST_SUBJECT_FILE +{ + HANDLE hFile; + LPCWSTR lpPath; +} WIN_TRUST_SUBJECT_FILE, *LPWIN_TRUST_SUBJECT_FILE; + +typedef struct _WIN_TRUST_SUBJECT_FILE_AND_DISPLAY +{ + HANDLE hFile; + LPCWSTR lpPath; + LPCWSTR lpDisplayName; +} WIN_TRUST_SUBJECT_FILE_AND_DISPLAY, *LPWIN_TRUST_SUBJECT_FILE_AND_DISPLAY; + #define WIN_SPUB_ACTION_PUBLISHED_SOFTWARE \ { 0x64b9d180, 0x8da2, 0x11cf, { 0x87,0x36,0x00,0xaa,0x00,0xa4,0x85,0xeb }}

1 0

James Hawkins : cabinet: Add initial tests for FDI.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: fbf3cef55371a894e7098ef957f57624b3269108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf3cef55371a894e7098ef95… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Aug 28 17:28:35 2007 -0500 cabinet: Add initial tests for FDI. --- dlls/cabinet/tests/Makefile.in | 3 +- dlls/cabinet/tests/fdi.c | 577 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 579 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbf3cef55371a894e7098…

1 0

Roderick Colenbrander : wined3d: Ask for enough RGB bits for pbuffers.
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: 9be5a5e9dbc4127e655ce711d950630453965472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be5a5e9dbc4127e655ce711d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 28 22:40:26 2007 +0200 wined3d: Ask for enough RGB bits for pbuffers. --- dlls/wined3d/context.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6dce228..c7622cb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -136,7 +136,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar if(create_pbuffer) { HDC hdc_parent = GetDC(win_handle); int iPixelFormat = 0; - short red, green, blue, alphaBits, colorBits; + short redBits, greenBits, blueBits, alphaBits, colorBits; short depthBits, stencilBits; IWineD3DSurface *StencilSurface = This->stencilBufferTarget; @@ -147,11 +147,14 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar unsigned int nFormats; /* Retrieve the specifications for the pixelformat from the backbuffer / stencilbuffer */ - getColorBits(target->resource.format, &red, &green, &blue, &alphaBits, &colorBits); + getColorBits(target->resource.format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits); getDepthStencilBits(StencilBufferFormat, &depthBits, &stencilBits); PUSH2(WGL_DRAW_TO_PBUFFER_ARB, 1); /* We need pbuffer support; doublebuffering isn't needed */ PUSH2(WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB); /* Make sure we don't get a float or color index format */ PUSH2(WGL_COLOR_BITS_ARB, colorBits); + PUSH2(WGL_RED_BITS_ARB, redBits); + PUSH2(WGL_GREEN_BITS_ARB, greenBits); + PUSH2(WGL_BLUE_BITS_ARB, blueBits); PUSH2(WGL_ALPHA_BITS_ARB, alphaBits); PUSH2(WGL_DEPTH_BITS_ARB, depthBits); PUSH2(WGL_STENCIL_BITS_ARB, stencilBits);

1 0

Roderick Colenbrander : gdi32: Print the function name in wglGetProcAddress .
by Alexandre Julliard Aug. 29, 2007

Aug. 29, 2007

Module: wine Branch: master Commit: e6f6d5fe9502bd8cc2888d281eb76a6183e5024b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f6d5fe9502bd8cc2888d281… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Aug 29 00:40:46 2007 +0200 gdi32: Print the function name in wglGetProcAddress. --- dlls/gdi32/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 1aa027c..97ecaf6 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -285,7 +285,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR func) if(!func) return NULL; - TRACE("func: '%p'\n", func); + TRACE("func: '%s'\n", func); /* Retrieve the global hDC to get access to the driver. */ dc = OPENGL_GetDefaultDC();

1 0