October 2007 - Wine-Commits

Juan Lang : wintrust: In SoftpubLoadSignature, don' t assume a message is present.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: d7d4a5c4a96d662abe79268b6e956145e85493d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d4a5c4a96d662abe79268b6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 12:47:03 2007 -0700 wintrust: In SoftpubLoadSignature, don't assume a message is present. --- dlls/wintrust/softpub.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 59e4966..5a2aab5 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -452,28 +452,34 @@ static BOOL WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { BOOL ret; - DWORD signerCount, size; TRACE("(%p)\n", data); if (!data->padwTrustStepErrors) return S_FALSE; - size = sizeof(signerCount); - ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0, - &signerCount, &size); - if (ret) + if (data->hMsg) { - DWORD i; + DWORD signerCount, size; - for (i = 0; ret && i < signerCount; i++) + size = sizeof(signerCount); + ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0, + &signerCount, &size); + if (ret) { - if ((ret = WINTRUST_SaveSigner(data, i))) - ret = WINTRUST_VerifySigner(data, i); + DWORD i; + + for (i = 0; ret && i < signerCount; i++) + { + if ((ret = WINTRUST_SaveSigner(data, i))) + ret = WINTRUST_VerifySigner(data, i); + } } + else + SetLastError(TRUST_E_NOSIGNATURE); } else - SetLastError(TRUST_E_NOSIGNATURE); + ret = TRUE; if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = GetLastError();

1 0

Jacek Caban : mshtml: Remove no longer used defines.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 2826a0f08bd49d4129264a021e97c5d196b030bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2826a0f08bd49d4129264a021… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 29 03:40:46 2007 +0200 mshtml: Remove no longer used defines. --- dlls/mshtml/olecmd.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 595107a..b33d305 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -41,22 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -#define NSCMD_BOLD "cmd_bold" #define NSCMD_COPY "cmd_copy" -#define NSCMD_ITALIC "cmd_italic" -#define NSCMD_UNDERLINE "cmd_underline" -#define NSCMD_ALIGN "cmd_align" -#define NSCMD_INDENT "cmd_indent" -#define NSCMD_OUTDENT "cmd_outdent" -#define NSCMD_INSERTHR "cmd_insertHR" -#define NSCMD_UL "cmd_ul" -#define NSCMD_OL "cmd_ol" - -#define NSSTATE_ATTRIBUTE "state_attribute" - -#define NSALIGN_CENTER "center" -#define NSALIGN_LEFT "left" -#define NSALIGN_RIGHT "right" void do_ns_command(NSContainer *This, const char *cmd, nsICommandParams *nsparam) {

1 0

Juan Lang : crypt32: Correct copying a signer info's attributes.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 2fb3d533475441056ada3dda2be28820162d8a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb3d533475441056ada3dda2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 16:12:41 2007 -0700 crypt32: Correct copying a signer info's attributes. --- 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 df93c79..15fbbc9 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1776,6 +1776,7 @@ static inline void CRYPT_CopyAttributes(CRYPT_ATTRIBUTES *out, if ((*nextData - (LPBYTE)0) % sizeof(DWORD_PTR)) *nextData += (*nextData - (LPBYTE)0) % sizeof(DWORD_PTR); out->rgAttr[i].rgValue = (PCRYPT_DATA_BLOB)*nextData; + *nextData += in->rgAttr[i].cValue * sizeof(CRYPT_DATA_BLOB); for (j = 0; j < in->rgAttr[i].cValue; j++) CRYPT_CopyBlob(&out->rgAttr[i].rgValue[j], &in->rgAttr[i].rgValue[j], nextData);

1 0

Juan Lang : wincrypt.h: Add a few more definitions.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 5bc2c2045ebb9785348570db367f182fb25750e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc2c2045ebb9785348570db3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 14:56:45 2007 -0700 wincrypt.h: Add a few more definitions. --- include/wincrypt.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 0518310..f59bd79 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -39,6 +39,7 @@ typedef void *HCRYPTMSG; typedef void *HCERTSTOREPROV; typedef void *HCRYPTOIDFUNCSET; typedef void *HCRYPTOIDFUNCADDR; +typedef void *HCRYPTDEFAULTCONTEXT; /* CSP Structs */ @@ -2269,6 +2270,10 @@ static const WCHAR CERT_PHYSICAL_STORE_AUTH_ROOT_NAME[] = #define CERT_ACCESS_STATE_SYSTEM_STORE_FLAG 0x2 #define CERT_ACCESS_STATE_LM_SYSTEM_STORE_FLAG 0x4 +/* CertSetCertificateContextProperty flags */ +#define CERT_SET_PROPERTY_INHIBIT_PERSIST_FLAG 0x40000000 +#define CERT_SET_PROPERTY_IGNORE_PERSIST_ERROR_FLAG 0x80000000 + /* CERT_RDN attribute dwValueType types */ #define CERT_RDN_TYPE_MASK 0x000000ff #define CERT_RDN_ANY_TYPE 0 @@ -2300,6 +2305,10 @@ static const WCHAR CERT_PHYSICAL_STORE_AUTH_ROOT_NAME[] = #define IS_CERT_RDN_CHAR_STRING(x) \ (((x) & CERT_RDN_TYPE_MASK) >= CERT_RDN_NUMERIC_STRING) +/* CertIsRDNAttrsInCertificateName flags */ +#define CERT_UNICODE_IS_RDN_ATTRS_FLAG 0x1 +#define CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG 0x2 + /* CRL reason codes */ #define CRL_REASON_UNSPECIFIED 0 #define CRL_REASON_KEY_COMPROMISE 1 @@ -3398,6 +3407,18 @@ typedef struct _CMSG_CTRL_VERIFY_SIGNATURE_EX_PARA { #define CMSG_ENVELOPED_DATA_PKCS_1_5_VERSION CMSG_ENVELOPED_DATA_V0 #define CMSG_ENVELOPED_DATA_CMS_VERSION CMSG_ENVELOPED_DATA_V2 +/* CryptMsgGetAndVerifySigner flags */ +#define CMSG_TRUSTED_SIGNER_FLAG 0x1 +#define CMSG_SIGNER_ONLY_FLAG 0x2 +#define CMSG_USE_SIGNER_INDEX_FLAG 0x4 + +/* CryptMsgSignCTL flags */ +#define CMSG_CMS_ENCAPSULATED_CTL_FLAG 0x00008000 + +/* CryptMsgEncodeAndSignCTL flags */ +#define CMSG_ENCODED_SORTED_CTL_FLAG 0x1 +#define CMSG_ENCODE_HASHED_SUBJECT_IDENTIFIER_FLAG 0x2 + /* function declarations */ /* advapi32.dll */ BOOL WINAPI CryptAcquireContextA(HCRYPTPROV *phProv, LPCSTR pszContainer, @@ -3524,6 +3545,11 @@ BOOL WINAPI CryptFreeOIDFunctionAddress(HCRYPTOIDFUNCADDR hFuncAddr, BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, DWORD dwEncodingType, LPCSTR pszFuncName, DWORD cFuncEntry, const CRYPT_OID_FUNC_ENTRY rgFuncEntry[], DWORD dwFlags); +BOOL WINAPI CryptInstallDefaultContext(HCRYPTPROV hCryptProv, + DWORD dwDefaultType, const void *pvDefaultPara, DWORD dwFlags, + void *pvReserved, HCRYPTDEFAULTCONTEXT *phDefaultContext); +BOOL WINAPI CryptUninstallDefaultContext(HCRYPTDEFAULTCONTEXT hDefaultContext, + DWORD dwFlags, void *pvReserved); BOOL WINAPI CryptEnumOIDInfo(DWORD dwGroupId, DWORD dwFlags, void *pvArg, PFN_CRYPT_ENUM_OID_INFO pfnEnumOIDInfo); @@ -3618,6 +3644,10 @@ BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext, DWORD WINAPI CertEnumCTLContextProperties(PCCTL_CONTEXT pCTLContext, DWORD dwPropId); +BOOL WINAPI CertEnumSubjectInSortedCTL(PCCTL_CONTEXT pCTLContext, + void **ppvNextSubject, PCRYPT_DER_BLOB pSubjectIdentifier, + PCRYPT_DER_BLOB pEncodedAttributes); + BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, DWORD dwPropId, void *pvData, DWORD *pcbData); @@ -3827,6 +3857,13 @@ PCERT_EXTENSION WINAPI CertFindExtension(LPCSTR pszObjId, DWORD cExtensions, CERT_EXTENSION rgExtensions[]); PCERT_RDN_ATTR WINAPI CertFindRDNAttr(LPCSTR pszObjId, PCERT_NAME_INFO pName); +BOOL WINAPI CertFindSubjectInSortedCTL(PCRYPT_DATA_BLOB pSubjectIdentifier, + PCCTL_CONTEXT pCtlContext, DWORD dwFlags, void *pvReserved, + PCRYPT_DER_BLOB pEncodedAttributes); + +BOOL WINAPI CertIsRDNAttrsInCertificateName(DWORD dwCertEncodingType, + DWORD dwFlags, PCERT_NAME_BLOB pCertName, PCERT_RDN pRDN); + BOOL WINAPI CertIsValidCRLForCertificate(PCCERT_CONTEXT pCert, PCCRL_CONTEXT pCrl, DWORD dwFlags, void *pvReserved); BOOL WINAPI CertFindCertificateInCRL(PCCERT_CONTEXT pCert, @@ -3922,6 +3959,14 @@ BOOL WINAPI CryptMsgCountersignEncoded(DWORD dwEncodingType, PBYTE pbSignerInfo, HCRYPTMSG WINAPI CryptMsgDuplicate(HCRYPTMSG hCryptMsg); +BOOL WINAPI CryptMsgEncodeAndSignCTL(DWORD dwMsgEncodingType, + PCTL_INFO pCtlInfo, PCMSG_SIGNED_ENCODE_INFO pSignInfo, DWORD dwFlags, + BYTE *pbEncoded, DWORD *pcbEncoded); + +BOOL WINAPI CryptMsgGetAndVerifySigner(HCRYPTMSG hCryptMsg, DWORD cSignerStore, + HCERTSTORE *rghSignerStore, DWORD dwFlags, PCCERT_CONTEXT *ppSigner, + DWORD *pdwSignerIndex); + BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType, DWORD dwIndex, void *pvData, DWORD *pcbData); @@ -3933,6 +3978,10 @@ HCRYPTMSG WINAPI CryptMsgOpenToEncode(DWORD dwMsgEncodingType, DWORD dwFlags, DWORD dwMsgType, const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID, PCMSG_STREAM_INFO pStreamInfo); +BOOL WINAPI CryptMsgSignCTL(DWORD dwMsgEncodingType, BYTE *pbCtlContent, + DWORD cbCtlContent, PCMSG_SIGNED_ENCODE_INFO pSignInfo, DWORD dwFlags, + BYTE *pbEncoded, DWORD *pcbEncoded); + BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal);

1 0

Juan Lang : wintrust: Add stub for WVTAsn1SpcSpOpusInfoDecode.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: fa355b21803078838c3050e77c7811d89bca6fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa355b21803078838c3050e77… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 16:28:12 2007 -0700 wintrust: Add stub for WVTAsn1SpcSpOpusInfoDecode. --- dlls/wintrust/asn.c | 9 +++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 50923e6..af7a266 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -1720,3 +1720,12 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentDecode(DWORD dwCertEncodingType, TRACE("returning %d\n", ret); return ret; } + +BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + FIXME("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo); + return FALSE; +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 078e5bb..bcac267 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -104,7 +104,7 @@ @ stub WVTAsn1SpcSigInfoEncode @ stub WVTAsn1SpcSpAgencyInfoDecode @ stub WVTAsn1SpcSpAgencyInfoEncode -@ stub WVTAsn1SpcSpOpusInfoDecode +@ stdcall WVTAsn1SpcSpOpusInfoDecode(long str ptr long long ptr ptr) @ stub WVTAsn1SpcSpOpusInfoEncode @ stub WVTAsn1SpcStatementTypeDecode @ stub WVTAsn1SpcStatementTypeEncode

1 0

Juan Lang : crypt32: Create file store directly in CRYPT_FileNameOpenStoreW .
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 60fcce5558c1747f7db09e9cd90b9883f9d9cf2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fcce5558c1747f7db09e9cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 08:37:47 2007 -0700 crypt32: Create file store directly in CRYPT_FileNameOpenStoreW. --- dlls/crypt32/filestore.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index fc89c0a..ffd9889 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -227,6 +227,12 @@ PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, SetLastError(ERROR_PATH_NOT_FOUND); return NULL; } + if ((dwFlags & CERT_STORE_READONLY_FLAG) && + (dwFlags & CERT_FILE_STORE_COMMIT_ENABLE_FLAG)) + { + SetLastError(E_INVALIDARG); + return NULL; + } access = GENERIC_READ; if (dwFlags & CERT_FILE_STORE_COMMIT_ENABLE_FLAG) @@ -241,12 +247,27 @@ PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) { - /* FIXME: need to check whether it's a serialized store; if not, fall - * back to a PKCS#7 signed message, then to a single serialized cert. - */ - store = CertOpenStore(CERT_STORE_PROV_FILE, 0, hCryptProv, dwFlags, - file); - CloseHandle(file); + HCERTSTORE memStore; + + memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + if (memStore) + { + if (CRYPT_ReadSerializedStoreFromFile(file, memStore)) + { + store = CRYPT_CreateFileStore(dwFlags, memStore, file); + /* File store doesn't need crypto provider, so close it */ + if (hCryptProv && + !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) + CryptReleaseContext(hCryptProv, 0); + } + else + { + /* FIXME: fall back to a PKCS#7 signed message, then to a + * single serialized cert. + */ + } + } } return (PWINECRYPT_CERTSTORE)store; }

1 0

Juan Lang : crypt32: Be more strict about format of serialized store files.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 661525c6064a1da91c7bbcd11a0c2ff5583f8b0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=661525c6064a1da91c7bbcd11… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 09:06:11 2007 -0700 crypt32: Be more strict about format of serialized store files. --- dlls/crypt32/serialize.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 2884a4c..281ac3f 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -431,7 +431,11 @@ BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store) ret = ReadFile(file, fileHeaderBuf, sizeof(fileHeaderBuf), &read, NULL); if (ret) { - if (!memcmp(fileHeaderBuf, fileHeader, read)) + if (!read) + ; /* an empty file is okay */ + else if (read != sizeof(fileHeaderBuf)) + ret = FALSE; + else if (!memcmp(fileHeaderBuf, fileHeader, read)) { WINE_CERT_PROP_HEADER propHdr; const void *context = NULL; @@ -503,6 +507,8 @@ BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store) CryptMemFree(buf); ret = TRUE; } + else + ret = FALSE; } else ret = TRUE;

1 0

Juan Lang : wintrust: Improve SoftpubLoadMessage for WTD_CHOICE_CERT.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 5fa5518641755ca6e00f8ea1d5136b89b38a580b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa5518641755ca6e00f8ea1d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 12:44:27 2007 -0700 wintrust: Improve SoftpubLoadMessage for WTD_CHOICE_CERT. --- dlls/wintrust/softpub.c | 36 ++++++++++++++++++++++++++++++++++-- 1 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index a9b5464..59e4966 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -268,8 +268,38 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) switch (data->pWintrustData->dwUnionChoice) { case WTD_CHOICE_CERT: - /* Do nothing!? See the tests */ - ret = TRUE; + if (data->pWintrustData->u.pCert && + data->pWintrustData->u.pCert->cbStruct == sizeof(WINTRUST_CERT_INFO)) + { + if (data->psPfns) + { + CRYPT_PROVIDER_SGNR signer = { sizeof(signer), { 0 } }; + DWORD i; + + /* Add empty signer, so we can add a cert to it */ + ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, 0, &signer); + if (!ret) + goto error; + ret = data->psPfns->pfnAddCert2Chain(data, 0, FALSE, 0, + data->pWintrustData->u.pCert->psCertContext); + if (!ret) + goto error; + for (i = 0; ret && i < data->pWintrustData->u.pCert->chStores; + i++) + ret = data->psPfns->pfnAddStore2Chain(data, + data->pWintrustData->u.pCert->pahStores[i]); + } + else + { + /* Do nothing!? See the tests */ + ret = TRUE; + } + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } break; case WTD_CHOICE_FILE: if (!data->pWintrustData->u.pFile) @@ -305,6 +335,8 @@ error: if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = GetLastError(); + TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); return ret ? S_OK : S_FALSE; }

1 0

Juan Lang : crypt32: Allow file stores to support more than one type of file.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 99981716b2a9a43dd14e519ede7b7f42bb88844f URL: http://source.winehq.org/git/wine.git/?a=commit;h=99981716b2a9a43dd14e519ed… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 08:38:12 2007 -0700 crypt32: Allow file stores to support more than one type of file. --- dlls/crypt32/filestore.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index ffd9889..9dde31c 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -30,6 +30,7 @@ typedef struct _WINE_FILESTOREINFO DWORD dwOpenFlags; HCERTSTORE memStore; HANDLE file; + DWORD type; BOOL dirty; } WINE_FILESTOREINFO, *PWINE_FILESTOREINFO; @@ -40,7 +41,7 @@ static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) TRACE("(%p, %08x)\n", store, dwFlags); if (store->dirty) CertSaveStore(store->memStore, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, - CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_FILE, store->file, 0); + store->type, CERT_STORE_SAVE_TO_FILE, store->file, 0); CertCloseStore(store->memStore, dwFlags); CloseHandle(store->file); CryptMemFree(store); @@ -100,7 +101,19 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, case CERT_STORE_CTRL_RESYNC: CRYPT_EmptyStore(store->memStore); store->dirty = FALSE; - ret = CRYPT_ReadSerializedStoreFromFile(store->file, store->memStore); + if (store->type == CERT_STORE_SAVE_AS_STORE) + ret = CRYPT_ReadSerializedStoreFromFile(store->file, + store->memStore); + else if (store->type == CERT_STORE_SAVE_AS_PKCS7) + { + FIXME("unimplemented for PKCS stores\n"); + ret = FALSE; + } + else + { + WARN("unknown type %d\n", store->type); + ret = FALSE; + } break; case CERT_STORE_CTRL_COMMIT: if (!(store->dwOpenFlags & CERT_FILE_STORE_COMMIT_ENABLE_FLAG)) @@ -111,7 +124,7 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, else if (store->dirty) ret = CertSaveStore(store->memStore, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, - CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_FILE, store->file, 0); + store->type, CERT_STORE_SAVE_TO_FILE, store->file, 0); else ret = TRUE; break; @@ -140,7 +153,7 @@ static void *fileProvFuncs[] = { }; static PWINECRYPT_CERTSTORE CRYPT_CreateFileStore(DWORD dwFlags, - HCERTSTORE memStore, HANDLE file) + HCERTSTORE memStore, HANDLE file, DWORD type) { PWINECRYPT_CERTSTORE store = NULL; PWINE_FILESTOREINFO info = CryptMemAlloc(sizeof(WINE_FILESTOREINFO)); @@ -152,6 +165,7 @@ static PWINECRYPT_CERTSTORE CRYPT_CreateFileStore(DWORD dwFlags, info->dwOpenFlags = dwFlags; info->memStore = memStore; info->file = file; + info->type = type; info->dirty = FALSE; provInfo.cbSize = sizeof(provInfo); provInfo.cStoreProvFunc = sizeof(fileProvFuncs) / @@ -200,7 +214,8 @@ PWINECRYPT_CERTSTORE CRYPT_FileOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, { if (CRYPT_ReadSerializedStoreFromFile(file, memStore)) { - store = CRYPT_CreateFileStore(dwFlags, memStore, file); + store = CRYPT_CreateFileStore(dwFlags, memStore, file, + CERT_STORE_SAVE_AS_STORE); /* File store doesn't need crypto provider, so close it */ if (hCryptProv && !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) @@ -255,7 +270,8 @@ PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, { if (CRYPT_ReadSerializedStoreFromFile(file, memStore)) { - store = CRYPT_CreateFileStore(dwFlags, memStore, file); + store = CRYPT_CreateFileStore(dwFlags, memStore, file, + CERT_STORE_SAVE_AS_STORE); /* File store doesn't need crypto provider, so close it */ if (hCryptProv && !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG))

1 0

Juan Lang : crypt32: Implement opening file name stores from files that contain PKCS7 messages.
by Alexandre Julliard Oct. 1, 2007

Oct. 1, 2007

Module: wine Branch: master Commit: 15cab3304108a78609d002dd7942a9c54bf3bffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=15cab3304108a78609d002dd7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 28 09:03:53 2007 -0700 crypt32: Implement opening file name stores from files that contain PKCS7 messages. --- dlls/crypt32/filestore.c | 112 +++++++++++++++++++++++++++++++++++++------- dlls/crypt32/tests/store.c | 2 +- 2 files changed, 96 insertions(+), 18 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index 9dde31c..8294e82 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -21,6 +21,7 @@ #include "wincrypt.h" #include "winnls.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -87,6 +88,24 @@ static BOOL WINAPI CRYPT_FileDeleteCRL(HCERTSTORE hCertStore, return TRUE; } +static BOOL CRYPT_ReadBlobFromFile(HANDLE file, PCERT_BLOB blob) +{ + BOOL ret = TRUE; + + blob->cbData = GetFileSize(file, NULL); + if (blob->cbData) + { + blob->pbData = CryptMemAlloc(blob->cbData); + if (blob->pbData) + { + DWORD read; + + ret = ReadFile(file, blob->pbData, blob->cbData, &read, NULL); + } + } + return ret; +} + static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, DWORD dwCtrlType, void const *pvCtrlPara) { @@ -106,8 +125,37 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, store->memStore); else if (store->type == CERT_STORE_SAVE_AS_PKCS7) { - FIXME("unimplemented for PKCS stores\n"); - ret = FALSE; + CERT_BLOB blob = { 0, NULL }; + + ret = CRYPT_ReadBlobFromFile(store->file, &blob); + if (ret) + { + HCERTSTORE messageStore; + + ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, + &messageStore, NULL, NULL); + if (ret) + { + PCCERT_CONTEXT cert = NULL; + PCCRL_CONTEXT crl = NULL; + + do { + cert = CertEnumCertificatesInStore(messageStore, cert); + if (cert) + CertAddCertificateContextToStore(store->memStore, + cert, CERT_STORE_ADD_ALWAYS, NULL); + } while (cert); + do { + crl = CertEnumCRLsInStore(messageStore, crl); + if (crl) + CertAddCRLContextToStore(store->memStore, crl, + CERT_STORE_ADD_ALWAYS, NULL); + } while (crl); + } + CryptMemFree(blob.pbData); + } } else { @@ -262,27 +310,57 @@ PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE) { - HCERTSTORE memStore; + HCERTSTORE memStore = NULL; + DWORD size = GetFileSize(file, NULL), type = 0; - memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, - CERT_STORE_CREATE_NEW_FLAG, NULL); - if (memStore) + /* If the file isn't empty, try to get the type from the file itself */ + if (size) { - if (CRYPT_ReadSerializedStoreFromFile(file, memStore)) + DWORD contentType; + BOOL ret; + + /* Close the file so CryptQueryObject can succeed.. */ + CloseHandle(file); + ret = CryptQueryObject(CERT_QUERY_OBJECT_FILE, fileName, + CERT_QUERY_CONTENT_FLAG_CERT | + CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE | + CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, &contentType, NULL, + &memStore, NULL, NULL); + if (ret) { - store = CRYPT_CreateFileStore(dwFlags, memStore, file, - CERT_STORE_SAVE_AS_STORE); - /* File store doesn't need crypto provider, so close it */ - if (hCryptProv && - !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) - CryptReleaseContext(hCryptProv, 0); + if (contentType == CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) + type = CERT_STORE_SAVE_AS_PKCS7; + else + type = CERT_STORE_SAVE_AS_STORE; + /* and reopen the file. */ + file = CreateFileW(fileName, access, FILE_SHARE_READ, NULL, + create, FILE_ATTRIBUTE_NORMAL, NULL); } - else + } + else + { + static const WCHAR spc[] = { 's','p','c',0 }; + static const WCHAR p7c[] = { 'p','7','c',0 }; + LPCWSTR ext = strrchrW(fileName, '.'); + + if (ext) { - /* FIXME: fall back to a PKCS#7 signed message, then to a - * single serialized cert. - */ + ext++; + if (!lstrcmpiW(ext, spc) || !lstrcmpiW(ext, p7c)) + type = CERT_STORE_SAVE_AS_PKCS7; } + if (!type) + type = CERT_STORE_SAVE_AS_STORE; + memStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + } + if (memStore) + { + store = CRYPT_CreateFileStore(dwFlags, memStore, file, type); + /* File store doesn't need crypto provider, so close it */ + if (hCryptProv && !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) + CryptReleaseContext(hCryptProv, 0); } } return (PWINECRYPT_CERTSTORE)store; diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 450352f..b14dbc2 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1244,7 +1244,7 @@ static void testFileNameStore(void) ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); cert = CertEnumCertificatesInStore(store, NULL); - todo_wine ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n", + ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n", GetLastError()); cert = CertEnumCertificatesInStore(store, cert); ok(!cert, "Expected only one cert\n");

1 0