Juan Lang : crypt32: Add support for CTL properties.
Alexandre Julliard
julliard at winehq.org
Tue Sep 2 08:32:48 CDT 2008
Module: wine
Branch: master
Commit: 0ada2b93f9e3a92d675eae24e49490300941a52a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ada2b93f9e3a92d675eae24e49490300941a52a
Author: Juan Lang <juan.lang at 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);
More information about the wine-cvs
mailing list