September 2008 - Wine-Commits

Juan Lang : crypt32: Add CTLs to the file store.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: ec1e1b30cd16df61643e3e023fe350b996a6e94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1e1b30cd16df61643e3e023… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:33:03 2008 -0700 crypt32: Add CTLs to the file store. --- dlls/crypt32/filestore.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index 4c8c4a1..cfa29b3 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -88,6 +88,26 @@ static BOOL WINAPI CRYPT_FileDeleteCRL(HCERTSTORE hCertStore, return TRUE; } +static BOOL WINAPI CRYPT_FileWriteCTL(HCERTSTORE hCertStore, + PCCTL_CONTEXT ctl, DWORD dwFlags) +{ + PWINE_FILESTOREINFO store = (PWINE_FILESTOREINFO)hCertStore; + + TRACE("(%p, %p, %d)\n", hCertStore, ctl, dwFlags); + store->dirty = TRUE; + return TRUE; +} + +static BOOL WINAPI CRYPT_FileDeleteCTL(HCERTSTORE hCertStore, + PCCTL_CONTEXT pCtlContext, DWORD dwFlags) +{ + PWINE_FILESTOREINFO store = (PWINE_FILESTOREINFO)hCertStore; + + TRACE("(%p, %p, %08x)\n", hCertStore, pCtlContext, dwFlags); + store->dirty = TRUE; + return TRUE; +} + static BOOL CRYPT_ReadBlobFromFile(HANDLE file, PCERT_BLOB blob) { BOOL ret = TRUE; @@ -187,8 +207,8 @@ static void *fileProvFuncs[] = { CRYPT_FileDeleteCRL, NULL, /* CERT_STORE_PROV_SET_CRL_PROPERTY_FUNC */ NULL, /* CERT_STORE_PROV_READ_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_WRITE_CTL_FUNC */ - NULL, /* CERT_STORE_PROV_DELETE_CTL_FUNC */ + CRYPT_FileWriteCTL, + CRYPT_FileDeleteCTL, NULL, /* CERT_STORE_PROV_SET_CTL_PROPERTY_FUNC */ CRYPT_FileControl, };

1 0

Juan Lang : crypt32: Implement CertEnumCTLsInStore.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 7572f61f382f0b9f879cb5951b4c21e4dc79152f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7572f61f382f0b9f879cb5951… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:34:07 2008 -0700 crypt32: Implement CertEnumCTLsInStore. --- dlls/crypt32/ctl.c | 16 ++++++++++++++++ dlls/crypt32/store.c | 7 ------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 25b025b..e7c048e 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -52,6 +52,22 @@ BOOL WINAPI CertAddEncodedCTLToStore(HCERTSTORE hCertStore, return ret; } +PCCTL_CONTEXT WINAPI CertEnumCTLsInStore(HCERTSTORE hCertStore, + PCCTL_CONTEXT pPrev) +{ + WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore; + PCCTL_CONTEXT ret; + + TRACE("(%p, %p)\n", hCertStore, pPrev); + if (!hCertStore) + ret = NULL; + else if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + ret = NULL; + else + ret = (PCCTL_CONTEXT)hcs->ctls.enumContext(hcs, (void *)pPrev); + return ret; +} + PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded) { diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 998f548..fbc4133 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1106,13 +1106,6 @@ BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) return TRUE; } -PCCTL_CONTEXT WINAPI CertEnumCTLsInStore(HCERTSTORE hCertStore, - PCCTL_CONTEXT pPrev) -{ - FIXME("(%p, %p): stub\n", hCertStore, pPrev); - return NULL; -} - HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore) { WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore;

1 0

Juan Lang : crypt32: Implement CertDeleteCTLFromStore.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 7a2cedadbcd7ce32dc552e467d26c8423345500a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a2cedadbcd7ce32dc552e467… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:34:33 2008 -0700 crypt32: Implement CertDeleteCTLFromStore. --- dlls/crypt32/ctl.c | 27 +++++++++++++++++++++++++++ dlls/crypt32/store.c | 6 ------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index e7c048e..864f56d 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -68,6 +68,33 @@ PCCTL_CONTEXT WINAPI CertEnumCTLsInStore(HCERTSTORE hCertStore, return ret; } +BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) +{ + BOOL ret; + + TRACE("(%p)\n", pCtlContext); + + if (!pCtlContext) + ret = TRUE; + else if (!pCtlContext->hCertStore) + { + ret = TRUE; + CertFreeCTLContext(pCtlContext); + } + else + { + PWINECRYPT_CERTSTORE hcs = + (PWINECRYPT_CERTSTORE)pCtlContext->hCertStore; + + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + ret = FALSE; + else + ret = hcs->ctls.deleteContext(hcs, (void *)pCtlContext); + CertFreeCTLContext(pCtlContext); + } + return ret; +} + PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded) { diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index fbc4133..180740c 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1100,12 +1100,6 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, return TRUE; } -BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) -{ - FIXME("(%p): stub\n", pCtlContext); - return TRUE; -} - HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore) { WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore;

1 0

Juan Lang : crypt32: Add CTLs to the provider store.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 02784fb0dc1c7ab97461d7845976a3181d5ea589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02784fb0dc1c7ab97461d7845… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:32:39 2008 -0700 crypt32: Add CTLs to the provider store. --- dlls/crypt32/provstore.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/provstore.c b/dlls/crypt32/provstore.c index 33f765d..fba11eb 100644 --- a/dlls/crypt32/provstore.c +++ b/dlls/crypt32/provstore.c @@ -36,6 +36,8 @@ typedef struct _WINE_PROVIDERSTORE PFN_CERT_STORE_PROV_DELETE_CERT provDeleteCert; PFN_CERT_STORE_PROV_WRITE_CRL provWriteCrl; PFN_CERT_STORE_PROV_DELETE_CRL provDeleteCrl; + PFN_CERT_STORE_PROV_WRITE_CTL provWriteCtl; + PFN_CERT_STORE_PROV_DELETE_CTL provDeleteCtl; PFN_CERT_STORE_PROV_CONTROL provControl; } WINE_PROVIDERSTORE, *PWINE_PROVIDERSTORE; @@ -178,6 +180,73 @@ static BOOL CRYPT_ProvDeleteCRL(PWINECRYPT_CERTSTORE store, void *crl) return ret; } +static BOOL CRYPT_ProvAddCTL(PWINECRYPT_CERTSTORE store, void *ctl, + void *toReplace, const void **ppStoreContext) +{ + PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + BOOL ret; + + TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); + + if (toReplace) + ret = ps->memStore->ctls.addContext(ps->memStore, ctl, toReplace, + ppStoreContext); + else + { + if (ps->hdr.dwOpenFlags & CERT_STORE_READONLY_FLAG) + { + SetLastError(ERROR_ACCESS_DENIED); + ret = FALSE; + } + else + { + ret = TRUE; + if (ps->provWriteCtl) + ret = ps->provWriteCtl(ps->hStoreProv, (PCCTL_CONTEXT)ctl, + CERT_STORE_PROV_WRITE_ADD_FLAG); + if (ret) + ret = ps->memStore->ctls.addContext(ps->memStore, ctl, NULL, + ppStoreContext); + } + } + /* dirty trick: replace the returned context's hCertStore with + * store. + */ + if (ppStoreContext) + (*(PCTL_CONTEXT *)ppStoreContext)->hCertStore = store; + return ret; +} + +static void *CRYPT_ProvEnumCTL(PWINECRYPT_CERTSTORE store, void *pPrev) +{ + PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + void *ret; + + ret = ps->memStore->ctls.enumContext(ps->memStore, pPrev); + if (ret) + { + /* same dirty trick: replace the returned context's hCertStore with + * store. + */ + ((PCTL_CONTEXT)ret)->hCertStore = store; + } + return ret; +} + +static BOOL CRYPT_ProvDeleteCTL(PWINECRYPT_CERTSTORE store, void *ctl) +{ + PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store; + BOOL ret = TRUE; + + TRACE("(%p, %p)\n", store, ctl); + + if (ps->provDeleteCtl) + ret = ps->provDeleteCtl(ps->hStoreProv, ctl, 0); + if (ret) + ret = ps->memStore->ctls.deleteContext(ps->memStore, ctl); + return ret; +} + static BOOL WINAPI CRYPT_ProvControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { @@ -217,6 +286,9 @@ PWINECRYPT_CERTSTORE CRYPT_ProvCreateStore(DWORD dwFlags, ret->hdr.crls.addContext = CRYPT_ProvAddCRL; ret->hdr.crls.enumContext = CRYPT_ProvEnumCRL; ret->hdr.crls.deleteContext = CRYPT_ProvDeleteCRL; + ret->hdr.ctls.addContext = CRYPT_ProvAddCTL; + ret->hdr.ctls.enumContext = CRYPT_ProvEnumCTL; + ret->hdr.ctls.deleteContext = CRYPT_ProvDeleteCTL; ret->hdr.control = CRYPT_ProvControl; if (pProvInfo->cStoreProvFunc > CERT_STORE_PROV_CLOSE_FUNC) ret->provCloseStore = @@ -248,6 +320,18 @@ PWINECRYPT_CERTSTORE CRYPT_ProvCreateStore(DWORD dwFlags, else ret->provDeleteCrl = NULL; if (pProvInfo->cStoreProvFunc > + CERT_STORE_PROV_WRITE_CTL_FUNC) + ret->provWriteCtl = pProvInfo->rgpvStoreProvFunc[ + CERT_STORE_PROV_WRITE_CTL_FUNC]; + else + ret->provWriteCtl = NULL; + if (pProvInfo->cStoreProvFunc > + CERT_STORE_PROV_DELETE_CTL_FUNC) + ret->provDeleteCtl = pProvInfo->rgpvStoreProvFunc[ + CERT_STORE_PROV_DELETE_CTL_FUNC]; + else + ret->provDeleteCtl = NULL; + if (pProvInfo->cStoreProvFunc > CERT_STORE_PROV_CONTROL_FUNC) ret->provControl = pProvInfo->rgpvStoreProvFunc[ CERT_STORE_PROV_CONTROL_FUNC];

1 0

Juan Lang : crypt32: Add CTLs to the memory store.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: caf6a7dcbc52e24a35583ad611da7fc7cd1eccf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf6a7dcbc52e24a35583ad61… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:31:53 2008 -0700 crypt32: Add CTLs to the memory store. --- dlls/crypt32/crypt32_private.h | 1 + dlls/crypt32/store.c | 48 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index c080540..46bc8c5 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -227,6 +227,7 @@ typedef struct WINE_CRYPTCERTSTORE PFN_CERT_STORE_PROV_CLOSE closeStore; CONTEXT_FUNCS certs; CONTEXT_FUNCS crls; + CONTEXT_FUNCS ctls; PFN_CERT_STORE_PROV_CONTROL control; /* optional */ PCONTEXT_PROPERTY_LIST properties; } WINECRYPT_CERTSTORE, *PWINECRYPT_CERTSTORE; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 803fd40..998f548 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -91,6 +91,7 @@ typedef struct _WINE_MEMSTORE WINECRYPT_CERTSTORE hdr; struct ContextList *certs; struct ContextList *crls; + struct ContextList *ctls; } WINE_MEMSTORE, *PWINE_MEMSTORE; void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, DWORD dwFlags, @@ -229,6 +230,47 @@ static BOOL CRYPT_MemDeleteCrl(PWINECRYPT_CERTSTORE store, void *pCrlContext) return TRUE; } +static BOOL CRYPT_MemAddCtl(PWINECRYPT_CERTSTORE store, void *ctl, + void *toReplace, const void **ppStoreContext) +{ + WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; + PCTL_CONTEXT context; + + TRACE("(%p, %p, %p, %p)\n", store, ctl, toReplace, ppStoreContext); + + context = (PCTL_CONTEXT)ContextList_Add(ms->ctls, ctl, toReplace); + if (context) + { + context->hCertStore = store; + if (ppStoreContext) + *ppStoreContext = CertDuplicateCTLContext(context); + } + return context ? TRUE : FALSE; +} + +static void *CRYPT_MemEnumCtl(PWINECRYPT_CERTSTORE store, void *pPrev) +{ + WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; + void *ret; + + TRACE("(%p, %p)\n", store, pPrev); + + ret = ContextList_Enum(ms->ctls, pPrev); + if (!ret) + SetLastError(CRYPT_E_NOT_FOUND); + + TRACE("returning %p\n", ret); + return ret; +} + +static BOOL CRYPT_MemDeleteCtl(PWINECRYPT_CERTSTORE store, void *pCtlContext) +{ + WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store; + + ContextList_Delete(ms->ctls, pCtlContext); + return TRUE; +} + static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) { WINE_MEMSTORE *store = (WINE_MEMSTORE *)hCertStore; @@ -239,6 +281,7 @@ static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) ContextList_Free(store->certs); ContextList_Free(store->crls); + ContextList_Free(store->ctls); CRYPT_FreeStore((PWINECRYPT_CERTSTORE)store); } @@ -268,11 +311,16 @@ static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv, store->hdr.crls.addContext = CRYPT_MemAddCrl; store->hdr.crls.enumContext = CRYPT_MemEnumCrl; store->hdr.crls.deleteContext = CRYPT_MemDeleteCrl; + store->hdr.ctls.addContext = CRYPT_MemAddCtl; + store->hdr.ctls.enumContext = CRYPT_MemEnumCtl; + store->hdr.ctls.deleteContext = CRYPT_MemDeleteCtl; store->hdr.control = NULL; store->certs = ContextList_Create(pCertInterface, sizeof(CERT_CONTEXT)); store->crls = ContextList_Create(pCRLInterface, sizeof(CRL_CONTEXT)); + store->ctls = ContextList_Create(pCTLInterface, + sizeof(CTL_CONTEXT)); /* Mem store doesn't need crypto provider, so close it */ if (hCryptProv && !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) CryptReleaseContext(hCryptProv, 0);

1 0

Juan Lang : crypt32: Add CTLs to the collection store.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 3614bb7b4d812d6b1e447477d83a36e1343da2d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3614bb7b4d812d6b1e447477d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:32:17 2008 -0700 crypt32: Add CTLs to the collection store. --- dlls/crypt32/collectionstore.c | 81 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 9bf6d1d..41b644a 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -341,6 +341,84 @@ static BOOL CRYPT_CollectionDeleteCRL(PWINECRYPT_CERTSTORE store, return ret; } +static BOOL CRYPT_CollectionAddCTL(PWINECRYPT_CERTSTORE store, void *ctl, + void *toReplace, const void **ppStoreContext) +{ + BOOL ret; + void *childContext = NULL; + PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + + ret = CRYPT_CollectionAddContext(cs, offsetof(WINECRYPT_CERTSTORE, ctls), + ctl, toReplace, sizeof(CTL_CONTEXT), &childContext); + if (ppStoreContext && childContext) + { + PWINE_STORE_LIST_ENTRY storeEntry = *(PWINE_STORE_LIST_ENTRY *) + Context_GetExtra(childContext, sizeof(CTL_CONTEXT)); + PCTL_CONTEXT context = + CRYPT_CollectionCreateContextFromChild(cs, storeEntry, childContext, + sizeof(CTL_CONTEXT), TRUE); + + if (context) + context->hCertStore = store; + *ppStoreContext = context; + } + CertFreeCTLContext((PCCTL_CONTEXT)childContext); + return ret; +} + +static void *CRYPT_CollectionEnumCTL(PWINECRYPT_CERTSTORE store, void *pPrev) +{ + PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store; + void *ret; + + TRACE("(%p, %p)\n", store, pPrev); + + EnterCriticalSection(&cs->cs); + if (pPrev) + { + PWINE_STORE_LIST_ENTRY storeEntry = + *(PWINE_STORE_LIST_ENTRY *)Context_GetExtra(pPrev, + sizeof(CTL_CONTEXT)); + + ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, + &storeEntry->store->ctls, pCTLInterface, pPrev, sizeof(CTL_CONTEXT)); + } + else + { + if (!list_empty(&cs->stores)) + { + PWINE_STORE_LIST_ENTRY storeEntry = LIST_ENTRY(cs->stores.next, + WINE_STORE_LIST_ENTRY, entry); + + ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, + &storeEntry->store->ctls, pCTLInterface, NULL, + sizeof(CTL_CONTEXT)); + } + else + { + SetLastError(CRYPT_E_NOT_FOUND); + ret = NULL; + } + } + LeaveCriticalSection(&cs->cs); + if (ret) + ((PCTL_CONTEXT)ret)->hCertStore = store; + TRACE("returning %p\n", ret); + return ret; +} + +static BOOL CRYPT_CollectionDeleteCTL(PWINECRYPT_CERTSTORE store, + void *pCtlContext) +{ + BOOL ret; + + TRACE("(%p, %p)\n", store, pCtlContext); + + ret = CertDeleteCTLFromStore((PCCTL_CONTEXT) + Context_GetLinkedContext(pCtlContext, sizeof(CTL_CONTEXT))); + return ret; +} + PWINECRYPT_CERTSTORE CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara) { @@ -365,6 +443,9 @@ PWINECRYPT_CERTSTORE CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv, store->hdr.crls.addContext = CRYPT_CollectionAddCRL; store->hdr.crls.enumContext = CRYPT_CollectionEnumCRL; store->hdr.crls.deleteContext = CRYPT_CollectionDeleteCRL; + store->hdr.ctls.addContext = CRYPT_CollectionAddCTL; + store->hdr.ctls.enumContext = CRYPT_CollectionEnumCTL; + store->hdr.ctls.deleteContext = CRYPT_CollectionDeleteCTL; InitializeCriticalSection(&store->cs); store->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PWINE_COLLECTIONSTORE->cs"); list_init(&store->stores);

1 0

Juan Lang : crypt32: Implement CertAddEncodedCTLToStore.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: aebb9372070ba1886a8029d289f136701623843e URL: http://source.winehq.org/git/wine.git/?a=commit;h=aebb9372070ba1886a8029d28… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:31:16 2008 -0700 crypt32: Implement CertAddEncodedCTLToStore. --- dlls/crypt32/ctl.c | 23 +++++++++++++++++++++++ dlls/crypt32/store.c | 10 ---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 1513287..25b025b 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -29,6 +29,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); +BOOL WINAPI CertAddEncodedCTLToStore(HCERTSTORE hCertStore, + DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded, + DWORD dwAddDisposition, PCCTL_CONTEXT *ppCtlContext) +{ + PCCTL_CONTEXT ctl = CertCreateCTLContext(dwMsgAndCertEncodingType, + pbCtlEncoded, cbCtlEncoded); + BOOL ret; + + TRACE("(%p, %08x, %p, %d, %08x, %p)\n", hCertStore, + dwMsgAndCertEncodingType, pbCtlEncoded, cbCtlEncoded, dwAddDisposition, + ppCtlContext); + + if (ctl) + { + ret = CertAddCTLContextToStore(hCertStore, ctl, dwAddDisposition, + ppCtlContext); + CertFreeCTLContext(ctl); + } + else + ret = FALSE; + return ret; +} + PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded) { diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index ff95a97..803fd40 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1043,16 +1043,6 @@ PCCRL_CONTEXT WINAPI CertEnumCRLsInStore(HCERTSTORE hCertStore, return ret; } -BOOL WINAPI CertAddEncodedCTLToStore(HCERTSTORE hCertStore, - DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded, - DWORD dwAddDisposition, PCCTL_CONTEXT *ppCtlContext) -{ - FIXME("(%p, %08x, %p, %d, %08x, %p): stub\n", hCertStore, - dwMsgAndCertEncodingType, pbCtlEncoded, cbCtlEncoded, dwAddDisposition, - ppCtlContext); - return FALSE; -} - BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition, PCCTL_CONTEXT* ppStoreContext)

1 0

Juan Lang : crypt32: Add support for CTL properties.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 0ada2b93f9e3a92d675eae24e49490300941a52a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ada2b93f9e3a92d675eae24e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:30:19 2008 -0700 crypt32: Add support for CTL properties. --- dlls/crypt32/ctl.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/store.c | 22 ----- dlls/crypt32/tests/ctl.c | 6 -- 3 files changed, 212 insertions(+), 28 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 728d008..2a5b468 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -175,3 +175,215 @@ BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCTLContext) CTLDataContext_Free); return TRUE; } + +DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, + DWORD dwPropId) +{ + PCONTEXT_PROPERTY_LIST properties = Context_GetProperties( + (void *)pCTLContext, sizeof(CTL_CONTEXT)); + DWORD ret; + + TRACE("(%p, %d)\n", pCTLContext, dwPropId); + + if (properties) + ret = ContextPropertyList_EnumPropIDs(properties, dwPropId); + else + ret = 0; + return ret; +} + +static BOOL CTLContext_SetProperty(PCCTL_CONTEXT context, DWORD dwPropId, + DWORD dwFlags, const void *pvData); + +static BOOL CTLContext_GetHashProp(PCCTL_CONTEXT context, DWORD dwPropId, + ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData, + DWORD *pcbData) +{ + BOOL ret = CryptHashCertificate(0, algID, 0, toHash, toHashLen, pvData, + pcbData); + if (ret) + { + CRYPT_DATA_BLOB blob = { *pcbData, pvData }; + + ret = CTLContext_SetProperty(context, dwPropId, 0, &blob); + } + return ret; +} + +static BOOL CTLContext_GetProperty(PCCTL_CONTEXT context, DWORD dwPropId, + void *pvData, DWORD *pcbData) +{ + PCONTEXT_PROPERTY_LIST properties = + Context_GetProperties(context, sizeof(CTL_CONTEXT)); + BOOL ret; + CRYPT_DATA_BLOB blob; + + TRACE("(%p, %d, %p, %p)\n", context, dwPropId, pvData, pcbData); + + if (properties) + ret = ContextPropertyList_FindProperty(properties, dwPropId, &blob); + else + ret = FALSE; + if (ret) + { + if (!pvData) + *pcbData = blob.cbData; + else if (*pcbData < blob.cbData) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = blob.cbData; + ret = FALSE; + } + else + { + memcpy(pvData, blob.pbData, blob.cbData); + *pcbData = blob.cbData; + } + } + else + { + /* Implicit properties */ + switch (dwPropId) + { + case CERT_SHA1_HASH_PROP_ID: + ret = CTLContext_GetHashProp(context, dwPropId, CALG_SHA1, + context->pbCtlEncoded, context->cbCtlEncoded, pvData, pcbData); + break; + case CERT_MD5_HASH_PROP_ID: + ret = CTLContext_GetHashProp(context, dwPropId, CALG_MD5, + context->pbCtlEncoded, context->cbCtlEncoded, pvData, pcbData); + break; + default: + SetLastError(CRYPT_E_NOT_FOUND); + } + } + TRACE("returning %d\n", ret); + return ret; +} + +BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, + DWORD dwPropId, void *pvData, DWORD *pcbData) +{ + BOOL ret; + + TRACE("(%p, %d, %p, %p)\n", pCTLContext, dwPropId, pvData, pcbData); + + switch (dwPropId) + { + case 0: + case CERT_CERT_PROP_ID: + case CERT_CRL_PROP_ID: + case CERT_CTL_PROP_ID: + SetLastError(E_INVALIDARG); + ret = FALSE; + break; + case CERT_ACCESS_STATE_PROP_ID: + if (!pvData) + { + *pcbData = sizeof(DWORD); + ret = TRUE; + } + else if (*pcbData < sizeof(DWORD)) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = sizeof(DWORD); + ret = FALSE; + } + else + { + if (pCTLContext->hCertStore) + ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, + pvData, pcbData); + else + *(DWORD *)pvData = 0; + ret = TRUE; + } + break; + default: + ret = CTLContext_GetProperty(pCTLContext, dwPropId, pvData, + pcbData); + } + return ret; +} + +static BOOL CTLContext_SetProperty(PCCTL_CONTEXT context, DWORD dwPropId, + DWORD dwFlags, const void *pvData) +{ + PCONTEXT_PROPERTY_LIST properties = + Context_GetProperties(context, sizeof(CTL_CONTEXT)); + BOOL ret; + + TRACE("(%p, %d, %08x, %p)\n", context, dwPropId, dwFlags, pvData); + + if (!properties) + ret = FALSE; + else if (!pvData) + { + ContextPropertyList_RemoveProperty(properties, dwPropId); + ret = TRUE; + } + else + { + switch (dwPropId) + { + case CERT_AUTO_ENROLL_PROP_ID: + case CERT_CTL_USAGE_PROP_ID: /* same as CERT_ENHKEY_USAGE_PROP_ID */ + case CERT_DESCRIPTION_PROP_ID: + case CERT_FRIENDLY_NAME_PROP_ID: + case CERT_HASH_PROP_ID: + case CERT_KEY_IDENTIFIER_PROP_ID: + case CERT_MD5_HASH_PROP_ID: + case CERT_NEXT_UPDATE_LOCATION_PROP_ID: + case CERT_PUBKEY_ALG_PARA_PROP_ID: + case CERT_PVK_FILE_PROP_ID: + case CERT_SIGNATURE_HASH_PROP_ID: + case CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID: + case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: + case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: + case CERT_ENROLLMENT_PROP_ID: + case CERT_CROSS_CERT_DIST_POINTS_PROP_ID: + case CERT_RENEWAL_PROP_ID: + { + PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvData; + + ret = ContextPropertyList_SetProperty(properties, dwPropId, + blob->pbData, blob->cbData); + break; + } + case CERT_DATE_STAMP_PROP_ID: + ret = ContextPropertyList_SetProperty(properties, dwPropId, + (const BYTE *)pvData, sizeof(FILETIME)); + break; + default: + FIXME("%d: stub\n", dwPropId); + ret = FALSE; + } + } + TRACE("returning %d\n", ret); + return ret; +} + +BOOL WINAPI CertSetCTLContextProperty(PCCTL_CONTEXT pCTLContext, + DWORD dwPropId, DWORD dwFlags, const void *pvData) +{ + BOOL ret; + + TRACE("(%p, %d, %08x, %p)\n", pCTLContext, dwPropId, dwFlags, pvData); + + /* Handle special cases for "read-only"/invalid prop IDs. Windows just + * crashes on most of these, I'll be safer. + */ + switch (dwPropId) + { + case 0: + case CERT_ACCESS_STATE_PROP_ID: + case CERT_CERT_PROP_ID: + case CERT_CRL_PROP_ID: + case CERT_CTL_PROP_ID: + SetLastError(E_INVALIDARG); + return FALSE; + } + ret = CTLContext_SetProperty(pCTLContext, dwPropId, dwFlags, pvData); + TRACE("returning %d\n", ret); + return ret; +} diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 9ce6be4..a3bd06b 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1234,28 +1234,6 @@ BOOL WINAPI CertSetStoreProperty(HCERTSTORE hCertStore, DWORD dwPropId, return ret; } -DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, - DWORD dwPropId) -{ - FIXME("(%p, %d): stub\n", pCTLContext, dwPropId); - return 0; -} - -BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, - DWORD dwPropId, void *pvData, DWORD *pcbData) -{ - FIXME("(%p, %d, %p, %p): stub\n", pCTLContext, dwPropId, pvData, pcbData); - return FALSE; -} - -BOOL WINAPI CertSetCTLContextProperty(PCCTL_CONTEXT pCTLContext, - DWORD dwPropId, DWORD dwFlags, const void *pvData) -{ - FIXME("(%p, %d, %08x, %p): stub\n", pCTLContext, dwPropId, dwFlags, - pvData); - return FALSE; -} - static LONG CRYPT_OpenParentStore(DWORD dwFlags, void *pvSystemStoreLocationPara, HKEY *key) { diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index bb3c2a9..cefca25 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -218,17 +218,13 @@ static void testCTLProperties(void) /* An implicit property */ ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, NULL, &size); - todo_wine ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError()); ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, &access, &size); - todo_wine ok(ret, "CertGetCTLContextProperty failed: %08x", GetLastError()); - todo_wine ok(!(access & CERT_ACCESS_STATE_WRITE_PERSIST_FLAG), "Didn't expect a persisted cert\n"); - todo_wine checkHash(signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent), CALG_SHA1, ctl, CERT_HASH_PROP_ID); @@ -242,10 +238,8 @@ static void testCTLProperties(void) if (propID) numProps++; } while (propID != 0); - todo_wine ok(numProps == 1, "Expected 1 properties, got %d\n", numProps); - todo_wine checkHash(signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent), CALG_MD5, ctl, CERT_MD5_HASH_PROP_ID);

1 0

Juan Lang : crypt32: Add tests for CertGetCTLContextProperty.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: b15ee4596529269340ddfda49428fca657488b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15ee4596529269340ddfda49… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:29:30 2008 -0700 crypt32: Add tests for CertGetCTLContextProperty. --- dlls/crypt32/tests/ctl.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 9d4eee4..bb3c2a9 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -173,7 +173,88 @@ static void testCreateCTL(void) CertFreeCTLContext(ctl); } +static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, + PCCTL_CONTEXT context, DWORD propID) +{ + BYTE hash[20] = { 0 }, hashProperty[20]; + BOOL ret; + DWORD size; + + memset(hash, 0, sizeof(hash)); + memset(hashProperty, 0, sizeof(hashProperty)); + size = sizeof(hash); + ret = CryptHashCertificate(0, algID, 0, data, dataLen, hash, &size); + ret = CertGetCTLContextProperty(context, propID, hashProperty, &size); + ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError()); + if (ret) + ok(!memcmp(hash, hashProperty, size), + "Unexpected hash for property %d\n", propID); +} + +static void testCTLProperties(void) +{ + PCCTL_CONTEXT ctl; + BOOL ret; + DWORD propID, numProps, access, size; + + ctl = CertCreateCTLContext(X509_ASN_ENCODING, + signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent)); + if (!ctl) + { + skip("CertCreateCTLContext failed: %08x\n", GetLastError()); + return; + } + + /* No properties as yet */ + propID = 0; + numProps = 0; + do { + propID = CertEnumCTLContextProperties(ctl, propID); + if (propID) + numProps++; + } while (propID != 0); + ok(numProps == 0, "Expected 0 properties, got %d\n", numProps); + + /* An implicit property */ + ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, NULL, + &size); + todo_wine + ok(ret, "CertGetCTLContextProperty failed: %08x\n", GetLastError()); + ret = CertGetCTLContextProperty(ctl, CERT_ACCESS_STATE_PROP_ID, &access, + &size); + todo_wine + ok(ret, "CertGetCTLContextProperty failed: %08x", GetLastError()); + todo_wine + ok(!(access & CERT_ACCESS_STATE_WRITE_PERSIST_FLAG), + "Didn't expect a persisted cert\n"); + + todo_wine + checkHash(signedCTLWithCTLInnerContent, + sizeof(signedCTLWithCTLInnerContent), CALG_SHA1, ctl, CERT_HASH_PROP_ID); + + /* Now that the hash property is set, we should get one property when + * enumerating. + */ + propID = 0; + numProps = 0; + do { + propID = CertEnumCTLContextProperties(ctl, propID); + if (propID) + numProps++; + } while (propID != 0); + todo_wine + ok(numProps == 1, "Expected 1 properties, got %d\n", numProps); + + todo_wine + checkHash(signedCTLWithCTLInnerContent, + sizeof(signedCTLWithCTLInnerContent), CALG_MD5, ctl, + CERT_MD5_HASH_PROP_ID); + + CertFreeCTLContext(ctl); +} + START_TEST(ctl) { testCreateCTL(); + testCTLProperties(); }

1 0

Juan Lang : crypt32: Implement CertDuplicateCTLContext.
by Alexandre Julliard Sept. 2, 2008

Sept. 2, 2008

Module: wine Branch: master Commit: 3eb62ad60bfc08691f59b357e5167958f5a3c4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eb62ad60bfc08691f59b357e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 29 07:30:45 2008 -0700 crypt32: Implement CertDuplicateCTLContext. --- dlls/crypt32/ctl.c | 7 +++++++ dlls/crypt32/store.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 2a5b468..1513287 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -156,6 +156,13 @@ end: return (PCCTL_CONTEXT)ctl; } +PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) +{ + TRACE("(%p)\n", pCtlContext); + Context_AddRef((void *)pCtlContext, sizeof(CTL_CONTEXT)); + return pCtlContext; +} + static void CTLDataContext_Free(void *context) { PCTL_CONTEXT ctlContext = (PCTL_CONTEXT)context; diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index a3bd06b..ff95a97 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1062,12 +1062,6 @@ BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore, return TRUE; } -PCCTL_CONTEXT WINAPI CertDuplicateCTLContext(PCCTL_CONTEXT pCtlContext) -{ - FIXME("(%p): stub\n", pCtlContext ); - return pCtlContext; -} - BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) { FIXME("(%p): stub\n", pCtlContext);

1 0