September 2007 - Wine-Commits

Juan Lang : crypt32: Move CertSaveStore to serialize.c.
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: f6ebeba5a2c60ad0cd11371c999e7dbe6da9f3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6ebeba5a2c60ad0cd11371c9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 16:13:05 2007 -0700 crypt32: Move CertSaveStore to serialize.c. --- dlls/crypt32/crypt32_private.h | 12 -- dlls/crypt32/serialize.c | 267 +++++++++++++++++++++++++++++++++++++++- dlls/crypt32/store.c | 258 -------------------------------------- 3 files changed, 264 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6ebeba5a2c60ad0cd113…

1 0

Juan Lang : crypt32: Use CertSaveStore to save file stores.
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: 9c55a71f8f5bfaf726ad637b31d6267a931adf5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c55a71f8f5bfaf726ad637b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 14:01:30 2007 -0700 crypt32: Use CertSaveStore to save file stores. --- dlls/crypt32/filestore.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index df4b98d..63a7b6e 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -39,7 +39,8 @@ static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) TRACE("(%p, %08x)\n", store, dwFlags); if (store->dirty) - CRYPT_WriteSerializedStoreToFile(store->file, store->memStore); + CertSaveStore(store->memStore, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_FILE, store->file, 0); CertCloseStore(store->memStore, dwFlags); CloseHandle(store->file); CryptMemFree(store); @@ -108,7 +109,9 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, ret = FALSE; } else if (store->dirty) - ret = CRYPT_WriteSerializedStoreToFile(store->file, store->memStore); + ret = CertSaveStore(store->memStore, + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + CERT_STORE_SAVE_AS_STORE, CERT_STORE_SAVE_TO_FILE, store->file, 0); else ret = TRUE; break;

1 0

Juan Lang : crypt32: Implement CertSaveStore.
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: 6471621f5e776948d0ced9d372338aab90e295cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6471621f5e776948d0ced9d37… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 13:49:16 2007 -0700 crypt32: Implement CertSaveStore. --- dlls/crypt32/store.c | 254 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 252 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 8a710a1..c647af5 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -781,12 +781,262 @@ HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV_LEGACY hProv, CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol); } +static BOOL CRYPT_SavePKCSToMem(HCERTSTORE store, + DWORD dwMsgAndCertEncodingType, void *handle) +{ + CERT_BLOB *blob = (CERT_BLOB *)handle; + CRYPT_SIGNED_INFO signedInfo = { 0 }; + PCCERT_CONTEXT cert = NULL; + PCCRL_CONTEXT crl = NULL; + DWORD size; + BOOL ret = TRUE; + + TRACE("(%d, %p)\n", blob->pbData ? blob->cbData : 0, blob->pbData); + + do { + cert = CertEnumCertificatesInStore(store, cert); + if (cert) + signedInfo.cCertEncoded++; + } while (cert); + if (signedInfo.cCertEncoded) + { + signedInfo.rgCertEncoded = CryptMemAlloc( + signedInfo.cCertEncoded * sizeof(CERT_BLOB)); + if (!signedInfo.rgCertEncoded) + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + else + { + DWORD i = 0; + + do { + cert = CertEnumCertificatesInStore(store, cert); + if (cert) + { + signedInfo.rgCertEncoded[i].cbData = cert->cbCertEncoded; + signedInfo.rgCertEncoded[i].pbData = cert->pbCertEncoded; + i++; + } + } while (cert); + } + } + + do { + crl = CertEnumCRLsInStore(store, crl); + if (crl) + signedInfo.cCrlEncoded++; + } while (crl); + if (signedInfo.cCrlEncoded) + { + signedInfo.rgCrlEncoded = CryptMemAlloc( + signedInfo.cCrlEncoded * sizeof(CERT_BLOB)); + if (!signedInfo.rgCrlEncoded) + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + else + { + DWORD i = 0; + + do { + crl = CertEnumCRLsInStore(store, crl); + if (crl) + { + signedInfo.rgCrlEncoded[i].cbData = crl->cbCrlEncoded; + signedInfo.rgCrlEncoded[i].pbData = crl->pbCrlEncoded; + i++; + } + } while (crl); + } + } + if (ret) + { + ret = CRYPT_AsnEncodePKCSSignedInfo(&signedInfo, NULL, &size); + if (ret) + { + if (!blob->pbData) + blob->cbData = size; + else if (blob->cbData < size) + { + blob->cbData = size; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + blob->cbData = size; + ret = CRYPT_AsnEncodePKCSSignedInfo(&signedInfo, blob->pbData, + &blob->cbData); + } + } + } + CryptMemFree(signedInfo.rgCertEncoded); + CryptMemFree(signedInfo.rgCrlEncoded); + TRACE("returning %d\n", ret); + return ret; +} + +static BOOL CRYPT_SavePKCSToFile(HCERTSTORE store, + DWORD dwMsgAndCertEncodingType, void *handle) +{ + CERT_BLOB blob = { 0, NULL }; + BOOL ret; + + TRACE("(%p)\n", handle); + + ret = CRYPT_SavePKCSToMem(store, dwMsgAndCertEncodingType, &blob); + if (ret) + { + blob.pbData = CryptMemAlloc(blob.cbData); + if (blob.pbData) + { + ret = CRYPT_SavePKCSToMem(store, dwMsgAndCertEncodingType, &blob); + if (ret) + ret = WriteFile((HANDLE)handle, blob.pbData, blob.cbData, + &blob.cbData, NULL); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; + } + } + TRACE("returning %d\n", ret); + return ret; +} + +static BOOL CRYPT_SaveSerializedToFile(HCERTSTORE store, + DWORD dwMsgAndCertEncodingType, void *handle) +{ + return CRYPT_WriteSerializedStoreToFile((HANDLE)handle, store); +} + +struct MemWrittenTracker +{ + DWORD cbData; + BYTE *pbData; + DWORD written; +}; + +/* handle is a pointer to a MemWrittenTracker. Assumes its pointer is valid. */ +static BOOL CRYPT_MemOutputFunc(void *handle, const void *buffer, DWORD size) +{ + struct MemWrittenTracker *tracker = (struct MemWrittenTracker *)handle; + BOOL ret; + + if (tracker->written + size > tracker->cbData) + { + SetLastError(ERROR_MORE_DATA); + /* Update written so caller can notify its caller of the required size + */ + tracker->written += size; + ret = FALSE; + } + else + { + memcpy(tracker->pbData + tracker->written, buffer, size); + tracker->written += size; + ret = TRUE; + } + return ret; +} + +static BOOL CRYPT_CountSerializedBytes(void *handle, const void *buffer, + DWORD size) +{ + *(DWORD *)handle += size; + return TRUE; +} + +static BOOL CRYPT_SaveSerializedToMem(HCERTSTORE store, + DWORD dwMsgAndCertEncodingType, void *handle) +{ + CERT_BLOB *blob = (CERT_BLOB *)handle; + DWORD size; + BOOL ret; + + ret = CRYPT_WriteSerializedStoreToStream(store, CRYPT_CountSerializedBytes, + &size); + if (ret) + { + if (!blob->pbData) + blob->cbData = size; + else if (blob->cbData < size) + { + SetLastError(ERROR_MORE_DATA); + blob->cbData = size; + ret = FALSE; + } + else + { + struct MemWrittenTracker tracker = { blob->cbData, blob->pbData, + 0 }; + + ret = CRYPT_WriteSerializedStoreToStream(store, CRYPT_MemOutputFunc, + &tracker); + if (!ret && GetLastError() == ERROR_MORE_DATA) + blob->cbData = tracker.written; + } + } + TRACE("returning %d\n", ret); + return ret; +} + BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, DWORD dwSaveAs, DWORD dwSaveTo, void* pvSaveToPara, DWORD dwFlags) { - FIXME("(%p,%d,%d,%d,%p,%08x) stub!\n", hCertStore, + BOOL (*saveFunc)(HCERTSTORE, DWORD, void *); + void *handle; + BOOL ret; + + TRACE("(%p, %08x, %d, %d, %p, %08x)\n", hCertStore, dwMsgAndCertEncodingType, dwSaveAs, dwSaveTo, pvSaveToPara, dwFlags); - return TRUE; + + switch (dwSaveAs) + { + case CERT_STORE_SAVE_AS_STORE: + case CERT_STORE_SAVE_AS_PKCS7: + break; + default: + WARN("unimplemented for %d\n", dwSaveAs); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + switch (dwSaveTo) + { + case CERT_STORE_SAVE_TO_FILE: + handle = (HANDLE)pvSaveToPara; + saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ? + CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile; + break; + case CERT_STORE_SAVE_TO_FILENAME_A: + handle = CreateFileA((LPCSTR)pvSaveToPara, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, NULL); + saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ? + CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile; + break; + case CERT_STORE_SAVE_TO_FILENAME_W: + handle = CreateFileW((LPCWSTR)pvSaveToPara, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, 0, NULL); + saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ? + CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile; + break; + case CERT_STORE_SAVE_TO_MEMORY: + handle = pvSaveToPara; + saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ? + CRYPT_SaveSerializedToMem : CRYPT_SavePKCSToMem; + break; + default: + WARN("unimplemented for %d\n", dwSaveTo); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + ret = saveFunc(hCertStore, dwMsgAndCertEncodingType, handle); + TRACE("returning %d\n", ret); + return ret; } #define CertContext_CopyProperties(to, from) \

1 0

Juan Lang : crypt32: Add definitions used by CertSaveStore.
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: 0fdb2bc89fcf1e21c4fb420f6f771ef129526910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fdb2bc89fcf1e21c4fb420f6… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 12:55:51 2007 -0700 crypt32: Add definitions used by CertSaveStore. --- include/wincrypt.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index e959384..0518310 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2144,6 +2144,16 @@ static const WCHAR CERT_PHYSICAL_STORE_AUTH_ROOT_NAME[] = /* CertFindChainInStore dwFindType types */ #define CERT_CHAIN_FIND_BY_ISSUER 1 +/* CertSaveStore dwSaveAs values */ +#define CERT_STORE_SAVE_AS_STORE 1 +#define CERT_STORE_SAVE_AS_PKCS7 2 +/* CertSaveStore dwSaveTo values */ +#define CERT_STORE_SAVE_TO_FILE 1 +#define CERT_STORE_SAVE_TO_MEMORY 2 +#define CERT_STORE_SAVE_TO_FILENAME_A 3 +#define CERT_STORE_SAVE_TO_FILENAME_W 4 +#define CERT_STORE_SAVE_TO_FILENAME CERT_STORE_SAVE_TO_FILENAME_W + /* CERT_INFO versions/flags */ #define CERT_V1 0 #define CERT_V2 1

1 0

Juan Lang : crypt32: Implement CRYPT_WriteSerializedStoreToFile using CRYPT_WriteSerializedStoreToStream .
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: bba9587f40bbd68174a268378443b06d4acc8bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba9587f40bbd68174a268378… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 12:36:06 2007 -0700 crypt32: Implement CRYPT_WriteSerializedStoreToFile using CRYPT_WriteSerializedStoreToStream. --- dlls/crypt32/serialize.c | 60 +++------------------------------------------ 1 files changed, 4 insertions(+), 56 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 44ee510..2207acc 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -599,68 +599,16 @@ BOOL CRYPT_WriteSerializedStoreToStream(HCERTSTORE store, return ret; } -static BOOL CRYPT_SerializeContextsToFile(HANDLE file, - const WINE_CONTEXT_INTERFACE *contextInterface, HCERTSTORE store) +static BOOL CRYPT_FileOutputFunc(void *handle, const void *buffer, DWORD size) { - const void *context = NULL; - BOOL ret; - - do { - context = contextInterface->enumContextsInStore(store, context); - if (context) - { - DWORD size = 0; - LPBYTE buf = NULL; - - ret = contextInterface->serialize(context, 0, NULL, &size); - if (size) - buf = CryptMemAlloc(size); - if (buf) - { - ret = contextInterface->serialize(context, 0, buf, &size); - if (ret) - ret = WriteFile(file, buf, size, &size, NULL); - } - CryptMemFree(buf); - } - else - ret = TRUE; - } while (ret && context != NULL); - if (context) - contextInterface->free(context); - return ret; + return WriteFile(handle, buffer, size, &size, NULL); } BOOL CRYPT_WriteSerializedStoreToFile(HANDLE file, HCERTSTORE store) { - static const BYTE fileTrailer[12] = { 0 }; - WINE_CONTEXT_INTERFACE interface; - BOOL ret; - DWORD size; - SetFilePointer(file, 0, NULL, FILE_BEGIN); - ret = WriteFile(file, fileHeader, sizeof(fileHeader), &size, NULL); - if (ret) - { - memcpy(&interface, pCertInterface, sizeof(interface)); - interface.serialize = (SerializeElementFunc)CRYPT_SerializeCertNoHash; - ret = CRYPT_SerializeContextsToFile(file, &interface, store); - } - if (ret) - { - memcpy(&interface, pCRLInterface, sizeof(interface)); - interface.serialize = (SerializeElementFunc)CRYPT_SerializeCRLNoHash; - ret = CRYPT_SerializeContextsToFile(file, &interface, store); - } - if (ret) - { - memcpy(&interface, pCTLInterface, sizeof(interface)); - interface.serialize = (SerializeElementFunc)CRYPT_SerializeCTLNoHash; - ret = CRYPT_SerializeContextsToFile(file, &interface, store); - } - if (ret) - ret = WriteFile(file, fileTrailer, sizeof(fileTrailer), &size, NULL); - return ret; + return CRYPT_WriteSerializedStoreToStream(store, CRYPT_FileOutputFunc, + file); } BOOL WINAPI CertAddSerializedElementToStore(HCERTSTORE hCertStore,

1 0

Juan Lang : crypt32: Add a function to serialize a store to an arbitrary stream.
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: 779dd45e6bc5e869c8e79c21dcb115838eca977f URL: http://source.winehq.org/git/wine.git/?a=commit;h=779dd45e6bc5e869c8e79c21d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 12:30:52 2007 -0700 crypt32: Add a function to serialize a store to an arbitrary stream. --- dlls/crypt32/crypt32_private.h | 9 +++++ dlls/crypt32/serialize.c | 66 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 533d483..4970d56 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -268,6 +268,15 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType); +typedef BOOL (*SerializedOutputFunc)(void *handle, const void *buffer, + DWORD size); + +/* Writes contexts from the memory store to the output function, passing handle + * as the handle parameter to the output function. + */ +BOOL CRYPT_WriteSerializedStoreToStream(HCERTSTORE store, + SerializedOutputFunc output, void *handle); + /* Writes contexts from the memory store to the file. */ BOOL CRYPT_WriteSerializedStoreToFile(HANDLE file, HCERTSTORE store); diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index 9ef6b54..44ee510 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -533,6 +533,72 @@ static BOOL WINAPI CRYPT_SerializeCTLNoHash(PCCTL_CONTEXT pCtlContext, CERT_CTL_PROP_ID, pCTLInterface, dwFlags, TRUE, pbElement, pcbElement); } +static BOOL CRYPT_SerializeContextsToStream(SerializedOutputFunc output, + void *handle, const WINE_CONTEXT_INTERFACE *contextInterface, HCERTSTORE store) +{ + const void *context = NULL; + BOOL ret; + + do { + context = contextInterface->enumContextsInStore(store, context); + if (context) + { + DWORD size = 0; + LPBYTE buf = NULL; + + ret = contextInterface->serialize(context, 0, NULL, &size); + if (size) + buf = CryptMemAlloc(size); + if (buf) + { + ret = contextInterface->serialize(context, 0, buf, &size); + if (ret) + ret = output(handle, buf, size); + } + CryptMemFree(buf); + } + else + ret = TRUE; + } while (ret && context != NULL); + if (context) + contextInterface->free(context); + return ret; +} + +BOOL CRYPT_WriteSerializedStoreToStream(HCERTSTORE store, + SerializedOutputFunc output, void *handle) +{ + static const BYTE fileTrailer[12] = { 0 }; + WINE_CONTEXT_INTERFACE interface; + BOOL ret; + + ret = output(handle, fileHeader, sizeof(fileHeader)); + if (ret) + { + memcpy(&interface, pCertInterface, sizeof(interface)); + interface.serialize = (SerializeElementFunc)CRYPT_SerializeCertNoHash; + ret = CRYPT_SerializeContextsToStream(output, handle, &interface, + store); + } + if (ret) + { + memcpy(&interface, pCRLInterface, sizeof(interface)); + interface.serialize = (SerializeElementFunc)CRYPT_SerializeCRLNoHash; + ret = CRYPT_SerializeContextsToStream(output, handle, &interface, + store); + } + if (ret) + { + memcpy(&interface, pCTLInterface, sizeof(interface)); + interface.serialize = (SerializeElementFunc)CRYPT_SerializeCTLNoHash; + ret = CRYPT_SerializeContextsToStream(output, handle, &interface, + store); + } + if (ret) + ret = output(handle, fileTrailer, sizeof(fileTrailer)); + return ret; +} + static BOOL CRYPT_SerializeContextsToFile(HANDLE file, const WINE_CONTEXT_INTERFACE *contextInterface, HCERTSTORE store) {

1 0

Juan Lang : crypt32: Rename a couple of functions.
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: bc819295194e55bba96c0a56fab7820fed983756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc819295194e55bba96c0a56f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 11:54:24 2007 -0700 crypt32: Rename a couple of functions. --- dlls/crypt32/crypt32_private.h | 4 ++-- dlls/crypt32/filestore.c | 8 ++++---- dlls/crypt32/object.c | 2 +- dlls/crypt32/serialize.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 81a8685..533d483 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -269,12 +269,12 @@ const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType); /* Writes contexts from the memory store to the file. */ -BOOL CRYPT_WriteSerializedFile(HANDLE file, HCERTSTORE store); +BOOL CRYPT_WriteSerializedStoreToFile(HANDLE file, HCERTSTORE store); /* Reads contexts serialized in the file into the memory store. Returns FALSE * if the file is not of the expected format. */ -BOOL CRYPT_ReadSerializedFile(HANDLE file, HCERTSTORE store); +BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store); /* Fixes up the the pointers in info, where info is assumed to be a * CRYPT_KEY_PROV_INFO, followed by its container name, provider name, and any diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index afe4327..df4b98d 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -39,7 +39,7 @@ static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) TRACE("(%p, %08x)\n", store, dwFlags); if (store->dirty) - CRYPT_WriteSerializedFile(store->file, store->memStore); + CRYPT_WriteSerializedStoreToFile(store->file, store->memStore); CertCloseStore(store->memStore, dwFlags); CloseHandle(store->file); CryptMemFree(store); @@ -98,7 +98,7 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, { case CERT_STORE_CTRL_RESYNC: CRYPT_EmptyStore(store->memStore); - CRYPT_ReadSerializedFile(store->file, store); + CRYPT_ReadSerializedStoreFromFile(store->file, store); ret = TRUE; break; case CERT_STORE_CTRL_COMMIT: @@ -108,7 +108,7 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags, ret = FALSE; } else if (store->dirty) - ret = CRYPT_WriteSerializedFile(store->file, store->memStore); + ret = CRYPT_WriteSerializedStoreToFile(store->file, store->memStore); else ret = TRUE; break; @@ -171,7 +171,7 @@ PWINECRYPT_CERTSTORE CRYPT_FileOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, CERT_STORE_CREATE_NEW_FLAG, NULL); if (memStore) { - if (CRYPT_ReadSerializedFile(file, memStore)) + if (CRYPT_ReadSerializedStoreFromFile(file, memStore)) { PWINE_FILESTOREINFO info = CryptMemAlloc( sizeof(WINE_FILESTOREINFO)); diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index a8d4410..4184e6c 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -250,7 +250,7 @@ static BOOL CRYPT_QuerySerializedStoreObject(DWORD dwObjectType, HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); - ret = CRYPT_ReadSerializedFile(file, store); + ret = CRYPT_ReadSerializedStoreFromFile(file, store); if (ret) { if (pdwMsgAndCertEncodingType) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index e45dcd0..9ef6b54 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -421,7 +421,7 @@ const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement, static const BYTE fileHeader[] = { 0, 0, 0, 0, 'C','E','R','T' }; -BOOL CRYPT_ReadSerializedFile(HANDLE file, HCERTSTORE store) +BOOL CRYPT_ReadSerializedStoreFromFile(HANDLE file, HCERTSTORE store) { BYTE fileHeaderBuf[sizeof(fileHeader)]; DWORD read; @@ -565,7 +565,7 @@ static BOOL CRYPT_SerializeContextsToFile(HANDLE file, return ret; } -BOOL CRYPT_WriteSerializedFile(HANDLE file, HCERTSTORE store) +BOOL CRYPT_WriteSerializedStoreToFile(HANDLE file, HCERTSTORE store) { static const BYTE fileTrailer[12] = { 0 }; WINE_CONTEXT_INTERFACE interface;

1 0

Juan Lang : crypt32: Add/improve some traces.
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: 36886f7dd110af7e6f1ba2ca49832054cf88ca79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36886f7dd110af7e6f1ba2ca4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 27 11:08:36 2007 -0700 crypt32: Add/improve some traces. --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/encode.c | 12 ++++++------ dlls/crypt32/msg.c | 6 ++++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 4e5fcfd..024625c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1091,7 +1091,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, PCCERT_CONTEXT ret; CertCompareFunc compare; - TRACE("(%p, %d, %d, %d, %p, %p)\n", hCertStore, dwCertEncodingType, + TRACE("(%p, %08x, %08x, %08x, %p, %p)\n", hCertStore, dwCertEncodingType, dwFlags, dwType, pvPara, pPrevCertContext); switch (dwType >> CERT_COMPARE_SHIFT) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 1963eb7..dd71898 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -3626,9 +3626,9 @@ static BOOL WINAPI CRYPT_ExportRsaPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDL HCRYPTKEY key; static CHAR oid[] = szOID_RSA_RSA; - TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, + TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv, dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, - pvAuxInfo, pInfo, pcbInfo); + pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0); if (!pszPublicKeyObjId) pszPublicKeyObjId = oid; @@ -3706,9 +3706,9 @@ BOOL WINAPI CryptExportPublicKeyInfoEx(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hCryptPro ExportPublicKeyInfoExFunc exportFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %p)\n", hCryptProv, + TRACE_(crypt)("(%08lx, %d, %08x, %s, %08x, %p, %p, %d)\n", hCryptProv, dwKeySpec, dwCertEncodingType, debugstr_a(pszPublicKeyObjId), dwFlags, - pvAuxInfo, pInfo, pcbInfo); + pvAuxInfo, pInfo, pInfo ? *pcbInfo : 0); if (!hCryptProv) { @@ -3747,7 +3747,7 @@ static BOOL WINAPI CRYPT_ImportRsaPublicKeyInfoEx(HCRYPTPROV hCryptProv, BOOL ret; DWORD pubKeySize = 0; - TRACE_(crypt)("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, + TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); ret = CryptDecodeObject(dwCertEncodingType, RSA_CSP_PUBLICKEYBLOB, @@ -3785,7 +3785,7 @@ BOOL WINAPI CryptImportPublicKeyInfoEx(HCRYPTPROV hCryptProv, ImportPublicKeyInfoExFunc importFunc = NULL; HCRYPTOIDFUNCADDR hFunc = NULL; - TRACE_(crypt)("(%08lx, %d, %p, %d, %08x, %p, %p)\n", hCryptProv, + TRACE_(crypt)("(%08lx, %08x, %p, %08x, %08x, %p, %p)\n", hCryptProv, dwCertEncodingType, pInfo, aiKeyAlg, dwFlags, pvAuxInfo, phKey); if (!set) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 14dbb50..df93c79 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1808,6 +1808,8 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, DWORD size = sizeof(CMSG_SIGNER_INFO); BOOL ret; + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + size += in->Issuer.cbData; size += in->SerialNumber.cbData; if (in->HashAlgorithm.pszObjId) @@ -1853,6 +1855,7 @@ static BOOL CRYPT_CopySignerInfo(void *pvData, DWORD *pcbData, CRYPT_CopyAttributes(&out->UnauthAttrs, &in->UnauthAttrs, &nextData); ret = TRUE; } + TRACE("returning %d\n", ret); return ret; } @@ -1862,6 +1865,8 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, DWORD size = sizeof(CERT_INFO); BOOL ret; + TRACE("(%p, %d, %p)\n", pvData, pvData ? *pcbData : 0, in); + size += in->Issuer.cbData; size += in->SerialNumber.cbData; if (!pvData) @@ -1885,6 +1890,7 @@ static BOOL CRYPT_CopySignerCertInfo(void *pvData, DWORD *pcbData, CRYPT_CopyBlob(&out->SerialNumber, &in->SerialNumber, &nextData); ret = TRUE; } + TRACE("returning %d\n", ret); return ret; }

1 0

Mikolaj Zalewski : advapi32: Implement GetPrivateObjectSecurity (with test) .
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: 8fd1cf0f56a88ffe1f1c5756e7789df8df31bdcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd1cf0f56a88ffe1f1c5756e… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Thu Sep 27 12:01:49 2007 -0700 advapi32: Implement GetPrivateObjectSecurity (with test). --- dlls/advapi32/security.c | 44 +++++++++++++++++++++++++++++- dlls/advapi32/tests/security.c | 57 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 5b2f7dd..cfe73f4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1123,11 +1123,51 @@ BOOL WINAPI GetPrivateObjectSecurity( DWORD DescriptorLength, PDWORD ReturnLength ) { + SECURITY_DESCRIPTOR desc; + BOOL defaulted, present; + PACL pacl; + PSID psid; + TRACE("(%p,0x%08x,%p,0x%08x,%p)\n", ObjectDescriptor, SecurityInformation, ResultantDescriptor, DescriptorLength, ReturnLength); - return set_ntstatus( NtQuerySecurityObject(ObjectDescriptor, SecurityInformation, - ResultantDescriptor, DescriptorLength, ReturnLength )); + if (!InitializeSecurityDescriptor(&desc, SECURITY_DESCRIPTOR_REVISION)) + return FALSE; + + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + { + if (!GetSecurityDescriptorOwner(ObjectDescriptor, &psid, &defaulted)) + return FALSE; + SetSecurityDescriptorOwner(&desc, psid, defaulted); + } + + if (SecurityInformation & GROUP_SECURITY_INFORMATION) + { + if (!GetSecurityDescriptorGroup(ObjectDescriptor, &psid, &defaulted)) + return FALSE; + SetSecurityDescriptorGroup(&desc, psid, defaulted); + } + + if (SecurityInformation & DACL_SECURITY_INFORMATION) + { + if (!GetSecurityDescriptorDacl(ObjectDescriptor, &present, &pacl, &defaulted)) + return FALSE; + SetSecurityDescriptorDacl(&desc, present, pacl, defaulted); + } + + if (SecurityInformation & SACL_SECURITY_INFORMATION) + { + if (!GetSecurityDescriptorSacl(ObjectDescriptor, &present, &pacl, &defaulted)) + return FALSE; + SetSecurityDescriptorSacl(&desc, present, pacl, defaulted); + } + + *ReturnLength = DescriptorLength; + if (!MakeSelfRelativeSD(&desc, ResultantDescriptor, ReturnLength)) + return FALSE; + GetSecurityDescriptorOwner(ResultantDescriptor, &psid, &defaulted); + FIXME("%p, sid=%p\n", &desc, psid); + return TRUE; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9c98f09..6426f84 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2044,10 +2044,64 @@ static void test_ConvertSecurityDescriptorToString() AddAuditAccessAceEx(pacl, ACL_REVISION, NO_PROPAGATE_INHERIT_ACE, FILE_GENERIC_READ|FILE_GENERIC_WRITE, psid2, TRUE, FALSE); ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(&desc, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); CHECK_RESULT_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)"); +} + +static void test_PrivateObjectSecurity(void) +{ + SECURITY_INFORMATION sec_info = OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION|SACL_SECURITY_INFORMATION; + SECURITY_DESCRIPTOR_CONTROL ctrl; + PSECURITY_DESCRIPTOR sec; + DWORD dwDescSize; + DWORD dwRevision; + DWORD retSize; + LPSTR string; + ULONG len; + PSECURITY_DESCRIPTOR buf; + + ok(ConvertStringSecurityDescriptorToSecurityDescriptorA( + "O:SY" + "G:S-1-5-21-93476-23408-4576" + "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" + "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); + buf = HeapAlloc(GetProcessHeap(), 0, dwDescSize); + SetSecurityDescriptorControl(sec, SE_DACL_PROTECTED, SE_DACL_PROTECTED); + GetSecurityDescriptorControl(sec, &ctrl, &dwRevision); + todo_wine expect_eq(ctrl, 0x9014, int, "%x"); + + ok(GetPrivateObjectSecurity(sec, GROUP_SECURITY_INFORMATION, buf, dwDescSize, &retSize), + "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); + ok(retSize <= dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + CHECK_RESULT_AND_FREE("G:S-1-5-21-93476-23408-4576"); + GetSecurityDescriptorControl(buf, &ctrl, &dwRevision); + expect_eq(ctrl, 0x8000, int, "%x"); + + ok(GetPrivateObjectSecurity(sec, GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, buf, dwDescSize, &retSize), + "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); + ok(retSize <= dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed err=%u\n", GetLastError()); + CHECK_RESULT_AND_FREE("G:S-1-5-21-93476-23408-4576D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"); + GetSecurityDescriptorControl(buf, &ctrl, &dwRevision); + expect_eq(ctrl, 0x8004, int, "%x"); + + ok(GetPrivateObjectSecurity(sec, sec_info, buf, dwDescSize, &retSize), + "GetPrivateObjectSecurity failed (err=%u)\n", GetLastError()); + ok(retSize == dwDescSize, "Buffer too small (%d vs %d)\n", retSize, dwDescSize); + ok(pConvertSecurityDescriptorToStringSecurityDescriptorA(buf, SDDL_REVISION_1, sec_info, &string, &len), "Convertion failed\n"); + CHECK_RESULT_AND_FREE("O:SY" + "G:S-1-5-21-93476-23408-4576" + "D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)" + "S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)"); + GetSecurityDescriptorControl(buf, &ctrl, &dwRevision); + expect_eq(ctrl, 0x8014, int, "%x"); + SetLastError(0xdeadbeef); + ok(GetPrivateObjectSecurity(sec, sec_info, buf, 5, &retSize) == FALSE, "GetPrivateObjectSecurity should have failed\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected error ERROR_INSUFFICIENT_BUFFER, got %u\n", GetLastError()); -#undef CHECK_RESULT_AND_FREE + LocalFree(sec); } +#undef CHECK_RESULT_AND_FREE START_TEST(security) { @@ -2074,4 +2128,5 @@ START_TEST(security) test_GetNamedSecurityInfoA(); test_ConvertStringSecurityDescriptor(); test_ConvertSecurityDescriptorToString(); + test_PrivateObjectSecurity(); }

1 0

Mikolaj Zalewski : advapi32: Fix GetServiceDisplayNameA for cchBuffer == 0.
by Alexandre Julliard Sept. 28, 2007

Sept. 28, 2007

Module: wine Branch: master Commit: a8b8ddd865a0a751d47f136a75115ba2cacd92ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b8ddd865a0a751d47f136a7… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Sep 26 15:48:03 2007 -0700 advapi32: Fix GetServiceDisplayNameA for cchBuffer == 0. --- dlls/advapi32/service.c | 49 ++++++++++++++++------------------------ dlls/advapi32/tests/service.c | 9 ++++++- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 4708506..3ebcfe4 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2231,49 +2231,40 @@ BOOL WINAPI QueryServiceLockStatusW( SC_HANDLE hSCManager, BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, LPSTR lpDisplayName, LPDWORD lpcchBuffer) { - LPWSTR lpServiceNameW, lpDisplayNameW = NULL; - DWORD size, sizeW, GLE; - BOOL ret; + LPWSTR lpServiceNameW, lpDisplayNameW; + DWORD sizeW; + BOOL ret = FALSE; TRACE("%p %s %p %p\n", hSCManager, debugstr_a(lpServiceName), lpDisplayName, lpcchBuffer); lpServiceNameW = SERV_dup(lpServiceName); - lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, *lpcchBuffer * sizeof(WCHAR)); - - size = sizeW = *lpcchBuffer; - ret = GetServiceDisplayNameW(hSCManager, lpServiceNameW, - lpDisplayName ? lpDisplayNameW : NULL, - &sizeW); - /* Last error will be set by GetServiceDisplayNameW and must be preserved */ - GLE = GetLastError(); + if (lpDisplayName) + lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, *lpcchBuffer * sizeof(WCHAR)); + else + lpDisplayNameW = NULL; - if (!lpDisplayName && *lpcchBuffer && !ret && (GLE == ERROR_INSUFFICIENT_BUFFER)) + sizeW = *lpcchBuffer; + if (!GetServiceDisplayNameW(hSCManager, lpServiceNameW, lpDisplayNameW, &sizeW)) { - /* Request for buffersize. - * - * Only set the size for ERROR_INSUFFICIENT_BUFFER - */ - size = sizeW * 2; + *lpcchBuffer = sizeW*2; /* we can only provide an upper estimation of string length */ + goto cleanup; } - else if (lpDisplayName && *lpcchBuffer && !ret) + + if (!WideCharToMultiByte(CP_ACP, 0, lpDisplayNameW, (sizeW + 1), lpDisplayName, + *lpcchBuffer, NULL, NULL )) { - /* Request for displayname. - * - * size only has to be set if this fails - */ - size = sizeW * 2; + *lpcchBuffer = WideCharToMultiByte(CP_ACP, 0, lpDisplayNameW, -1, NULL, 0, NULL, NULL); + goto cleanup; } - WideCharToMultiByte(CP_ACP, 0, lpDisplayNameW, (sizeW + 1), lpDisplayName, - *lpcchBuffer, NULL, NULL ); - - *lpcchBuffer = size; + /* probably due to a bug GetServiceDisplayNameA doesn't modify lpcchBuffer on success. + * (but if the function succeeded it means that is a good upper estimation of the size) */ + ret = TRUE; +cleanup: HeapFree(GetProcessHeap(), 0, lpDisplayNameW); HeapFree(GetProcessHeap(), 0, lpServiceNameW); - - SetLastError(GLE); return ret; } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 79b4c3c..e932c64 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -444,10 +444,17 @@ static void test_get_displayname(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + tempsize = displaysize; + + displaysize = 0; + ret = GetServiceDisplayNameA(scm_handle, spooler, NULL, &displaysize); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(displaysize == tempsize, "Buffer size mismatch (%d vs %d)\n", tempsize, displaysize); /* Buffer is too small */ SetLastError(0xdeadbeef); - tempsize = displaysize; displaysize = (tempsize / 2); ret = GetServiceDisplayNameA(scm_handle, spooler, displayname, &displaysize); ok(!ret, "Expected failure\n");

1 0