ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Allow file stores to support more than one type of file.

This commit is contained in:
Juan Lang 2007-09-28 08:38:12 -07:00 committed by Alexandre Julliard
parent 60fcce5558
commit 99981716b2
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/crypt32/filestore.c
View File

@ -30,6 +30,7 @@ typedef struct _WINE_FILESTOREINFO
DWORD dwOpenFlags; DWORD dwOpenFlags;
HCERTSTORE memStore; HCERTSTORE memStore;
HANDLE file; HANDLE file;
DWORD type;
BOOL dirty; BOOL dirty;
} WINE_FILESTOREINFO, *PWINE_FILESTOREINFO; } WINE_FILESTOREINFO, *PWINE_FILESTOREINFO;
@ -40,7 +41,7 @@ static void WINAPI CRYPT_FileCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
TRACE("(%p, %08x)\n", store, dwFlags); TRACE("(%p, %08x)\n", store, dwFlags);
if (store->dirty) if (store->dirty)
CertSaveStore(store->memStore, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 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); CertCloseStore(store->memStore, dwFlags);
CloseHandle(store->file); CloseHandle(store->file);
CryptMemFree(store); CryptMemFree(store);
@ -100,7 +101,19 @@ static BOOL WINAPI CRYPT_FileControl(HCERTSTORE hCertStore, DWORD dwFlags,
case CERT_STORE_CTRL_RESYNC: case CERT_STORE_CTRL_RESYNC:
CRYPT_EmptyStore(store->memStore); CRYPT_EmptyStore(store->memStore);
store->dirty = FALSE; 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; break;
case CERT_STORE_CTRL_COMMIT: case CERT_STORE_CTRL_COMMIT:
if (!(store->dwOpenFlags & CERT_FILE_STORE_COMMIT_ENABLE_FLAG)) 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) else if (store->dirty)
ret = CertSaveStore(store->memStore, ret = CertSaveStore(store->memStore,
X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 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 else
ret = TRUE; ret = TRUE;
break; break;
@ -140,7 +153,7 @@ static void *fileProvFuncs[] = {
}; };
static PWINECRYPT_CERTSTORE CRYPT_CreateFileStore(DWORD dwFlags, static PWINECRYPT_CERTSTORE CRYPT_CreateFileStore(DWORD dwFlags,
HCERTSTORE memStore, HANDLE file) HCERTSTORE memStore, HANDLE file, DWORD type)
{ {
PWINECRYPT_CERTSTORE store = NULL; PWINECRYPT_CERTSTORE store = NULL;
PWINE_FILESTOREINFO info = CryptMemAlloc(sizeof(WINE_FILESTOREINFO)); PWINE_FILESTOREINFO info = CryptMemAlloc(sizeof(WINE_FILESTOREINFO));
@ -152,6 +165,7 @@ static PWINECRYPT_CERTSTORE CRYPT_CreateFileStore(DWORD dwFlags,
info->dwOpenFlags = dwFlags; info->dwOpenFlags = dwFlags;
info->memStore = memStore; info->memStore = memStore;
info->file = file; info->file = file;
info->type = type;
info->dirty = FALSE; info->dirty = FALSE;
provInfo.cbSize = sizeof(provInfo); provInfo.cbSize = sizeof(provInfo);
provInfo.cStoreProvFunc = sizeof(fileProvFuncs) / provInfo.cStoreProvFunc = sizeof(fileProvFuncs) /
@ -200,7 +214,8 @@ PWINECRYPT_CERTSTORE CRYPT_FileOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags,
{ {
if (CRYPT_ReadSerializedStoreFromFile(file, memStore)) 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 */ /* File store doesn't need crypto provider, so close it */
if (hCryptProv && if (hCryptProv &&
!(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG))
@ -255,7 +270,8 @@ PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv,
{ {
if (CRYPT_ReadSerializedStoreFromFile(file, memStore)) 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 */ /* File store doesn't need crypto provider, so close it */
if (hCryptProv && if (hCryptProv &&
!(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG)) !(dwFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG))