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

Juan Lang : crypt32: Set return value on exception.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 714a3731eb92261735900e245ae1c91d7bd4c232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=714a3731eb92261735900e245… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 11:32:33 2007 -0700 crypt32: Set return value on exception. Spotted by Paul Vriens. --- dlls/crypt32/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 70527bd..a68bf52 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -209,6 +209,7 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, __EXCEPT_PAGE_FAULT { SetLastError(STATUS_ACCESS_VIOLATION); + ret = FALSE; } __ENDTRY; }

1 0

Juan Lang : crypt32: Add initial tests for certificate chains.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: abd6feaf9350939a6b6886b4ef933a5b83539ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd6feaf9350939a6b6886b4e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 14:36:29 2007 -0700 crypt32: Add initial tests for certificate chains. --- dlls/crypt32/tests/chain.c | 118 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 8e5f627..48e1fc6 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -102,7 +102,125 @@ static void testCreateCertChainEngine(void) CertCloseStore(store, 0); } +static const BYTE bigCert[] = { 0x30, 0x7a, 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, 0x07, 0x30, 0x02, 0x06, 0x00, 0x03, 0x01, + 0x00, 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 testGetCertChain(void) +{ + BOOL ret; + CERT_CHAIN_ENGINE_CONFIG config = { 0 }; + HCERTCHAINENGINE engine; + PCCERT_CONTEXT cert; + CERT_CHAIN_PARA para = { 0 }; + PCCERT_CHAIN_CONTEXT chain; + HCERTSTORE store; + + /* Basic parameter checks */ + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, NULL, 0, NULL, + &chain); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* Crash + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, &para, 0, NULL, NULL); + ret = CertGetCertificateChain(NULL, NULL, NULL, NULL, &para, 0, NULL, + &chain); + */ + cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, + sizeof(bigCert)); + todo_wine + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + /* Crash + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, NULL); + */ + + /* Tests with an invalid cert (one whose signature is bad) */ + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + &chain); + ok(!ret, "Expected failure\n"); + para.cbSize = sizeof(para); + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + &chain); + ok(!ret, "Expected failure\n"); + CertFreeCertificateContext(cert); + + /* Tests with a valid cert that doesn't trace back to a trusted root */ + cert = CertCreateCertificateContext(X509_ASN_ENCODING, selfSignedCert, + sizeof(selfSignedCert)); + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); + ret = CertGetCertificateChain(NULL, cert, NULL, NULL, &para, 0, NULL, + &chain); + todo_wine + ok(ret, "CertGetCertificateChain failed: %08x\n", GetLastError()); + todo_wine + ok(chain != NULL, "Expected a chain\n"); + if (chain) + { + ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT, + "Expected CERT_TRUST_IS_UNTRUSTED_ROOT, got %08x\n", + chain->TrustStatus.dwErrorStatus); + ok(chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, + "Expected CERT_TRUST_HAS_PREFERRED_ISSUER, got %08x\n", + chain->TrustStatus.dwInfoStatus); + ok(chain->cChain == 1, "Expected 1 chain, got %d\n", chain->cChain); + ok(chain->rgpChain[0]->cElement == 1, + "Expected one chain element, got %d\n", chain->rgpChain[0]->cElement); + ok(chain->rgpChain[0]->pTrustListInfo == NULL, + "Expected no trust list\n"); + CertFreeCertificateChain(chain); + } + + /* A self-signed cert isn't affected by having no chain to a trusted root */ + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + config.cbSize = sizeof(config); + config.hRestrictedRoot = store; + ret = CertCreateCertificateChainEngine(&config, &engine); + ok(ret, "CertCreateCertificateChainEngine failed: %08x\n", GetLastError()); + ret = CertGetCertificateChain(engine, cert, NULL, NULL, &para, 0, NULL, + &chain); + todo_wine + ok(chain != NULL, "Expected a chain\n"); + if (chain) + { + ok(chain->TrustStatus.dwErrorStatus & CERT_TRUST_IS_UNTRUSTED_ROOT, + "Expected CERT_TRUST_IS_UNTRUSTED_ROOT, got %08x\n", + chain->TrustStatus.dwErrorStatus); + ok(chain->TrustStatus.dwInfoStatus == CERT_TRUST_HAS_PREFERRED_ISSUER, + "Expected CERT_TRUST_HAS_PREFERRED_ISSUER, got %08x\n", + chain->TrustStatus.dwInfoStatus); + ok(chain->cChain == 1, "Expected 1 chain, got %d\n", chain->cChain); + ok(chain->rgpChain[0]->cElement == 1, + "Expected one chain element, got %d\n", chain->rgpChain[0]->cElement); + ok(chain->rgpChain[0]->pTrustListInfo == NULL, + "Expected no trust list\n"); + CertFreeCertificateChain(chain); + } + CertFreeCertificateChainEngine(engine); + CertCloseStore(store, 0); + CertFreeCertificateContext(cert); +} + START_TEST(chain) { testCreateCertChainEngine(); + testGetCertChain(); }

1 0

Juan Lang : crypt32: Add a chain test with real certificates.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 51651c7c5c0c6c086934f1eef13804208129c5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=51651c7c5c0c6c086934f1eef… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 15:10:35 2007 -0700 crypt32: Add a chain test with real certificates. --- dlls/crypt32/tests/chain.c | 437 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 437 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51651c7c5c0c6c086934f…

1 0

Juan Lang : crypt32: Set output chain to NULL.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 0b2b1f88818c19bb58c26c748e0475aa51e51501 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b2b1f88818c19bb58c26c748… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 14:35:31 2007 -0700 crypt32: Set output chain to NULL. --- dlls/crypt32/chain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a244715..127739a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -180,6 +180,8 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, pCertContext, pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); + if (ppChainContext) + *ppChainContext = NULL; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; }

1 0

Juan Lang : crypt32: Move CertGetCertificateChain to chain.c.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 1547f39800e6759b9dcc7f092a15c5eb29e73c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1547f39800e6759b9dcc7f092… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 14:30:42 2007 -0700 crypt32: Move CertGetCertificateChain to chain.c. --- dlls/crypt32/cert.c | 12 ------------ dlls/crypt32/chain.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index d67278d..4e5fcfd 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2431,15 +2431,3 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN CryptReleaseContext(hProv, 0); return context; } - -BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, - PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, - PCERT_CHAIN_PARA pChainPara, DWORD dwFlags, LPVOID pvReserved, - PCCERT_CHAIN_CONTEXT* ppChainContext) -{ - FIXME(" %p %p %p %p %p 0x%08X %p %p - stub\n",hChainEngine, pCertContext, - pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 03267db..ff2c0e0 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -170,3 +170,16 @@ void WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) CryptMemFree(engine); } } + +BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, + PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + PCERT_CHAIN_PARA pChainPara, DWORD dwFlags, LPVOID pvReserved, + PCCERT_CHAIN_CONTEXT* ppChainContext) +{ + FIXME("(%p, %p, %p, %p, %p, 0x%08X, %p, %p): stub\n", hChainEngine, + pCertContext, pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, + ppChainContext); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Juan Lang : crypt32: Add stub for CertFreeCertificateChain.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 466d8a01a5af51f802ccc6cc5bd1ecfd206a5321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=466d8a01a5af51f802ccc6cc5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 14:34:59 2007 -0700 crypt32: Add stub for CertFreeCertificateChain. --- dlls/crypt32/chain.c | 5 +++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ff2c0e0..a244715 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -183,3 +183,8 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) +{ + FIXME("(%p): stub\n", pChainContext); +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 8fbaecd..bae473c 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -45,7 +45,7 @@ @ stub CertFindSubjectInCTL @ stdcall CertFreeCRLContext(ptr) @ stdcall CertFreeCTLContext(ptr) -@ stub CertFreeCertificateChain +@ stdcall CertFreeCertificateChain(ptr) @ stdcall CertFreeCertificateChainEngine(ptr) @ stdcall CertFreeCertificateContext(ptr) @ stdcall CertGetCRLContextProperty(ptr long ptr ptr)

1 0

Juan Lang : crypt32: Fix typo.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 7316156d35fbf6f75de6486759e8beefc8f2a088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7316156d35fbf6f75de648675… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 14:30:07 2007 -0700 crypt32: Fix typo. --- dlls/crypt32/store.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index d5e7734..2c09335 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -488,7 +488,7 @@ static void *CRYPT_CollectionAdvanceEnum(PWINE_COLLECTIONSTORE store, pPrev = NULL; } else - child = storeEntry->store->certs.enumContext(storeEntry->store, NULL); + child = contextStore->enumContext(storeEntry->store, NULL); if (child) ret = CRYPT_CollectionCreateContextFromChild(store, storeEntry, child, contextSize, FALSE);

1 0

Juan Lang : crypt32: Fix typo.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: f1cb8057e71fccfb503d093df99ca686ed3191ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1cb8057e71fccfb503d093df… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 14:29:41 2007 -0700 crypt32: Fix typo. --- dlls/crypt32/store.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index edf5e6c..d5e7734 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -819,7 +819,7 @@ static void *CRYPT_ProvEnumCRL(PWINECRYPT_CERTSTORE store, void *pPrev) /* same dirty trick: replace the returned context's hCertStore with * store. */ - ((PCERT_CONTEXT)ret)->hCertStore = store; + ((PCRL_CONTEXT)ret)->hCertStore = store; } return ret; }

1 0

Juan Lang : wintrust: Forward WinVerifyTrustEx to WinVerifyTrust.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: 33407c63978c6d801b06f5f9892344e98e0525d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33407c63978c6d801b06f5f98… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 10:17:41 2007 -0700 wintrust: Forward WinVerifyTrustEx to WinVerifyTrust. --- dlls/wintrust/wintrust_main.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 2967860..5e025d9 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -94,8 +94,7 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, LPVOID ActionData ) HRESULT WINAPI WinVerifyTrustEx( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData ) { - FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); - return S_OK; + return WinVerifyTrust(hwnd, ActionID, ActionData); } /***********************************************************************

1 0

Juan Lang : wintrust: Implement WTHelperProvDataFromStateData.
by Alexandre Julliard Aug. 15, 2007

Aug. 15, 2007

Module: wine Branch: master Commit: ba0b7a5de34ee0873b3e4d2c2065bc1236061a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0b7a5de34ee0873b3e4d2c2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 14 10:16:43 2007 -0700 wintrust: Implement WTHelperProvDataFromStateData. --- dlls/wintrust/wintrust_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index f93cb07..2967860 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -146,8 +146,8 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( */ CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData) { - FIXME("%p\n", hStateData); - return NULL; + TRACE("%p\n", hStateData); + return (CRYPT_PROVIDER_DATA *)hStateData; } static const WCHAR Software_Publishing[] = {

1 0