Sync to Wine-0_9_10:
authorAleksey Bragin <aleksey@reactos.org>
Sun, 16 Apr 2006 19:12:28 +0000 (19:12 +0000)
committerAleksey Bragin <aleksey@reactos.org>
Sun, 16 Apr 2006 19:12:28 +0000 (19:12 +0000)
Juan Lang <juan_lang@yahoo.com>
- crypt32: Move context properties to a separate file.
- crypt32: Move serialization functions to serialize.c.
- crypt32: Implement CertGetValidUsages.
- crypt32: Implement CertDuplicateStore.

Sync to Wine-0_9_9:
Juan Lang <juan_lang@yahoo.com>
- crypt32: implement CryptEnumOIDInfo and CryptFindOIDInfo.
- implement CryptEnumOIDInfo and CryptFindOIDInfo
- implement CertOIDToAlgId and CertAlgIdToOID using CryptFindOIDInfo
- crypt32: Move certificate store functions to their own file.
- crypt32: More encoding/decoding.
  Add support for encoding/decoding basic constraints and enhanced key
  usage, with tests.
- crypt32: Move OIDToAlgID and AlgIDToOID to oid.c.
- crypt32: Correct compile problem on gcc 2.95.
- crypt32: Partially implement CertGetNameString.
Henning Gerhardt <henning.gerhardt@web.de>
- crypt32: Add German resource file.
YunSong Hwang <hys545@dreamwiz.com>
- crypt32: Add Korean translation.
Alexander N. Sшrnes <alex@thehandofagony.com>
- Updated/new Norwegian Bokmеl resources.
Eric Pouech <eric.pouech@wanadoo.fr>
- crypt32: Don't access a blob after freeing it.
Sync to Wine-0_9_8:
Juan Lang <juan_lang@yahoo.com>
- crypt32: Fix a fixme, and remove an old comment.
- crypt32: Output string type in trace.
Alexandre Julliard <julliard@winehq.org>
- Include wine/port.h in files that use exceptions.

Sync to Wine-0_9_7:
Juan Lang <juan@codeweavers.com>
- crypt32: Implement CertRDNValueToStrA and CertNameToStrA, with tests.
- crypt32: Correct X509_NAME decoding, and more stringent tests.
- crypt32: Implement CertRDNValueToStrW and CertNameToStrW, with tests.

svn path=/trunk/; revision=21617

18 files changed:
reactos/dll/win32/crypt32/cert.c
reactos/dll/win32/crypt32/crypt32.rbuild
reactos/dll/win32/crypt32/crypt32.rc
reactos/dll/win32/crypt32/crypt32.spec
reactos/dll/win32/crypt32/crypt32_De.rc [new file with mode: 0644]
reactos/dll/win32/crypt32/crypt32_En.rc [new file with mode: 0644]
reactos/dll/win32/crypt32/crypt32_Ko.rc [new file with mode: 0644]
reactos/dll/win32/crypt32/crypt32_No.rc [new file with mode: 0644]
reactos/dll/win32/crypt32/crypt32_private.h
reactos/dll/win32/crypt32/cryptres.h [new file with mode: 0644]
reactos/dll/win32/crypt32/encode.c
reactos/dll/win32/crypt32/main.c
reactos/dll/win32/crypt32/oid.c
reactos/dll/win32/crypt32/proplist.c [new file with mode: 0644]
reactos/dll/win32/crypt32/serialize.c [new file with mode: 0644]
reactos/dll/win32/crypt32/store.c [new file with mode: 0644]
reactos/dll/win32/crypt32/str.c [new file with mode: 0644]
reactos/media/doc/README.WINE

index 4f822d1..52b8ce1 100644 (file)
@@ -1,6 +1,5 @@
 /*
- * Copyright 2002 Mike McCormack for CodeWeavers
- * Copyright 2004,2005 Juan Lang
+ * Copyright 2004-2006 Juan Lang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * FIXME:
- * - As you can see in the stubs below, support for CRLs and CTLs is missing.
- *   Mostly this should be copy-paste work, and some code (e.g. extended
- *   properties) could be shared between them.
- * - Opening a cert store provider should be morphed to support loading
- *   external DLLs.
- * - The concept of physical stores and locations isn't implemented.  (This
- *   doesn't mean registry stores et al aren't implemented.  See the PSDK for
- *   registering and enumerating physical stores and locations.)
- * - Many flags, options and whatnot are unimplemented.
  */
-#include <assert.h>
-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-#include "winreg.h"
-#include "winuser.h"
-#include "wincrypt.h"
-#include "wine/debug.h"
-#include "wine/list.h"
-#include "excpt.h"
-#include "wine/exception.h"
-#include "crypt32_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(crypt);
-
-#define WINE_CRYPTCERTSTORE_MAGIC 0x74726563
-/* The following aren't defined in wincrypt.h, as they're "reserved" */
-#define CERT_CERT_PROP_ID 32
-#define CERT_CRL_PROP_ID  33
-#define CERT_CTL_PROP_ID  34
-
-/* Some typedefs that make it easier to abstract which type of context we're
- * working with.
- */
-typedef const void *(WINAPI *CreateContextFunc)(DWORD dwCertEncodingType,
- const BYTE *pbCertEncoded, DWORD cbCertEncoded);
-typedef BOOL (WINAPI *AddContextToStoreFunc)(HCERTSTORE hCertStore,
- const void *context, DWORD dwAddDisposition, const void **ppStoreContext);
-typedef BOOL (WINAPI *AddEncodedContextToStoreFunc)(HCERTSTORE hCertStore,
- DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded,
- DWORD dwAddDisposition, const void **ppContext);
-typedef const void *(WINAPI *EnumContextsInStoreFunc)(HCERTSTORE hCertStore,
- const void *pPrevContext);
-typedef BOOL (WINAPI *GetContextPropertyFunc)(const void *context,
- DWORD dwPropID, void *pvData, DWORD *pcbData);
-typedef BOOL (WINAPI *SetContextPropertyFunc)(const void *context,
- DWORD dwPropID, DWORD dwFlags, const void *pvData);
-typedef BOOL (WINAPI *SerializeElementFunc)(const void *context, DWORD dwFlags,
- BYTE *pbElement, DWORD *pcbElement);
-typedef BOOL (WINAPI *FreeContextFunc)(const void *context);
-typedef BOOL (WINAPI *DeleteContextFunc)(const void *context);
-
-/* An abstract context (certificate, CRL, or CTL) interface */
-typedef struct _WINE_CONTEXT_INTERFACE
-{
-    CreateContextFunc            create;
-    AddContextToStoreFunc        addContextToStore;
-    AddEncodedContextToStoreFunc addEncodedToStore;
-    EnumContextsInStoreFunc      enumContextsInStore;
-    GetContextPropertyFunc       getProp;
-    SetContextPropertyFunc       setProp;
-    SerializeElementFunc         serialize;
-    FreeContextFunc              free;
-    DeleteContextFunc            deleteFromStore;
-} WINE_CONTEXT_INTERFACE, *PWINE_CONTEXT_INTERFACE;
-
-static const WINE_CONTEXT_INTERFACE gCertInterface = {
-    (CreateContextFunc)CertCreateCertificateContext,
-    (AddContextToStoreFunc)CertAddCertificateContextToStore,
-    (AddEncodedContextToStoreFunc)CertAddEncodedCertificateToStore,
-    (EnumContextsInStoreFunc)CertEnumCertificatesInStore,
-    (GetContextPropertyFunc)CertGetCertificateContextProperty,
-    (SetContextPropertyFunc)CertSetCertificateContextProperty,
-    (SerializeElementFunc)CertSerializeCertificateStoreElement,
-    (FreeContextFunc)CertFreeCertificateContext,
-    (DeleteContextFunc)CertDeleteCertificateFromStore,
-};
-
-static const WINE_CONTEXT_INTERFACE gCRLInterface = {
-    (CreateContextFunc)CertCreateCRLContext,
-    (AddContextToStoreFunc)CertAddCRLContextToStore,
-    (AddEncodedContextToStoreFunc)CertAddEncodedCRLToStore,
-    (EnumContextsInStoreFunc)CertEnumCRLsInStore,
-    (GetContextPropertyFunc)CertGetCRLContextProperty,
-    (SetContextPropertyFunc)CertSetCRLContextProperty,
-    (SerializeElementFunc)CertSerializeCRLStoreElement,
-    (FreeContextFunc)CertFreeCRLContext,
-    (DeleteContextFunc)CertDeleteCRLFromStore,
-};
-
-static const WINE_CONTEXT_INTERFACE gCTLInterface = {
-    (CreateContextFunc)CertCreateCTLContext,
-    (AddContextToStoreFunc)CertAddCTLContextToStore,
-    (AddEncodedContextToStoreFunc)CertAddEncodedCTLToStore,
-    (EnumContextsInStoreFunc)CertEnumCTLsInStore,
-    (GetContextPropertyFunc)CertGetCTLContextProperty,
-    (SetContextPropertyFunc)CertSetCTLContextProperty,
-    (SerializeElementFunc)CertSerializeCTLStoreElement,
-    (FreeContextFunc)CertFreeCTLContext,
-    (DeleteContextFunc)CertDeleteCTLFromStore,
-};
-
-struct WINE_CRYPTCERTSTORE;
-
-typedef struct WINE_CRYPTCERTSTORE * (*StoreOpenFunc)(HCRYPTPROV hCryptProv,
- DWORD dwFlags, const void *pvPara);
-
-struct _WINE_CERT_CONTEXT_REF;
-
-/* Called to enumerate the next certificate in a store.  The returned pointer
- * must be newly allocated (via CryptMemAlloc):  CertFreeCertificateContext
- * frees it.
- */
-typedef struct _WINE_CERT_CONTEXT_REF * (*EnumCertFunc)
- (struct WINE_CRYPTCERTSTORE *store, struct _WINE_CERT_CONTEXT_REF *pPrev);
-
-struct _WINE_CERT_CONTEXT;
-
-/* Called to create a new reference to an existing cert context.  Should call
- * CRYPT_InitCertRef to make sure the reference count is properly updated.
- * If the store does not provide any additional allocated data (that is, does
- * not need to implement a FreeCertFunc), it may use CRYPT_CreateCertRef for
- * this.
- */
-typedef struct _WINE_CERT_CONTEXT_REF * (*CreateRefFunc)
- (struct _WINE_CERT_CONTEXT *context, HCERTSTORE store);
-
-/* Optional, called when a cert context reference is being freed.  Don't free
- * the ref pointer itself, CertFreeCertificateContext does that.
- */
-typedef void (*FreeCertFunc)(struct _WINE_CERT_CONTEXT_REF *ref);
-
-typedef enum _CertStoreType {
-    StoreTypeMem,
-    StoreTypeCollection,
-    StoreTypeReg,
-    StoreTypeDummy,
-} CertStoreType;
-
-/* A cert store is polymorphic through the use of function pointers.  A type
- * is still needed to distinguish collection stores from other types.
- * On the function pointers:
- * - closeStore is called when the store's ref count becomes 0
- * - addCert is called with a PWINE_CERT_CONTEXT as the second parameter
- * - control is optional, but should be implemented by any store that supports
- *   persistence
- */
-typedef struct WINE_CRYPTCERTSTORE
-{
-    DWORD                           dwMagic;
-    LONG                            ref;
-    DWORD                           dwOpenFlags;
-    HCRYPTPROV                      cryptProv;
-    CertStoreType                   type;
-    PFN_CERT_STORE_PROV_CLOSE       closeStore;
-    PFN_CERT_STORE_PROV_WRITE_CERT  addCert;
-    CreateRefFunc                   createCertRef;
-    EnumCertFunc                    enumCert;
-    PFN_CERT_STORE_PROV_DELETE_CERT deleteCert;
-    FreeCertFunc                    freeCert;   /* optional */
-    PFN_CERT_STORE_PROV_CONTROL     control;    /* optional */
-} WINECRYPT_CERTSTORE, *PWINECRYPT_CERTSTORE;
-
-/* A certificate context has pointers to data that are owned by this module,
- * so rather than duplicate the data every time a certificate context is
- * copied, I keep a reference count to the data.  Thus I have two data
- * structures, the "true" certificate context (that has the reference count)
- * and a reference certificate context, that has a pointer to the true context.
- * Each one can be cast to a PCERT_CONTEXT, though you'll usually be dealing
- * with the reference version.
- */
-typedef struct _WINE_CERT_CONTEXT
-{
-    CERT_CONTEXT     cert;
-    LONG             ref;
-    CRITICAL_SECTION cs;
-    struct list      extendedProperties;
-} WINE_CERT_CONTEXT, *PWINE_CERT_CONTEXT;
-
-typedef struct _WINE_CERT_CONTEXT_REF
-{
-    CERT_CONTEXT cert;
-    WINE_CERT_CONTEXT *context;
-} WINE_CERT_CONTEXT_REF, *PWINE_CERT_CONTEXT_REF;
-
-/* An extended certificate property in serialized form is prefixed by this
- * header.
- */
-typedef struct _WINE_CERT_PROP_HEADER
-{
-    DWORD propID;
-    DWORD unknown; /* always 1 */
-    DWORD cb;
-} WINE_CERT_PROP_HEADER, *PWINE_CERT_PROP_HEADER;
-
-/* Stores an extended property in a cert. */
-typedef struct _WINE_CERT_PROPERTY
-{
-    WINE_CERT_PROP_HEADER hdr;
-    LPBYTE                pbData;
-    struct list           entry;
-} WINE_CERT_PROPERTY, *PWINE_CERT_PROPERTY;
-
-/* A mem store has a list of these.  They're also returned by the mem store
- * during enumeration.
- */
-typedef struct _WINE_CERT_LIST_ENTRY
-{
-    WINE_CERT_CONTEXT_REF cert;
-    struct list entry;
-} WINE_CERT_LIST_ENTRY, *PWINE_CERT_LIST_ENTRY;
-
-typedef struct _WINE_MEMSTORE
-{
-    WINECRYPT_CERTSTORE hdr;
-    CRITICAL_SECTION    cs;
-    struct list         certs;
-} WINE_MEMSTORE, *PWINE_MEMSTORE;
-
-typedef struct _WINE_HASH_TO_DELETE
-{
-    BYTE        hash[20];
-    struct list entry;
-} WINE_HASH_TO_DELETE, *PWINE_HASH_TO_DELETE;
-
-/* Returned by a reg store during enumeration. */
-typedef struct _WINE_REG_CERT_CONTEXT
-{
-    WINE_CERT_CONTEXT_REF  cert;
-    PWINE_CERT_CONTEXT_REF childContext;
-} WINE_REG_CERT_CONTEXT, *PWINE_REG_CERT_CONTEXT;
-
-typedef struct _WINE_REGSTORE
-{
-    WINECRYPT_CERTSTORE  hdr;
-    PWINECRYPT_CERTSTORE memStore;
-    HKEY                 key;
-    BOOL                 dirty;
-    CRITICAL_SECTION     cs;
-    struct list          certsToDelete;
-} WINE_REGSTORE, *PWINE_REGSTORE;
-
-typedef struct _WINE_STORE_LIST_ENTRY
-{
-    PWINECRYPT_CERTSTORE store;
-    DWORD                dwUpdateFlags;
-    DWORD                dwPriority;
-    struct list          entry;
-} WINE_STORE_LIST_ENTRY, *PWINE_STORE_LIST_ENTRY;
-
-/* Returned by a collection store during enumeration.
- * Note: relies on the list entry being valid after use, which a number of
- * conditions might make untrue (reentrancy, closing a collection store before
- * continuing an enumeration on it, ...).  The tests seem to indicate this
- * sort of unsafety is okay, since Windows isn't well-behaved in these
- * scenarios either.
- */
-typedef struct _WINE_COLLECTION_CERT_CONTEXT
-{
-    WINE_CERT_CONTEXT_REF  cert;
-    PWINE_STORE_LIST_ENTRY entry;
-    PWINE_CERT_CONTEXT_REF childContext;
-} WINE_COLLECTION_CERT_CONTEXT, *PWINE_COLLECTION_CERT_CONTEXT;
-
-typedef struct _WINE_COLLECTIONSTORE
-{
-    WINECRYPT_CERTSTORE hdr;
-    CRITICAL_SECTION    cs;
-    struct list         stores;
-} WINE_COLLECTIONSTORE, *PWINE_COLLECTIONSTORE;
-
-/* Like CertGetCertificateContextProperty, but operates directly on the
- * WINE_CERT_CONTEXT.  Doesn't support special-case properties, since they
- * are handled by CertGetCertificateContextProperty, and are particular to the
- * store in which the property exists (which is separate from the context.)
- */
-static BOOL WINAPI CRYPT_GetCertificateContextProperty(
- PWINE_CERT_CONTEXT context, DWORD dwPropId, void *pvData, DWORD *pcbData);
-
-/* Like CertSetCertificateContextProperty, but operates directly on the
- * WINE_CERT_CONTEXT.  Doesn't handle special cases, since they're handled by
- * CertSetCertificateContextProperty anyway.
- */
-static BOOL WINAPI CRYPT_SetCertificateContextProperty(
- PWINE_CERT_CONTEXT context, DWORD dwPropId, DWORD dwFlags, const void *pvData);
-
-/* Helper function for store reading functions and
- * CertAddSerializedElementToStore.  Returns a context of the appropriate type
- * if it can, or NULL otherwise.  Doesn't validate any of the properties in
- * the serialized context (for example, bad hashes are retained.)
- * *pdwContentType is set to the type of the returned context.
- */
-static const void * WINAPI CRYPT_ReadSerializedElement(const BYTE *pbElement,
- DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType);
-
-static void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, HCRYPTPROV hCryptProv,
- DWORD dwFlags, CertStoreType type)
-{
-    store->ref = 1;
-    store->dwMagic = WINE_CRYPTCERTSTORE_MAGIC;
-    store->type = type;
-    if (!hCryptProv)
-    {
-        hCryptProv = CRYPT_GetDefaultProvider();
-        dwFlags |= CERT_STORE_NO_CRYPT_RELEASE_FLAG;
-    }
-    store->cryptProv = hCryptProv;
-    store->dwOpenFlags = dwFlags;
-}
-
-/* Initializes the reference ref to point to pCertContext, which is assumed to
- * be a PWINE_CERT_CONTEXT, and increments pCertContext's reference count.
- * Also sets the hCertStore member of the reference to store.
- */
-static void CRYPT_InitCertRef(PWINE_CERT_CONTEXT_REF ref,
- PWINE_CERT_CONTEXT context, HCERTSTORE store)
-{
-    TRACE("(%p, %p)\n", ref, context);
-    memcpy(&ref->cert, context, sizeof(ref->cert));
-    ref->context = context;
-    InterlockedIncrement(&context->ref);
-    TRACE("%p's ref count is %ld\n", context, context->ref);
-    ref->cert.hCertStore = store;
-}
-
-static PWINE_CERT_CONTEXT_REF CRYPT_CreateCertRef(PWINE_CERT_CONTEXT context,
- HCERTSTORE store)
-{
-    PWINE_CERT_CONTEXT_REF pCertRef = CryptMemAlloc(
-     sizeof(WINE_CERT_CONTEXT_REF));
-
-    TRACE("(%p, %p)\n", context, store);
-    if (pCertRef)
-        CRYPT_InitCertRef(pCertRef, context, store);
-    return pCertRef;
-}
-
-static BOOL WINAPI CRYPT_MemAddCert(HCERTSTORE store, PCCERT_CONTEXT pCert,
- DWORD dwAddDisposition)
-{
-    WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store;
-    BOOL add = FALSE, ret;
-
-    TRACE("(%p, %p, %ld)\n", store, pCert, dwAddDisposition);
-
-    switch (dwAddDisposition)
-    {
-    case CERT_STORE_ADD_ALWAYS:
-        add = TRUE;
-        break;
-    case CERT_STORE_ADD_NEW:
-    {
-        BYTE hashToAdd[20], hash[20];
-        DWORD size = sizeof(hashToAdd);
-
-        ret = CRYPT_GetCertificateContextProperty((PWINE_CERT_CONTEXT)pCert,
-         CERT_HASH_PROP_ID, hashToAdd, &size);
-        if (ret)
-        {
-            PWINE_CERT_LIST_ENTRY cursor;
-
-            /* Add if no cert with the same hash is found. */
-            add = TRUE;
-            EnterCriticalSection(&ms->cs);
-            LIST_FOR_EACH_ENTRY(cursor, &ms->certs, WINE_CERT_LIST_ENTRY, entry)
-            {
-                size = sizeof(hash);
-                ret = CertGetCertificateContextProperty(&cursor->cert.cert,
-                 CERT_HASH_PROP_ID, hash, &size);
-                if (ret && !memcmp(hashToAdd, hash, size))
-                {
-                    TRACE("found matching certificate, not adding\n");
-                    SetLastError(CRYPT_E_EXISTS);
-                    add = FALSE;
-                    break;
-                }
-            }
-            LeaveCriticalSection(&ms->cs);
-        }
-        break;
-    }
-    case CERT_STORE_ADD_REPLACE_EXISTING:
-    {
-        BYTE hashToAdd[20], hash[20];
-        DWORD size = sizeof(hashToAdd);
-
-        add = TRUE;
-        ret = CRYPT_GetCertificateContextProperty((PWINE_CERT_CONTEXT)pCert,
-         CERT_HASH_PROP_ID, hashToAdd, &size);
-        if (ret)
-        {
-            PWINE_CERT_LIST_ENTRY cursor, next;
-
-            /* Look for existing cert to delete */
-            EnterCriticalSection(&ms->cs);
-            LIST_FOR_EACH_ENTRY_SAFE(cursor, next, &ms->certs,
-             WINE_CERT_LIST_ENTRY, entry)
-            {
-                size = sizeof(hash);
-                ret = CertGetCertificateContextProperty(&cursor->cert.cert,
-                 CERT_HASH_PROP_ID, hash, &size);
-                if (ret && !memcmp(hashToAdd, hash, size))
-                {
-                    TRACE("found matching certificate, replacing\n");
-                    list_remove(&cursor->entry);
-                    CertFreeCertificateContext((PCCERT_CONTEXT)cursor);
-                    break;
-                }
-            }
-            LeaveCriticalSection(&ms->cs);
-        }
-        break;
-    }
-    default:
-        FIXME("Unimplemented add disposition %ld\n", dwAddDisposition);
-        add = FALSE;
-    }
-    if (add)
-    {
-        PWINE_CERT_LIST_ENTRY entry = CryptMemAlloc(
-         sizeof(WINE_CERT_LIST_ENTRY));
-
-        if (entry)
-        {
-            TRACE("adding %p\n", entry);
-            CRYPT_InitCertRef(&entry->cert, (PWINE_CERT_CONTEXT)pCert, store);
-            list_init(&entry->entry);
-            EnterCriticalSection(&ms->cs);
-            list_add_tail(&ms->certs, &entry->entry);
-            LeaveCriticalSection(&ms->cs);
-            ret = TRUE;
-        }
-        else
-            ret = FALSE;
-    }
-    else
-        ret = FALSE;
-    TRACE("returning %d\n", ret);
-    return ret;
-}
-
-static PWINE_CERT_CONTEXT_REF CRYPT_MemEnumCert(PWINECRYPT_CERTSTORE store,
- PWINE_CERT_CONTEXT_REF pPrev)
-{
-    WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store;
-    PWINE_CERT_LIST_ENTRY prevEntry = (PWINE_CERT_LIST_ENTRY)pPrev, ret;
-    struct list *listNext;
-
-    TRACE("(%p, %p)\n", store, pPrev);
-    EnterCriticalSection(&ms->cs);
-    if (prevEntry)
-    {
-        listNext = list_next(&ms->certs, &prevEntry->entry);
-        CertFreeCertificateContext((PCCERT_CONTEXT)pPrev);
-    }
-    else
-        listNext = list_next(&ms->certs, &ms->certs);
-    if (listNext)
-    {
-        ret = CryptMemAlloc(sizeof(WINE_CERT_LIST_ENTRY));
-        if (ret)
-        {
-            memcpy(ret, LIST_ENTRY(listNext, WINE_CERT_LIST_ENTRY, entry),
-             sizeof(WINE_CERT_LIST_ENTRY));
-            InterlockedIncrement(&ret->cert.context->ref);
-        }
-    }
-    else
-    {
-        SetLastError(CRYPT_E_NOT_FOUND);
-        ret = NULL;
-    }
-    LeaveCriticalSection(&ms->cs);
-
-    TRACE("returning %p\n", ret);
-    return (PWINE_CERT_CONTEXT_REF)ret;
-}
-
-static void CRYPT_UnrefCertificateContext(PWINE_CERT_CONTEXT_REF ref);
-
-static BOOL WINAPI CRYPT_MemDeleteCert(HCERTSTORE hCertStore,
- PCCERT_CONTEXT pCertContext, DWORD dwFlags)
-{
-    WINE_MEMSTORE *store = (WINE_MEMSTORE *)hCertStore;
-    WINE_CERT_CONTEXT_REF *ref = (WINE_CERT_CONTEXT_REF *)pCertContext;
-    PWINE_CERT_LIST_ENTRY cert, next;
-    BOOL ret = TRUE;
-
-    /* Find the entry associated with the passed-in context, since the
-     * passed-in context may not be a list entry itself (e.g. if it came from
-     * CertDuplicateCertificateContext.)  Pointing to the same context is
-     * a sufficient test of equality.
-     */
-    EnterCriticalSection(&store->cs);
-    LIST_FOR_EACH_ENTRY_SAFE(cert, next, &store->certs, WINE_CERT_LIST_ENTRY,
-     entry)
-    {
-        if (cert->cert.context == ref->context)
-        {
-            TRACE("removing %p\n", cert);
-            /* FIXME: this isn't entirely thread-safe, the entry itself isn't
-             * protected.
-             */
-            list_remove(&cert->entry);
-            /* FIXME: generally I should do the following, otherwise there is
-             * a memory leak.  But doing so when called by
-             * CertDeleteCertificateFromStore results in a double free, so
-             * leaving commented for now.
-            ret = CertFreeCertificateContext((PCCERT_CONTEXT)cert);
-             */
-            cert->entry.prev = cert->entry.next = &store->certs;
-            break;
-        }
-    }
-    LeaveCriticalSection(&store->cs);
-    return ret;
-}
-
-static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
-{
-    WINE_MEMSTORE *store = (WINE_MEMSTORE *)hCertStore;
-    PWINE_CERT_LIST_ENTRY cert, next;
-
-    TRACE("(%p, %08lx)\n", store, dwFlags);
-    if (dwFlags)
-        FIXME("Unimplemented flags: %08lx\n", dwFlags);
-
-    /* Note that CertFreeCertificateContext calls HeapFree on the passed-in
-     * pointer if its ref-count reaches zero.  That's okay here because there
-     * aren't any allocated data outside of the WINE_CERT_CONTEXT_REF portion
-     * of the CertListEntry.
-     */
-    LIST_FOR_EACH_ENTRY_SAFE(cert, next, &store->certs, WINE_CERT_LIST_ENTRY,
-     entry)
-    {
-        TRACE("removing %p\n", cert);
-        list_remove(&cert->entry);
-        CertFreeCertificateContext((PCCERT_CONTEXT)cert);
-    }
-    DeleteCriticalSection(&store->cs);
-    CryptMemFree(store);
-}
-
-static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv,
- DWORD dwFlags, const void *pvPara)
-{
-    PWINE_MEMSTORE store;
-
-    TRACE("(%ld, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);
-
-    if (dwFlags & CERT_STORE_DELETE_FLAG)
-    {
-        SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-        store = NULL;
-    }
-    else
-    {
-        store = CryptMemAlloc(sizeof(WINE_MEMSTORE));
-        if (store)
-        {
-            memset(store, 0, sizeof(WINE_MEMSTORE));
-            CRYPT_InitStore(&store->hdr, hCryptProv, dwFlags, StoreTypeMem);
-            store->hdr.closeStore    = CRYPT_MemCloseStore;
-            store->hdr.addCert       = CRYPT_MemAddCert;
-            store->hdr.createCertRef = CRYPT_CreateCertRef;
-            store->hdr.enumCert      = CRYPT_MemEnumCert;
-            store->hdr.deleteCert    = CRYPT_MemDeleteCert;
-            store->hdr.freeCert      = NULL;
-            InitializeCriticalSection(&store->cs);
-            list_init(&store->certs);
-        }
-    }
-    return (PWINECRYPT_CERTSTORE)store;
-}
-
-static BOOL WINAPI CRYPT_CollectionAddCert(HCERTSTORE store,
- PCCERT_CONTEXT pCert, DWORD dwAddDisposition)
-{
-    PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store;
-    PWINE_STORE_LIST_ENTRY entry, next;
-    BOOL ret;
-
-    TRACE("(%p, %p, %ld)\n", store, pCert, dwAddDisposition);
-
-    ret = FALSE;
-    EnterCriticalSection(&cs->cs);
-    LIST_FOR_EACH_ENTRY_SAFE(entry, next, &cs->stores, WINE_STORE_LIST_ENTRY,
-     entry)
-    {
-        if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG)
-        {
-            ret = entry->store->addCert(entry->store, pCert, dwAddDisposition);
-            break;
-        }
-    }
-    LeaveCriticalSection(&cs->cs);
-    SetLastError(ret ? ERROR_SUCCESS : HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED));
-    return ret;
-}
-
-static PWINE_CERT_CONTEXT_REF CRYPT_CollectionCreateCertRef(
- PWINE_CERT_CONTEXT context, HCERTSTORE store)
-{
-    PWINE_COLLECTION_CERT_CONTEXT ret = CryptMemAlloc(
-     sizeof(WINE_COLLECTION_CERT_CONTEXT));
-
-    if (ret)
-    {
-        /* Initialize to empty for now, just make sure the size is right */
-        CRYPT_InitCertRef((PWINE_CERT_CONTEXT_REF)ret, context, store);
-        ret->entry = NULL;
-        ret->childContext = NULL;
-    }
-    return (PWINE_CERT_CONTEXT_REF)ret;
-}
-
-static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags)
-{
-    PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store;
-    PWINE_STORE_LIST_ENTRY entry, next;
-
-    TRACE("(%p, %08lx)\n", store, dwFlags);
-
-    LIST_FOR_EACH_ENTRY_SAFE(entry, next, &cs->stores, WINE_STORE_LIST_ENTRY,
-     entry)
-    {
-        TRACE("closing %p\n", entry);
-        CertCloseStore((HCERTSTORE)entry->store, dwFlags);
-        CryptMemFree(entry);
-    }
-    DeleteCriticalSection(&cs->cs);
-    CryptMemFree(cs);
-}
-
-/* Advances a collection enumeration by one cert, if possible, where advancing
- * means:
- * - calling the current store's enumeration function once, and returning
- *   the enumerated cert if one is returned
- * - moving to the next store if the current store has no more items, and
- *   recursively calling itself to get the next item.
- * Returns NULL if the collection contains no more items or on error.
- * Assumes the collection store's lock is held.
- */
-static PWINE_COLLECTION_CERT_CONTEXT CRYPT_CollectionAdvanceEnum(
- PWINE_COLLECTIONSTORE store, PWINE_STORE_LIST_ENTRY storeEntry,
- PWINE_COLLECTION_CERT_CONTEXT pPrev)
-{
-    PWINE_COLLECTION_CERT_CONTEXT ret;
-    PWINE_CERT_CONTEXT_REF child;
-    struct list *storeNext = list_next(&store->stores, &storeEntry->entry);
-
-    TRACE("(%p, %p, %p)\n", store, storeEntry, pPrev);
-
-    child = storeEntry->store->enumCert((HCERTSTORE)storeEntry->store,
-     pPrev ? pPrev->childContext : NULL);
-    if (pPrev)
-    {
-        pPrev->childContext = NULL;
-        CertFreeCertificateContext((PCCERT_CONTEXT)pPrev);
-        pPrev = NULL;
-    }
-    if (child)
-    {
-        ret = (PWINE_COLLECTION_CERT_CONTEXT)CRYPT_CollectionCreateCertRef(
-         child->context, store);
-        if (ret)
-        {
-            ret->entry = storeEntry;
-            ret->childContext = child;
-        }
-        else
-            CertFreeCertificateContext((PCCERT_CONTEXT)child);
-    }
-    else
-    {
-        if (storeNext)
-        {
-            storeEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry);
-            ret = CRYPT_CollectionAdvanceEnum(store, storeEntry, NULL);
-        }
-        else
-        {
-            SetLastError(CRYPT_E_NOT_FOUND);
-            ret = NULL;
-        }
-    }
-    TRACE("returning %p\n", ret);
-    return ret;
-}
-
-static PWINE_CERT_CONTEXT_REF CRYPT_CollectionEnumCert(
- PWINECRYPT_CERTSTORE store, PWINE_CERT_CONTEXT_REF pPrev)
-{
-    PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store;
-    PWINE_COLLECTION_CERT_CONTEXT prevEntry =
-     (PWINE_COLLECTION_CERT_CONTEXT)pPrev, ret;
-
-    TRACE("(%p, %p)\n", store, pPrev);
-
-    if (prevEntry)
-    {
-        EnterCriticalSection(&cs->cs);
-        ret = CRYPT_CollectionAdvanceEnum(cs, prevEntry->entry, prevEntry);
-        LeaveCriticalSection(&cs->cs);
-    }
-    else
-    {
-        EnterCriticalSection(&cs->cs);
-        if (!list_empty(&cs->stores))
-        {
-            PWINE_STORE_LIST_ENTRY storeEntry;
-
-            storeEntry = LIST_ENTRY(cs->stores.next, WINE_STORE_LIST_ENTRY,
-             entry);
-            ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, prevEntry);
-        }
-        else
-        {
-            SetLastError(CRYPT_E_NOT_FOUND);
-            ret = NULL;
-        }
-        LeaveCriticalSection(&cs->cs);
-    }
-    TRACE("returning %p\n", ret);
-    return (PWINE_CERT_CONTEXT_REF)ret;
-}
-
-static BOOL WINAPI CRYPT_CollectionDeleteCert(HCERTSTORE hCertStore,
- PCCERT_CONTEXT pCertContext, DWORD dwFlags)
-{
-    PWINE_COLLECTION_CERT_CONTEXT context =
-     (PWINE_COLLECTION_CERT_CONTEXT)pCertContext;
-    BOOL ret;
-
-    TRACE("(%p, %p, %08lx)\n", hCertStore, pCertContext, dwFlags);
-
-    ret = CertDeleteCertificateFromStore((PCCERT_CONTEXT)context->childContext);
-    if (ret)
-        context->childContext = NULL;
-    return ret;
-}
-
-static void CRYPT_CollectionFreeCert(PWINE_CERT_CONTEXT_REF ref)
-{
-    PWINE_COLLECTION_CERT_CONTEXT context = (PWINE_COLLECTION_CERT_CONTEXT)ref;
-
-    TRACE("(%p)\n", ref);
-
-    if (context->childContext)
-        CertFreeCertificateContext((PCCERT_CONTEXT)context->childContext);
-}
-
-static WINECRYPT_CERTSTORE *CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv,
- DWORD dwFlags, const void *pvPara)
-{
-    PWINE_COLLECTIONSTORE store;
-
-    if (dwFlags & CERT_STORE_DELETE_FLAG)
-    {
-        SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-        store = NULL;
-    }
-    else
-    {
-        store = CryptMemAlloc(sizeof(WINE_COLLECTIONSTORE));
-        if (store)
-        {
-            memset(store, 0, sizeof(WINE_COLLECTIONSTORE));
-            CRYPT_InitStore(&store->hdr, hCryptProv, dwFlags,
-             StoreTypeCollection);
-            store->hdr.closeStore    = CRYPT_CollectionCloseStore;
-            store->hdr.addCert       = CRYPT_CollectionAddCert;
-            store->hdr.createCertRef = CRYPT_CollectionCreateCertRef;
-            store->hdr.enumCert      = CRYPT_CollectionEnumCert;
-            store->hdr.deleteCert    = CRYPT_CollectionDeleteCert;
-            store->hdr.freeCert      = CRYPT_CollectionFreeCert;
-            InitializeCriticalSection(&store->cs);
-            list_init(&store->stores);
-        }
-    }
-    return (PWINECRYPT_CERTSTORE)store;
-}
-
-static void CRYPT_HashToStr(LPBYTE hash, LPWSTR asciiHash)
-{
-    static const WCHAR fmt[] = { '%','0','2','X',0 };
-    DWORD i;
-
-    assert(hash);
-    assert(asciiHash);
-
-    for (i = 0; i < 20; i++)
-        wsprintfW(asciiHash + i * 2, fmt, hash[i]);
-}
-
-static const WCHAR CertsW[] = { 'C','e','r','t','i','f','i','c','a','t','e','s',
- 0 };
-static const WCHAR CRLsW[] = { 'C','R','L','s',0 };
-static const WCHAR CTLsW[] = { 'C','T','L','s',0 };
-static const WCHAR BlobW[] = { 'B','l','o','b',0 };
-
-static void CRYPT_RegReadSerializedFromReg(PWINE_REGSTORE store, HKEY key,
- DWORD contextType)
-{
-    LONG rc;
-    DWORD index = 0;
-    WCHAR subKeyName[MAX_PATH];
-
-    do {
-        DWORD size = sizeof(subKeyName) / sizeof(WCHAR);
-
-        rc = RegEnumKeyExW(key, index++, subKeyName, &size, NULL, NULL, NULL,
-         NULL);
-        if (!rc)
-        {
-            HKEY subKey;
-
-            rc = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey);
-            if (!rc)
-            {
-                LPBYTE buf = NULL;
-
-                size = 0;
-                rc = RegQueryValueExW(subKey, BlobW, NULL, NULL, NULL, &size);
-                if (!rc)
-                    buf = CryptMemAlloc(size);
-                if (buf)
-                {
-                    rc = RegQueryValueExW(subKey, BlobW, NULL, NULL, buf,
-                     &size);
-                    if (!rc)
-                    {
-                        const void *context;
-                        DWORD addedType;
-
-                        TRACE("Adding cert with hash %s\n",
-                         debugstr_w(subKeyName));
-                        context = CRYPT_ReadSerializedElement(buf, size,
-                         contextType, &addedType);
-                        if (context)
-                        {
-                            const WINE_CONTEXT_INTERFACE *contextInterface;
-                            BYTE hash[20];
-
-                            switch (addedType)
-                            {
-                            case CERT_STORE_CERTIFICATE_CONTEXT:
-                                contextInterface = &gCertInterface;
-                                break;
-                            case CERT_STORE_CRL_CONTEXT:
-                                contextInterface = &gCRLInterface;
-                                break;
-                            case CERT_STORE_CTL_CONTEXT:
-                                contextInterface = &gCTLInterface;
-                                break;
-                            default:
-                                contextInterface = NULL;
-                            }
-                            if (contextInterface)
-                            {
-                                size = sizeof(hash);
-                                if (contextInterface->getProp(context,
-                                 CERT_HASH_PROP_ID, hash, &size))
-                                {
-                                    WCHAR asciiHash[20 * 2 + 1];
-
-                                    CRYPT_HashToStr(hash, asciiHash);
-                                    TRACE("comparing %s\n",
-                                     debugstr_w(asciiHash));
-                                    TRACE("with %s\n", debugstr_w(subKeyName));
-                                    if (!lstrcmpW(asciiHash, subKeyName))
-                                    {
-                                        TRACE("hash matches, adding\n");
-                                        contextInterface->addContextToStore(
-                                         store, context,
-                                         CERT_STORE_ADD_REPLACE_EXISTING, NULL);
-                                    }
-                                    else
-                                        TRACE("hash doesn't match, ignoring\n");
-                                }
-                                contextInterface->free(context);
-                            }
-                        }
-                    }
-                    CryptMemFree(buf);
-                }
-                RegCloseKey(subKey);
-            }
-            /* Ignore intermediate errors, continue enumerating */
-            rc = ERROR_SUCCESS;
-        }
-    } while (!rc);
-}
-
-static void CRYPT_RegReadFromReg(PWINE_REGSTORE store)
-{
-    static const WCHAR *subKeys[] = { CertsW, CRLsW, CTLsW };
-    static const DWORD contextFlags[] = { CERT_STORE_CERTIFICATE_CONTEXT_FLAG,
-     CERT_STORE_CRL_CONTEXT_FLAG, CERT_STORE_CTL_CONTEXT_FLAG };
-    DWORD i;
-
-    for (i = 0; i < sizeof(subKeys) / sizeof(subKeys[0]); i++)
-    {
-        HKEY key;
-        LONG rc;
-
-        rc = RegCreateKeyExW(store->key, subKeys[i], 0, NULL, 0, KEY_READ, NULL,
-         &key, NULL);
-        if (!rc)
-        {
-            CRYPT_RegReadSerializedFromReg(store, key, contextFlags[i]);
-            RegCloseKey(key);
-        }
-    }
-}
-
-/* Hash is assumed to be 20 bytes in length (a SHA-1 hash) */
-static BOOL CRYPT_WriteSerializedToReg(HKEY key, LPBYTE hash, LPBYTE buf,
- DWORD len)
-{
-    WCHAR asciiHash[20 * 2 + 1];
-    LONG rc;
-    HKEY subKey;
-    BOOL ret;
-
-    CRYPT_HashToStr(hash, asciiHash);
-    rc = RegCreateKeyExW(key, asciiHash, 0, NULL, 0, KEY_ALL_ACCESS, NULL,
-     &subKey, NULL);
-    if (!rc)
-    {
-        rc = RegSetValueExW(subKey, BlobW, 0, REG_BINARY, buf, len);
-        RegCloseKey(subKey);
-    }
-    if (!rc)
-        ret = TRUE;
-    else
-    {
-        SetLastError(rc);
-        ret = FALSE;
-    }
-    return ret;
-}
-
-static BOOL CRYPT_SerializeContextsToReg(HKEY key,
- const WINE_CONTEXT_INTERFACE *contextInterface, HCERTSTORE memStore)
-{
-    const void *context = NULL;
-    BOOL ret;
-
-    do {
-        context = contextInterface->enumContextsInStore(memStore, context);
-        if (context)
-        {
-            BYTE hash[20];
-            DWORD hashSize = sizeof(hash);
-
-            ret = contextInterface->getProp(context, CERT_HASH_PROP_ID, hash,
-             &hashSize);
-            if (ret)
-            {
-                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 = CRYPT_WriteSerializedToReg(key, hash, buf, size);
-                }
-                CryptMemFree(buf);
-            }
-        }
-        else
-            ret = TRUE;
-    } while (ret && context != NULL);
-    if (context)
-        contextInterface->free(context);
-    return ret;
-}
-
-static BOOL CRYPT_RegWriteToReg(PWINE_REGSTORE store)
-{
-    static const WCHAR *subKeys[] = { CertsW, CRLsW, CTLsW };
-    static const WINE_CONTEXT_INTERFACE *interfaces[] = { &gCertInterface,
-     &gCRLInterface, &gCTLInterface };
-    struct list *listToDelete[] = { &store->certsToDelete, NULL, NULL };
-    BOOL ret = TRUE;
-    DWORD i;
-
-    for (i = 0; ret && i < sizeof(subKeys) / sizeof(subKeys[0]); i++)
-    {
-        HKEY key;
-        LONG rc = RegCreateKeyExW(store->key, subKeys[i], 0, NULL, 0,
-         KEY_ALL_ACCESS, NULL, &key, NULL);
-
-        if (!rc)
-        {
-            if (listToDelete[i])
-            {
-                PWINE_HASH_TO_DELETE toDelete, next;
-                WCHAR asciiHash[20 * 2 + 1];
-
-                EnterCriticalSection(&store->cs);
-                LIST_FOR_EACH_ENTRY_SAFE(toDelete, next, listToDelete[i],
-                 WINE_HASH_TO_DELETE, entry)
-                {
-                    LONG rc;
-
-                    CRYPT_HashToStr(toDelete->hash, asciiHash);
-                    TRACE("Removing %s\n", debugstr_w(asciiHash));
-                    rc = RegDeleteKeyW(key, asciiHash);
-                    if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND)
-                    {
-                        SetLastError(rc);
-                        ret = FALSE;
-                    }
-                    list_remove(&toDelete->entry);
-                    CryptMemFree(toDelete);
-                }
-                LeaveCriticalSection(&store->cs);
-            }
-            ret = CRYPT_SerializeContextsToReg(key, interfaces[i],
-             store->memStore);
-            RegCloseKey(key);
-        }
-        else
-        {
-            SetLastError(rc);
-            ret = FALSE;
-        }
-    }
-    return ret;
-}
-
-/* If force is true or the registry store is dirty, writes the contents of the
- * store to the registry.
- */
-static BOOL CRYPT_RegFlushStore(PWINE_REGSTORE store, BOOL force)
-{
-    BOOL ret;
-
-    if (store->dirty || force)
-        ret = CRYPT_RegWriteToReg(store);
-    else
-        ret = TRUE;
-    return ret;
-}
-
-static void WINAPI CRYPT_RegCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
-{
-    PWINE_REGSTORE store = (PWINE_REGSTORE)hCertStore;
-
-    TRACE("(%p, %08lx)\n", store, dwFlags);
-    if (dwFlags)
-        FIXME("Unimplemented flags: %08lx\n", dwFlags);
-
-    CRYPT_RegFlushStore(store, FALSE);
-    /* certsToDelete should already be cleared by this point */
-    store->memStore->closeStore(store->memStore, 0);
-    RegCloseKey(store->key);
-    DeleteCriticalSection(&store->cs);
-    CryptMemFree(store);
-}
-
-static BOOL WINAPI CRYPT_RegAddCert(HCERTSTORE hCertStore, PCCERT_CONTEXT cert,
- DWORD dwAddDisposition)
-{
-    PWINE_REGSTORE store = (PWINE_REGSTORE)hCertStore;
-    BOOL ret;
-
-    TRACE("(%p, %p, %ld)\n", hCertStore, cert, dwAddDisposition);
-
-    if (store->hdr.dwOpenFlags & CERT_STORE_READONLY_FLAG)
-    {
-        SetLastError(ERROR_ACCESS_DENIED);
-        ret = FALSE;
-    }
-    else
-    {
-        ret = store->memStore->addCert(store->memStore, cert, dwAddDisposition);
-        if (ret)
-            store->dirty = TRUE;
-    }
-    return ret;
-}
-
-static PWINE_CERT_CONTEXT_REF CRYPT_RegCreateCertRef(
- PWINE_CERT_CONTEXT context, HCERTSTORE store)
-{
-    PWINE_REG_CERT_CONTEXT ret = CryptMemAlloc(sizeof(WINE_REG_CERT_CONTEXT));
-
-    if (ret)
-    {
-        CRYPT_InitCertRef((PWINE_CERT_CONTEXT_REF)ret, context, store);
-        ret->childContext = NULL;
-    }
-    return (PWINE_CERT_CONTEXT_REF)ret;
-}
-
-static PWINE_CERT_CONTEXT_REF CRYPT_RegEnumCert(PWINECRYPT_CERTSTORE store,
- PWINE_CERT_CONTEXT_REF pPrev)
-{
-    PWINE_REGSTORE rs = (PWINE_REGSTORE)store;
-    PWINE_CERT_CONTEXT_REF child;
-    PWINE_REG_CERT_CONTEXT prev = (PWINE_REG_CERT_CONTEXT)pPrev, ret = NULL;
-
-    TRACE("(%p, %p)\n", store, pPrev);
-
-    child = rs->memStore->enumCert(rs->memStore, prev ? prev->childContext
-     : NULL);
-    if (prev)
-    {
-        prev->childContext = NULL;
-        CertFreeCertificateContext((PCCERT_CONTEXT)prev);
-        prev = NULL;
-    }
-    if (child)
-    {
-        ret = (PWINE_REG_CERT_CONTEXT)CRYPT_RegCreateCertRef(child->context,
-         store);
-        if (ret)
-            ret->childContext = child;
-        else
-            CertFreeCertificateContext((PCCERT_CONTEXT)child);
-    }
-    return (PWINE_CERT_CONTEXT_REF)ret;
-}
-
-static BOOL WINAPI CRYPT_RegDeleteCert(HCERTSTORE hCertStore,
- PCCERT_CONTEXT pCertContext, DWORD dwFlags)
-{
-    PWINE_REGSTORE store = (PWINE_REGSTORE)hCertStore;
-    BOOL ret;
-
-    TRACE("(%p, %p, %08lx)\n", store, pCertContext, dwFlags);
-
-    if (store->hdr.dwOpenFlags & CERT_STORE_READONLY_FLAG)
-    {
-        SetLastError(ERROR_ACCESS_DENIED);
-        ret = FALSE;
-    }
-    else
-    {
-        PWINE_HASH_TO_DELETE toDelete =
-         CryptMemAlloc(sizeof(WINE_HASH_TO_DELETE));
-
-        if (toDelete)
-        {
-            DWORD size = sizeof(toDelete->hash);
-
-            ret = CertGetCertificateContextProperty(pCertContext,
-             CERT_HASH_PROP_ID, toDelete->hash, &size);
-            if (ret)
-            {
-                list_init(&toDelete->entry);
-                EnterCriticalSection(&store->cs);
-                list_add_tail(&store->certsToDelete, &toDelete->entry);
-                LeaveCriticalSection(&store->cs);
-                ret = store->memStore->deleteCert(store->memStore, pCertContext,
-                 dwFlags);
-            }
-            else
-                CryptMemFree(toDelete);
-        }
-        else
-            ret = FALSE;
-        if (ret)
-            store->dirty = TRUE;
-    }
-    return ret;
-}
-
-static void CRYPT_RegFreeCert(PWINE_CERT_CONTEXT_REF ref)
-{
-    PWINE_REG_CERT_CONTEXT context = (PWINE_REG_CERT_CONTEXT)ref;
-
-    TRACE("(%p)\n", ref);
-
-    if (context->childContext)
-        CertFreeCertificateContext((PCCERT_CONTEXT)context->childContext);
-}
-
-static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,
- DWORD dwCtrlType, void const *pvCtrlPara)
-{
-    PWINE_REGSTORE store = (PWINE_REGSTORE)hCertStore;
-    BOOL ret;
-
-    switch (dwCtrlType)
-    {
-    case CERT_STORE_CTRL_RESYNC:
-        CRYPT_RegFlushStore(store, FALSE);
-        store->memStore->closeStore(store->memStore, 0);
-        store->memStore = CRYPT_MemOpenStore(store->hdr.cryptProv,
-         store->hdr.dwOpenFlags, NULL);
-        if (store->memStore)
-        {
-            CRYPT_RegReadFromReg(store);
-            ret = TRUE;
-        }
-        else
-            ret = FALSE;
-        break;
-    case CERT_STORE_CTRL_COMMIT:
-        ret = CRYPT_RegFlushStore(store,
-         dwFlags & CERT_STORE_CTRL_COMMIT_FORCE_FLAG);
-        break;
-    default:
-        FIXME("%ld: stub\n", dwCtrlType);
-        ret = FALSE;
-    }
-    return ret;
-}
-
-/* Copied from shlwapi's SHDeleteKeyW, and reformatted to match this file. */
-static DWORD CRYPT_RecurseDeleteKey(HKEY hKey, LPCWSTR lpszSubKey)
-{
-    DWORD dwRet, dwKeyCount = 0, dwMaxSubkeyLen = 0, dwSize, i;
-    WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf;
-    HKEY hSubKey = 0;
-
-    TRACE("(hkey=%p,%s)\n", hKey, debugstr_w(lpszSubKey));
-
-    dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
-    if (!dwRet)
-    {
-        /* Find how many subkeys there are */
-        dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwKeyCount,
-         &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL);
-        if (!dwRet)
-        {
-            dwMaxSubkeyLen++;
-            if (dwMaxSubkeyLen > sizeof(szNameBuf)/sizeof(WCHAR))
-            {
-                /* Name too big: alloc a buffer for it */
-                lpszName = CryptMemAlloc(dwMaxSubkeyLen*sizeof(WCHAR));
-            }
-
-            if (!lpszName)
-                dwRet = ERROR_NOT_ENOUGH_MEMORY;
-            else
-            {
-                /* Recursively delete all the subkeys */
-                for (i = 0; i < dwKeyCount && !dwRet; i++)
-                {
-                    dwSize = dwMaxSubkeyLen;
-                    dwRet = RegEnumKeyExW(hSubKey, i, lpszName, &dwSize, NULL,
-                     NULL, NULL, NULL);
-                    if (!dwRet)
-                        dwRet = CRYPT_RecurseDeleteKey(hSubKey, lpszName);
-                }
-
-                if (lpszName != szNameBuf)
-                {
-                    /* Free buffer if allocated */
-                    CryptMemFree(lpszName);
-                }
-            }
-        }
-
-        RegCloseKey(hSubKey);
-        if (!dwRet)
-            dwRet = RegDeleteKeyW(hKey, lpszSubKey);
-    }
-    return dwRet;
-}
-
-static WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv,
- DWORD dwFlags, const void *pvPara)
-{
-    PWINE_REGSTORE store = NULL;
-
-    TRACE("(%ld, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);
-
-    if (dwFlags & CERT_STORE_DELETE_FLAG)
-    {
-        DWORD rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CertsW);
-
-        if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS)
-            rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CRLsW);
-        if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS)
-            rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CTLsW);
-        if (rc == ERROR_NO_MORE_ITEMS)
-            rc = ERROR_SUCCESS;
-        SetLastError(rc);
-    }
-    else
-    {
-        HKEY key;
-
-        if (DuplicateHandle(GetCurrentProcess(), (HANDLE)pvPara,
-         GetCurrentProcess(), (LPHANDLE)&key,
-         dwFlags & CERT_STORE_READONLY_FLAG ? KEY_READ : KEY_ALL_ACCESS,
-         TRUE, 0))
-        {
-            PWINECRYPT_CERTSTORE memStore;
-
-            memStore = CRYPT_MemOpenStore(hCryptProv, dwFlags, NULL);
-            if (memStore)
-            {
-                store = CryptMemAlloc(sizeof(WINE_REGSTORE));
-                if (store)
-                {
-                    memset(store, 0, sizeof(WINE_REGSTORE));
-                    CRYPT_InitStore(&store->hdr, hCryptProv, dwFlags,
-                     StoreTypeReg);
-                    store->hdr.closeStore    = CRYPT_RegCloseStore;
-                    store->hdr.addCert       = CRYPT_RegAddCert;
-                    store->hdr.createCertRef = CRYPT_RegCreateCertRef;
-                    store->hdr.enumCert      = CRYPT_RegEnumCert;
-                    store->hdr.deleteCert    = CRYPT_RegDeleteCert;
-                    store->hdr.freeCert      = CRYPT_RegFreeCert;
-                    store->hdr.control       = CRYPT_RegControl;
-                    store->memStore          = memStore;
-                    store->key               = key;
-                    InitializeCriticalSection(&store->cs);
-                    list_init(&store->certsToDelete);
-                    CRYPT_RegReadFromReg(store);
-                    store->dirty = FALSE;
-                }
-            }
-        }
-    }
-    TRACE("returning %p\n", store);
-    return (WINECRYPT_CERTSTORE *)store;
-}
-
-/* FIXME: this isn't complete for the Root store, in which the top-level
- * self-signed CA certs reside.  Adding a cert to the Root store should present
- * the user with a dialog indicating the consequences of doing so, and asking
- * the user to confirm whether the cert should be added.
- */
-static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv,
- DWORD dwFlags, const void *pvPara)
-{
-    static const WCHAR fmt[] = { '%','s','\\','%','s',0 };
-    LPCWSTR storeName = (LPCWSTR)pvPara;
-    LPWSTR storePath;
-    PWINECRYPT_CERTSTORE store = NULL;
-    HKEY root;
-    LPCWSTR base;
-    BOOL ret;
-
-    TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags,
-     debugstr_w((LPCWSTR)pvPara));
-
-    if (!pvPara)
-    {
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return NULL;
-    }
-
-    ret = TRUE;
-    switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK)
-    {
-    case CERT_SYSTEM_STORE_LOCAL_MACHINE:
-        root = HKEY_LOCAL_MACHINE;
-        base = CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH;
-        break;
-    case CERT_SYSTEM_STORE_CURRENT_USER:
-        root = HKEY_CURRENT_USER;
-        base = CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH;
-        break;
-    case CERT_SYSTEM_STORE_CURRENT_SERVICE:
-        /* hklm\Software\Microsoft\Cryptography\Services\servicename\
-         * SystemCertificates
-         */
-        FIXME("CERT_SYSTEM_STORE_CURRENT_SERVICE, %s: stub\n",
-         debugstr_w(storeName));
-        return NULL;
-    case CERT_SYSTEM_STORE_SERVICES:
-        /* hklm\Software\Microsoft\Cryptography\Services\servicename\
-         * SystemCertificates
-         */
-        FIXME("CERT_SYSTEM_STORE_SERVICES, %s: stub\n",
-         debugstr_w(storeName));
-        return NULL;
-    case CERT_SYSTEM_STORE_USERS:
-        /* hku\user sid\Software\Microsoft\SystemCertificates */
-        FIXME("CERT_SYSTEM_STORE_USERS, %s: stub\n",
-         debugstr_w(storeName));
-        return NULL;
-    case CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY:
-        root = HKEY_CURRENT_USER;
-        base = CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH;
-        break;
-    case CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY:
-        root = HKEY_LOCAL_MACHINE;
-        base = CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH;
-        break;
-    case CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE:
-        /* hklm\Software\Microsoft\EnterpriseCertificates */
-        FIXME("CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, %s: stub\n",
-         debugstr_w(storeName));
-        return NULL;
-    default:
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return NULL;
-    }
-
-    storePath = CryptMemAlloc((lstrlenW(base) + lstrlenW(storeName) + 2) *
-     sizeof(WCHAR));
-    if (storePath)
-    {
-        LONG rc;
-        HKEY key;
-        REGSAM sam = dwFlags & CERT_STORE_READONLY_FLAG ? KEY_READ :
-            KEY_ALL_ACCESS;
-
-        wsprintfW(storePath, fmt, base, storeName);
-        if (dwFlags & CERT_STORE_OPEN_EXISTING_FLAG)
-            rc = RegOpenKeyExW(root, storePath, 0, sam, &key);
-        else
-        {
-            DWORD disp;
-
-            rc = RegCreateKeyExW(root, storePath, 0, NULL, 0, sam, NULL,
-                                 &key, &disp);
-            if (!rc && dwFlags & CERT_STORE_CREATE_NEW_FLAG &&
-                disp == REG_OPENED_EXISTING_KEY)
-            {
-                RegCloseKey(key);
-                rc = ERROR_FILE_EXISTS;
-            }
-        }
-        if (!rc)
-        {
-            store = CRYPT_RegOpenStore(hCryptProv, dwFlags, key);
-            RegCloseKey(key);
-        }
-        else
-            SetLastError(rc);
-        CryptMemFree(storePath);
-    }
-    return store;
-}
-
-static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreA(HCRYPTPROV hCryptProv,
- DWORD dwFlags, const void *pvPara)
-{
-    int len;
-    PWINECRYPT_CERTSTORE ret = NULL;
-
-    TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags,
-     debugstr_a((LPCSTR)pvPara));
-
-    if (!pvPara)
-    {
-        SetLastError(ERROR_FILE_NOT_FOUND);
-        return NULL;
-    }
-    len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, NULL, 0);
-    if (len)
-    {
-        LPWSTR storeName = CryptMemAlloc(len * sizeof(WCHAR));
-
-        if (storeName)
-        {
-            MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, storeName, len);
-            ret = CRYPT_SysRegOpenStoreW(hCryptProv, dwFlags, storeName);
-            CryptMemFree(storeName);
-        }
-    }
-    return ret;
-}
-
-static PWINECRYPT_CERTSTORE CRYPT_SysOpenStoreW(HCRYPTPROV hCryptProv,
- DWORD dwFlags, const void *pvPara)
-{
-    HCERTSTORE store = 0;
-    BOOL ret;
-
-    TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags,
-     debugstr_w((LPCWSTR)pvPara));
-
-    if (!pvPara)
-    {
-        SetLastError(ERROR_FILE_NOT_FOUND);
-        return NULL;
-    }
-    /* This returns a different error than system registry stores if the
-     * location is invalid.
-     */
-    switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK)
-    {
-    case CERT_SYSTEM_STORE_LOCAL_MACHINE:
-    case CERT_SYSTEM_STORE_CURRENT_USER:
-    case CERT_SYSTEM_STORE_CURRENT_SERVICE:
-    case CERT_SYSTEM_STORE_SERVICES:
-    case CERT_SYSTEM_STORE_USERS:
-    case CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY:
-    case CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY:
-    case CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE:
-        ret = TRUE;
-        break;
-    default:
-        SetLastError(ERROR_FILE_NOT_FOUND);
-        ret = FALSE;
-    }
-    if (ret)
-    {
-        HCERTSTORE regStore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,
-         0, hCryptProv, dwFlags, pvPara);
-
-        if (regStore)
-        {
-            store = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
-             CERT_STORE_CREATE_NEW_FLAG, NULL);
-            if (store)
-            {
-                CertAddStoreToCollection(store, regStore,
-                 dwFlags & CERT_STORE_READONLY_FLAG ? 0 :
-                 CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
-                CertCloseStore(regStore, 0);
-            }
-        }
-    }
-    return (PWINECRYPT_CERTSTORE)store;
-}
-
-static PWINECRYPT_CERTSTORE CRYPT_SysOpenStoreA(HCRYPTPROV hCryptProv,
- DWORD dwFlags, const void *pvPara)
-{
-    int len;
-    PWINECRYPT_CERTSTORE ret = NULL;
-
-    TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags,
-     debugstr_a((LPCSTR)pvPara));
-
-    if (!pvPara)
-    {
-        SetLastError(ERROR_FILE_NOT_FOUND);
-        return NULL;
-    }
-    len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, NULL, 0);
-    if (len)
-    {
-        LPWSTR storeName = CryptMemAlloc(len * sizeof(WCHAR));
-
-        if (storeName)
-        {
-            MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, storeName, len);
-            ret = CRYPT_SysOpenStoreW(hCryptProv, dwFlags, storeName);
-            CryptMemFree(storeName);
-        }
-    }
-    return ret;
-}
-
-HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider,
- DWORD dwMsgAndCertEncodingType, HCRYPTPROV hCryptProv, DWORD dwFlags,
- const void* pvPara)
-{
-    WINECRYPT_CERTSTORE *hcs;
-    StoreOpenFunc openFunc = NULL;
-
-    TRACE("(%s, %08lx, %08lx, %08lx, %p)\n", debugstr_a(lpszStoreProvider),
-          dwMsgAndCertEncodingType, hCryptProv, dwFlags, pvPara);
-
-    if (!HIWORD(lpszStoreProvider))
-    {
-        switch (LOWORD(lpszStoreProvider))
-        {
-        case (int)CERT_STORE_PROV_MEMORY:
-            openFunc = CRYPT_MemOpenStore;
-            break;
-        case (int)CERT_STORE_PROV_REG:
-            openFunc = CRYPT_RegOpenStore;
-            break;
-        case (int)CERT_STORE_PROV_COLLECTION:
-            openFunc = CRYPT_CollectionOpenStore;
-            break;
-        case (int)CERT_STORE_PROV_SYSTEM_A:
-            openFunc = CRYPT_SysOpenStoreA;
-            break;
-        case (int)CERT_STORE_PROV_SYSTEM_W:
-            openFunc = CRYPT_SysOpenStoreW;
-            break;
-        case (int)CERT_STORE_PROV_SYSTEM_REGISTRY_A:
-            openFunc = CRYPT_SysRegOpenStoreA;
-            break;
-        case (int)CERT_STORE_PROV_SYSTEM_REGISTRY_W:
-            openFunc = CRYPT_SysRegOpenStoreW;
-            break;
-        default:
-            if (LOWORD(lpszStoreProvider))
-                FIXME("unimplemented type %d\n", LOWORD(lpszStoreProvider));
-        }
-    }
-    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_MEMORY))
-        openFunc = CRYPT_MemOpenStore;
-    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM))
-        openFunc = CRYPT_SysOpenStoreW;
-    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION))
-        openFunc = CRYPT_CollectionOpenStore;
-    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY))
-        openFunc = CRYPT_SysRegOpenStoreW;
-    else
-    {
-        FIXME("unimplemented type %s\n", lpszStoreProvider);
-        openFunc = NULL;
-    }
-
-    if (!openFunc)
-    {
-        /* FIXME: need to look for an installed provider for this type */
-        SetLastError(ERROR_FILE_NOT_FOUND);
-        hcs = NULL;
-    }
-    else
-        hcs = openFunc(hCryptProv, dwFlags, pvPara);
-    return (HCERTSTORE)hcs;
-}
-
-HCERTSTORE WINAPI CertOpenSystemStoreA(HCRYPTPROV hProv,
- LPCSTR szSubSystemProtocol)
-{
-    HCERTSTORE ret = 0;
-
-    if (szSubSystemProtocol)
-    {
-        int len = MultiByteToWideChar(CP_ACP, 0, szSubSystemProtocol, -1, NULL,
-         0);
-        LPWSTR param = CryptMemAlloc(len * sizeof(WCHAR));
-
-        if (param)
-        {
-            MultiByteToWideChar(CP_ACP, 0, szSubSystemProtocol, -1, param, len);
-            ret = CertOpenSystemStoreW(hProv, param);
-            CryptMemFree(param);
-        }
-    }
-    else
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-    return ret;
-}
-
-HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV hProv,
- LPCWSTR szSubSystemProtocol)
-{
-    HCERTSTORE ret;
-
-    if (!szSubSystemProtocol)
-    {
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return 0;
-    }
-
-    /* FIXME: needs some tests. It seems to open both HKEY_LOCAL_MACHINE and
-     * HKEY_CURRENT_USER stores, but I'm not sure under what conditions, if any,
-     * it fails.
-     */
-    ret = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, hProv,
-     CERT_STORE_CREATE_NEW_FLAG, NULL);
-    if (ret)
-    {
-        HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,
-         0, hProv, CERT_SYSTEM_STORE_LOCAL_MACHINE, szSubSystemProtocol);
-
-        if (store)
-        {
-            CertAddStoreToCollection(ret, store,
-             CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
-            CertCloseStore(store, 0);
-        }
-        store = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,
-         0, hProv, CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol);
-        if (store)
-        {
-            CertAddStoreToCollection(ret, store,
-             CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);
-            CertCloseStore(store, 0);
-        }
-    }
-    return ret;
-}
-
-BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType,
-             DWORD dwSaveAs, DWORD dwSaveTo, void* pvSaveToPara, DWORD dwFlags)
-{
-    FIXME("(%p,%ld,%ld,%ld,%p,%08lx) stub!\n", hCertStore, 
-          dwMsgAndCertEncodingType, dwSaveAs, dwSaveTo, pvSaveToPara, dwFlags);
-    return TRUE;
-}
-
-PCCRL_CONTEXT WINAPI CertCreateCRLContext( DWORD dwCertEncodingType,
-  const BYTE* pbCrlEncoded, DWORD cbCrlEncoded)
-{
-    PCRL_CONTEXT pcrl;
-    BYTE* data;
-
-    TRACE("%08lx %p %08lx\n", dwCertEncodingType, pbCrlEncoded, cbCrlEncoded);
-
-    /* FIXME: semi-stub, need to use CryptDecodeObjectEx to decode the CRL. */
-    pcrl = CryptMemAlloc( sizeof (CRL_CONTEXT) );
-    if( !pcrl )
-        return NULL;
-
-    data = CryptMemAlloc( cbCrlEncoded );
-    if( !data )
-    {
-        CryptMemFree( pcrl );
-        return NULL;
-    }
-
-    pcrl->dwCertEncodingType = dwCertEncodingType;
-    pcrl->pbCrlEncoded       = data;
-    pcrl->cbCrlEncoded       = cbCrlEncoded;
-    pcrl->pCrlInfo           = NULL;
-    pcrl->hCertStore         = 0;
-
-    return pcrl;
-}
-
-/* Decodes the encoded certificate and creates the certificate context for it.
- * The reference count is initially zero, so you must create a reference to it
- * to avoid leaking memory.
- */
-static PWINE_CERT_CONTEXT CRYPT_CreateCertificateContext(
- DWORD dwCertEncodingType, const BYTE *pbCertEncoded, DWORD cbCertEncoded)
-{
-    PWINE_CERT_CONTEXT cert = NULL;
-    BOOL ret;
-    PCERT_SIGNED_CONTENT_INFO signedCert = NULL;
-    PCERT_INFO certInfo = NULL;
-    DWORD size = 0;
-
-    TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCertEncoded,
-     cbCertEncoded);
-
-    /* First try to decode it as a signed cert. */
-    ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT, pbCertEncoded,
-     cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL,
-     (BYTE *)&signedCert, &size);
-    if (ret)
-    {
-        size = 0;
-        ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED,
-         signedCert->ToBeSigned.pbData, signedCert->ToBeSigned.cbData,
-         CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL,
-         (BYTE *)&certInfo, &size);
-        LocalFree(signedCert);
-    }
-    /* Failing that, try it as an unsigned cert */
-    if (!ret)
-    {
-        size = 0;
-        ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED,
-         pbCertEncoded, cbCertEncoded,
-         CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL,
-         (BYTE *)&certInfo, &size);
-    }
-    if (ret)
-    {
-        BYTE *data = NULL;
-
-        cert = CryptMemAlloc(sizeof(WINE_CERT_CONTEXT));
-        if (!cert)
-            goto end;
-        data = CryptMemAlloc(cbCertEncoded);
-        if (!data)
-        {
-            CryptMemFree(cert);
-            cert = NULL;
-            goto end;
-        }
-        memcpy(data, pbCertEncoded, cbCertEncoded);
-        cert->cert.dwCertEncodingType = dwCertEncodingType;
-        cert->cert.pbCertEncoded      = data;
-        cert->cert.cbCertEncoded      = cbCertEncoded;
-        cert->cert.pCertInfo          = certInfo;
-        cert->cert.hCertStore         = 0;
-        cert->ref = 0;
-        InitializeCriticalSection(&cert->cs);
-        list_init(&cert->extendedProperties);
-    }
-
-end:
-    return cert;
-}
-
-static void CRYPT_FreeCert(PWINE_CERT_CONTEXT context)
-{
-    PWINE_CERT_PROPERTY prop, next;
-
-    CryptMemFree(context->cert.pbCertEncoded);
-    LocalFree(context->cert.pCertInfo);
-    DeleteCriticalSection(&context->cs);
-    LIST_FOR_EACH_ENTRY_SAFE(prop, next, &context->extendedProperties,
-     WINE_CERT_PROPERTY, entry)
-    {
-        list_remove(&prop->entry);
-        CryptMemFree(prop->pbData);
-        CryptMemFree(prop);
-    }
-    CryptMemFree(context);
-}
-
-PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType,
- const BYTE *pbCertEncoded, DWORD cbCertEncoded)
-{
-    PWINE_CERT_CONTEXT cert;
-    PWINE_CERT_CONTEXT_REF ret = NULL;
-
-    TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCertEncoded,
-     cbCertEncoded);
-
-    cert = CRYPT_CreateCertificateContext(dwCertEncodingType, pbCertEncoded,
-     cbCertEncoded);
-    if (cert)
-        ret = CRYPT_CreateCertRef(cert, 0);
-    return (PCCERT_CONTEXT)ret;
-}
-
-/* Since the properties are stored in a list, this is a tad inefficient
- * (O(n^2)) since I have to find the previous position every time.
- */
-DWORD WINAPI CertEnumCertificateContextProperties(PCCERT_CONTEXT pCertContext,
- DWORD dwPropId)
-{
-    PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext;
-    DWORD ret;
-
-    TRACE("(%p, %ld)\n", pCertContext, dwPropId);
-
-    EnterCriticalSection(&ref->context->cs);
-    if (dwPropId)
-    {
-        PWINE_CERT_PROPERTY cursor = NULL;
-
-        LIST_FOR_EACH_ENTRY(cursor, &ref->context->extendedProperties,
-         WINE_CERT_PROPERTY, entry)
-        {
-            if (cursor->hdr.propID == dwPropId)
-                break;
-        }
-        if (cursor)
-        {
-            if (cursor->entry.next != &ref->context->extendedProperties)
-                ret = LIST_ENTRY(cursor->entry.next, WINE_CERT_PROPERTY,
-                 entry)->hdr.propID;
-            else
-                ret = 0;
-        }
-        else
-            ret = 0;
-    }
-    else if (!list_empty(&ref->context->extendedProperties))
-        ret = LIST_ENTRY(ref->context->extendedProperties.next,
-         WINE_CERT_PROPERTY, entry)->hdr.propID;
-    else
-        ret = 0;
-    LeaveCriticalSection(&ref->context->cs);
-    return ret;
-}
-
-static BOOL CRYPT_GetCertHashProp(PWINE_CERT_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 = CRYPT_SetCertificateContextProperty(context, dwPropId,
-         0, &blob);
-    }
-    return ret;
-}
-
-static BOOL WINAPI CRYPT_GetCertificateContextProperty(
- PWINE_CERT_CONTEXT context, DWORD dwPropId, void *pvData, DWORD *pcbData)
-{
-    PWINE_CERT_PROPERTY prop;
-    BOOL ret, found;
-
-    TRACE("(%p, %ld, %p, %p)\n", context, dwPropId, pvData, pcbData);
-
-    EnterCriticalSection(&context->cs);
-    ret = FALSE;
-    found = FALSE;
-    LIST_FOR_EACH_ENTRY(prop, &context->extendedProperties,
-     WINE_CERT_PROPERTY, entry)
-    {
-        if (prop->hdr.propID == dwPropId)
-        {
-            if (!pvData)
-            {
-                *pcbData = prop->hdr.cb;
-                ret = TRUE;
-            }
-            else if (*pcbData < prop->hdr.cb)
-            {
-                SetLastError(ERROR_MORE_DATA);
-                *pcbData = prop->hdr.cb;
-            }
-            else
-            {
-                memcpy(pvData, prop->pbData, prop->hdr.cb);
-                *pcbData = prop->hdr.cb;
-                ret = TRUE;
-            }
-            found = TRUE;
-        }
-        break;
-    }
-    if (!found)
-    {
-        /* Implicit properties */
-        switch (dwPropId)
-        {
-        case CERT_SHA1_HASH_PROP_ID:
-            ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_SHA1,
-             context->cert.pbCertEncoded, context->cert.cbCertEncoded, pvData,
-             pcbData);
-            break;
-        case CERT_MD5_HASH_PROP_ID:
-            ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5,
-             context->cert.pbCertEncoded, context->cert.cbCertEncoded, pvData,
-             pcbData);
-            break;
-        case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID:
-            ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5,
-             context->cert.pCertInfo->Subject.pbData,
-             context->cert.pCertInfo->Subject.cbData,
-             pvData, pcbData);
-            break;
-        case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID:
-            ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5,
-             context->cert.pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData,
-             context->cert.pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData,
-             pvData, pcbData);
-            break;
-        case CERT_SIGNATURE_HASH_PROP_ID:
-        case CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID:
-            FIXME("implicit property %ld\n", dwPropId);
-            SetLastError(CRYPT_E_NOT_FOUND);
-            break;
-        default:
-            SetLastError(CRYPT_E_NOT_FOUND);
-        }
-    }
-    LeaveCriticalSection(&context->cs);
-    TRACE("returning %d\n", ret);
-    return ret;
-}
-
-BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext,
- DWORD dwPropId, void *pvData, DWORD *pcbData)
-{
-    PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext;
-    BOOL ret;
-
-    TRACE("(%p, %ld, %p, %p)\n", pCertContext, dwPropId, pvData, pcbData);
-
-    /* Special cases for invalid/special prop IDs.
-     */
-    switch (dwPropId)
-    {
-    case 0:
-    case CERT_CERT_PROP_ID:
-    case CERT_CRL_PROP_ID:
-    case CERT_CTL_PROP_ID:
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return FALSE;
-    case CERT_ACCESS_STATE_PROP_ID:
-        if (!pvData)
-        {
-            *pcbData = sizeof(DWORD);
-            return TRUE;
-        }
-        else if (*pcbData < sizeof(DWORD))
-        {
-            SetLastError(ERROR_MORE_DATA);
-            *pcbData = sizeof(DWORD);
-            return FALSE;
-        }
-        else
-        {
-            DWORD state = 0;
-
-            if (pCertContext->hCertStore)
-            {
-                PWINECRYPT_CERTSTORE store =
-                 (PWINECRYPT_CERTSTORE)pCertContext->hCertStore;
-
-                /* Take advantage of knowledge of the stores to answer the
-                 * access state question
-                 */
-                if (store->type != StoreTypeReg ||
-                 !(store->dwOpenFlags & CERT_STORE_READONLY_FLAG))
-                    state |= CERT_ACCESS_STATE_WRITE_PERSIST_FLAG;
-            }
-            *(DWORD *)pvData = state;
-            return TRUE;
-        }
-    }
-
-    ret = CRYPT_GetCertificateContextProperty(ref->context, dwPropId,
-     pvData, pcbData);
-    TRACE("returning %d\n", ret);
-    return ret;
-}
-
-/* Copies cbData bytes from pbData to the context's property with ID
- * dwPropId.
- */
-static BOOL CRYPT_SaveCertificateContextProperty(PWINE_CERT_CONTEXT context,
- DWORD dwPropId, const BYTE *pbData, size_t cbData)
-{
-    BOOL ret = FALSE;
-    LPBYTE data;
-
-    if (cbData)
-    {
-        data = CryptMemAlloc(cbData);
-        if (data)
-            memcpy(data, pbData, cbData);
-    }
-    else
-        data = NULL;
-    if (!cbData || data)
-    {
-        PWINE_CERT_PROPERTY prop;
-
-        EnterCriticalSection(&context->cs);
-        LIST_FOR_EACH_ENTRY(prop, &context->extendedProperties,
-         WINE_CERT_PROPERTY, entry)
-        {
-            if (prop->hdr.propID == dwPropId)
-                break;
-        }
-        if (prop && prop->entry.next != &context->extendedProperties)
-        {
-            CryptMemFree(prop->pbData);
-            prop->hdr.cb = cbData;
-            prop->pbData = cbData ? data : NULL;
-            ret = TRUE;
-        }
-        else
-        {
-            prop = CryptMemAlloc(sizeof(WINE_CERT_PROPERTY));
-            if (prop)
-            {
-                prop->hdr.propID = dwPropId;
-                prop->hdr.unknown = 1;
-                prop->hdr.cb = cbData;
-                list_init(&prop->entry);
-                prop->pbData = cbData ? data : NULL;
-                list_add_tail(&context->extendedProperties, &prop->entry);
-                ret = TRUE;
-            }
-            else
-                CryptMemFree(data);
-        }
-        LeaveCriticalSection(&context->cs);
-    }
-    return ret;
-}
-
-static BOOL WINAPI CRYPT_SetCertificateContextProperty(
- PWINE_CERT_CONTEXT context, DWORD dwPropId, DWORD dwFlags, const void *pvData)
-{
-    BOOL ret = FALSE;
-
-    TRACE("(%p, %ld, %08lx, %p)\n", context, dwPropId, dwFlags, pvData);
-
-    if (!pvData)
-    {
-        PWINE_CERT_PROPERTY prop, next;
-
-        EnterCriticalSection(&context->cs);
-        LIST_FOR_EACH_ENTRY_SAFE(prop, next, &context->extendedProperties,
-         WINE_CERT_PROPERTY, entry)
-        {
-            if (prop->hdr.propID == dwPropId)
-            {
-                list_remove(&prop->entry);
-                CryptMemFree(prop->pbData);
-                CryptMemFree(prop);
-            }
-        }
-        LeaveCriticalSection(&context->cs);
-        ret = TRUE;
-    }
-    else
-    {
-        switch (dwPropId)
-        {
-        case CERT_AUTO_ENROLL_PROP_ID:
-        case CERT_CTL_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 = CRYPT_SaveCertificateContextProperty(context, dwPropId,
-             blob->pbData, blob->cbData);
-            break;
-        }
-        case CERT_DATE_STAMP_PROP_ID:
-            ret = CRYPT_SaveCertificateContextProperty(context, dwPropId,
-             pvData, sizeof(FILETIME));
-            break;
-        default:
-            FIXME("%ld: stub\n", dwPropId);
-        }
-    }
-    TRACE("returning %d\n", ret);
-    return ret;
-}
-
-BOOL WINAPI CertSetCertificateContextProperty(PCCERT_CONTEXT pCertContext,
- DWORD dwPropId, DWORD dwFlags, const void *pvData)
-{
-    PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext;
-    BOOL ret;
-
-    TRACE("(%p, %ld, %08lx, %p)\n", pCertContext, 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(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return FALSE;
-    }
-    ret = CRYPT_SetCertificateContextProperty(ref->context, dwPropId,
-     dwFlags, pvData);
-    TRACE("returning %d\n", ret);
-    return ret;
-}
-
-/* Only the reference portion of the context is duplicated.  The returned
- * context has the cert store set to 0, to prevent the store's certificate free
- * function from getting called on partial data.
- * FIXME: is this okay?  Needs a test.
- */
-PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext(
- PCCERT_CONTEXT pCertContext)
-{
-    PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext, ret;
-
-    TRACE("(%p)\n", pCertContext);
-    if (ref)
-    {
-        ret = CryptMemAlloc(sizeof(WINE_CERT_CONTEXT_REF));
-        if (ret)
-        {
-            memcpy(ret, ref, sizeof(*ret));
-            ret->cert.hCertStore = 0;
-            InterlockedIncrement(&ret->context->ref);
-        }
-    }
-    else
-        ret = NULL;
-    return (PCCERT_CONTEXT)ret;
-}
-
-BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore,
- PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition,
- PCCERT_CONTEXT *ppStoreContext)
-{
-    PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore;
-    PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext;
-    PWINE_CERT_CONTEXT cert;
-    BOOL ret;
-
-    TRACE("(%p, %p, %08lx, %p)\n", hCertStore, pCertContext,
-     dwAddDisposition, ppStoreContext);
-
-    /* FIXME: some tests needed to verify return codes */
-    if (!store)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
-    }
-    if (store->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
-    }
-
-    cert = CRYPT_CreateCertificateContext(ref->context->cert.dwCertEncodingType,
-     ref->context->cert.pbCertEncoded, ref->context->cert.cbCertEncoded);
-    if (cert)
-    {
-        PWINE_CERT_PROPERTY prop;
-
-        ret = TRUE;
-        EnterCriticalSection(&ref->context->cs);
-        LIST_FOR_EACH_ENTRY(prop, &ref->context->extendedProperties,
-         WINE_CERT_PROPERTY, entry)
-        {
-            ret = CRYPT_SaveCertificateContextProperty(cert, prop->hdr.propID,
-             prop->pbData, prop->hdr.cb);
-            if (!ret)
-                break;
-        }
-        LeaveCriticalSection(&ref->context->cs);
-        if (ret)
-        {
-            ret = store->addCert(store, (PCCERT_CONTEXT)cert, dwAddDisposition);
-            if (ret && ppStoreContext)
-                *ppStoreContext = (PCCERT_CONTEXT)store->createCertRef(cert,
-                 hCertStore);
-        }
-        if (!ret)
-            CRYPT_FreeCert(cert);
-    }
-    else
-        ret = FALSE;
-    return ret;
-}
-
-BOOL WINAPI CertAddEncodedCertificateToStore(HCERTSTORE hCertStore,
- DWORD dwCertEncodingType, const BYTE *pbCertEncoded, DWORD cbCertEncoded,
- DWORD dwAddDisposition, PCCERT_CONTEXT *ppCertContext)
-{
-    WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore;
-    BOOL ret;
-
-    TRACE("(%p, %08lx, %p, %ld, %08lx, %p)\n", hCertStore, dwCertEncodingType,
-     pbCertEncoded, cbCertEncoded, dwAddDisposition, ppCertContext);
-
-    if (!hcs)
-        ret = FALSE;
-    else if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
-        ret = FALSE;
-    else
-    {
-        PWINE_CERT_CONTEXT cert = CRYPT_CreateCertificateContext(
-         dwCertEncodingType, pbCertEncoded, cbCertEncoded);
-
-        if (cert)
-        {
-            ret = hcs->addCert(hcs, (PCCERT_CONTEXT)cert, dwAddDisposition);
-            if (ret && ppCertContext)
-                *ppCertContext = (PCCERT_CONTEXT)hcs->createCertRef(cert,
-                 hCertStore);
-            if (!ret)
-                CRYPT_FreeCert(cert);
-        }
-        else
-            ret = FALSE;
-    }
-    return ret;
-}
-
-PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore,
- PCCERT_CONTEXT pPrev)
-{
-    WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore;
-    PWINE_CERT_CONTEXT_REF prev = (PWINE_CERT_CONTEXT_REF)pPrev;
-    PCCERT_CONTEXT ret;
-
-    TRACE("(%p, %p)\n", hCertStore, pPrev);
-    if (!hCertStore)
-        ret = NULL;
-    else if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
-        ret = NULL;
-    else
-        ret = (PCCERT_CONTEXT)hcs->enumCert(hcs, prev);
-    return ret;
-}
-
-BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext)
-{
-    BOOL ret;
-
-    TRACE("(%p)\n", pCertContext);
-
-    if (!pCertContext)
-        ret = TRUE;
-    else if (!pCertContext->hCertStore)
-    {
-        ret = TRUE;
-        CertFreeCertificateContext(pCertContext);
-    }
-    else
-    {
-        PWINECRYPT_CERTSTORE hcs =
-         (PWINECRYPT_CERTSTORE)pCertContext->hCertStore;
-
-        if (!hcs)
-            ret = TRUE;
-        else if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
-            ret = FALSE;
-        else
-        {
-            ret = hcs->deleteCert(hcs, pCertContext, 0);
-            if (ret)
-                CertFreeCertificateContext(pCertContext);
-        }
-    }
-    return ret;
-}
-
-BOOL WINAPI CertAddEncodedCRLToStore(HCERTSTORE hCertStore,
- DWORD dwCertEncodingType, const BYTE *pbCrlEncoded, DWORD cbCrlEncoded,
- DWORD dwAddDisposition, PCCRL_CONTEXT *ppCrlContext)
-{
-    FIXME("(%p, %08lx, %p, %ld, %08lx, %p): stub\n", hCertStore,
-     dwCertEncodingType, pbCrlEncoded, cbCrlEncoded, dwAddDisposition,
-     ppCrlContext);
-    return FALSE;
-}
-
-BOOL WINAPI CertAddCRLContextToStore( HCERTSTORE hCertStore,
-             PCCRL_CONTEXT pCrlContext, DWORD dwAddDisposition,
-             PCCRL_CONTEXT* ppStoreContext )
-{
-    FIXME("%p %p %08lx %p\n", hCertStore, pCrlContext,
-          dwAddDisposition, ppStoreContext);
-    return TRUE;
-}
-
-BOOL WINAPI CertFreeCRLContext( PCCRL_CONTEXT pCrlContext)
-{
-    FIXME("%p\n", pCrlContext );
-
-    return TRUE;
-}
-
-BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext)
-{
-    FIXME("(%p): stub\n", pCrlContext);
-    return TRUE;
-}
-
-PCCRL_CONTEXT WINAPI CertEnumCRLsInStore(HCERTSTORE hCertStore,
- PCCRL_CONTEXT pPrev)
-{
-    FIXME("(%p, %p): stub\n", hCertStore, pPrev);
-    return NULL;
-}
-
-PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwCertEncodingType,
-  const BYTE* pbCtlEncoded, DWORD cbCtlEncoded)
-{
-    FIXME("(%08lx, %p, %08lx): stub\n", dwCertEncodingType, pbCtlEncoded,
-     cbCtlEncoded);
-    return NULL;
-}
-
-BOOL WINAPI CertAddEncodedCTLToStore(HCERTSTORE hCertStore,
- DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded,
- DWORD dwAddDisposition, PCCTL_CONTEXT *ppCtlContext)
-{
-    FIXME("(%p, %08lx, %p, %ld, %08lx, %p): stub\n", hCertStore,
-     dwMsgAndCertEncodingType, pbCtlEncoded, cbCtlEncoded, dwAddDisposition,
-     ppCtlContext);
-    return FALSE;
-}
-
-BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,
- PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition,
- PCCTL_CONTEXT* ppStoreContext)
-{
-    FIXME("(%p, %p, %08lx, %p): stub\n", hCertStore, pCtlContext,
-     dwAddDisposition, ppStoreContext);
-    return TRUE;
-}
-
-BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCtlContext)
-{
-    FIXME("(%p): stub\n", pCtlContext );
-    return TRUE;
-}
-
-BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext)
-{
-    FIXME("(%p): stub\n", pCtlContext);
-    return TRUE;
-}
-
-PCCTL_CONTEXT WINAPI CertEnumCTLsInStore(HCERTSTORE hCertStore,
- PCCTL_CONTEXT pPrev)
-{
-    FIXME("(%p, %p): stub\n", hCertStore, pPrev);
-    return NULL;
-}
-
-
-BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)
-{
-    WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *) hCertStore;
-
-    TRACE("(%p, %08lx)\n", hCertStore, dwFlags);
-
-    if( ! hCertStore )
-        return TRUE;
-
-    if ( hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC )
-        return FALSE;
-
-    if (InterlockedDecrement(&hcs->ref) == 0)
-    {
-        TRACE("%p's ref count is 0, freeing\n", hcs);
-        hcs->dwMagic = 0;
-        if (!(hcs->dwOpenFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG))
-            CryptReleaseContext(hcs->cryptProv, 0);
-        hcs->closeStore(hcs, dwFlags);
-    }
-    else
-        TRACE("%p's ref count is %ld\n", hcs, hcs->ref);
-    return TRUE;
-}
-
-BOOL WINAPI CertControlStore(HCERTSTORE hCertStore, DWORD dwFlags,
- DWORD dwCtrlType, void const *pvCtrlPara)
-{
-    WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore;
-    BOOL ret;
-
-    TRACE("(%p, %08lx, %ld, %p)\n", hCertStore, dwFlags, dwCtrlType,
-     pvCtrlPara);
-
-    if (!hcs)
-        ret = FALSE;
-    else if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
-        ret = FALSE;
-    else
-    {
-        if (hcs->control)
-            ret = hcs->control(hCertStore, dwFlags, dwCtrlType, pvCtrlPara);
-        else
-            ret = TRUE;
-    }
-    return ret;
-}
-
-BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
- DWORD dwPropId, void *pvData, DWORD *pcbData)
-{
-    FIXME("(%p, %ld, %p, %p): stub\n", pCRLContext, dwPropId, pvData, pcbData);
-    return FALSE;
-}
-
-BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext,
- DWORD dwPropId, DWORD dwFlags, const void *pvData)
-{
-    FIXME("(%p, %ld, %08lx, %p): stub\n", pCRLContext, dwPropId, dwFlags,
-     pvData);
-    return FALSE;
-}
-
-BOOL WINAPI CertSerializeCRLStoreElement(PCCRL_CONTEXT pCrlContext,
- DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement)
-{
-    FIXME("(%p, %08lx, %p, %p): stub\n", pCrlContext, dwFlags, pbElement,
-     pcbElement);
-    return FALSE;
-}
-
-BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext,
- DWORD dwPropId, void *pvData, DWORD *pcbData)
-{
-    FIXME("(%p, %ld, %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, %ld, %08lx, %p): stub\n", pCTLContext, dwPropId, dwFlags,
-     pvData);
-    return FALSE;
-}
-
-BOOL WINAPI CertSerializeCTLStoreElement(PCCTL_CONTEXT pCtlContext,
- DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement)
-{
-    FIXME("(%p, %08lx, %p, %p): stub\n", pCtlContext, dwFlags, pbElement,
-     pcbElement);
-    return FALSE;
-}
-
-BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext,
- DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement)
-{
-    BOOL ret;
-
-    TRACE("(%p, %08lx, %p, %p)\n", pCertContext, dwFlags, pbElement,
-     pcbElement);
-
-    if (pCertContext)
-    {
-        PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext;
-        DWORD bytesNeeded = sizeof(WINE_CERT_PROP_HEADER) +
-         pCertContext->cbCertEncoded;
-        PWINE_CERT_PROPERTY prop;
-
-        EnterCriticalSection(&ref->context->cs);
-        LIST_FOR_EACH_ENTRY(prop, &ref->context->extendedProperties,
-         WINE_CERT_PROPERTY, entry)
-            bytesNeeded += sizeof(WINE_CERT_PROP_HEADER) + prop->hdr.cb;
-        if (!pbElement)
-        {
-            *pcbElement = bytesNeeded;
-            ret = TRUE;
-        }
-        else if (*pcbElement < bytesNeeded)
-        {
-            *pcbElement = bytesNeeded;
-            SetLastError(ERROR_MORE_DATA);
-            ret = FALSE;
-        }
-        else
-        {
-            PWINE_CERT_PROP_HEADER hdr;
-
-            LIST_FOR_EACH_ENTRY(prop, &ref->context->extendedProperties,
-             WINE_CERT_PROPERTY, entry)
-            {
-                memcpy(pbElement, &prop->hdr, sizeof(WINE_CERT_PROP_HEADER));
-                pbElement += sizeof(WINE_CERT_PROP_HEADER);
-                if (prop->hdr.cb)
-                {
-                    memcpy(pbElement, prop->pbData, prop->hdr.cb);
-                    pbElement += prop->hdr.cb;
-                }
-            }
-            hdr = (PWINE_CERT_PROP_HEADER)pbElement;
-            hdr->propID = CERT_CERT_PROP_ID;
-            hdr->unknown = 1;
-            hdr->cb = pCertContext->cbCertEncoded;
-            memcpy(pbElement + sizeof(WINE_CERT_PROP_HEADER),
-             pCertContext->pbCertEncoded, pCertContext->cbCertEncoded);
-            ret = TRUE;
-        }
-        LeaveCriticalSection(&ref->context->cs);
-    }
-    else
-        ret = FALSE;
-    return ret;
-}
-
-/* Looks for the property with ID propID in the buffer buf.  Returns a pointer
- * to its header if a valid header is found, NULL if not.  Valid means the
- * length of thte property won't overrun buf, and the unknown field is 1.
- */
-static const WINE_CERT_PROP_HEADER *CRYPT_findPropID(const BYTE *buf,
- DWORD size, DWORD propID)
-{
-    const WINE_CERT_PROP_HEADER *ret = NULL;
-    BOOL done = FALSE;
-
-    while (size && !ret && !done)
-    {
-        if (size < sizeof(WINE_CERT_PROP_HEADER))
-        {
-            SetLastError(CRYPT_E_FILE_ERROR);
-            done = TRUE;
-        }
-        else
-        {
-            const WINE_CERT_PROP_HEADER *hdr =
-             (const WINE_CERT_PROP_HEADER *)buf;
-
-            size -= sizeof(WINE_CERT_PROP_HEADER);
-            buf += sizeof(WINE_CERT_PROP_HEADER);
-            if (size < hdr->cb)
-            {
-                SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-                done = TRUE;
-            }
-            else if (!hdr->propID)
-            {
-                /* assume a zero prop ID means the data are uninitialized, so
-                 * stop looking.
-                 */
-                done = TRUE;
-            }
-            else if (hdr->unknown != 1)
-            {
-                SetLastError(ERROR_FILE_NOT_FOUND);
-                done = TRUE;
-            }
-            else if (hdr->propID == propID)
-                ret = hdr;
-            else
-            {
-                buf += hdr->cb;
-                size -= hdr->cb;
-            }
-        }
-    }
-    return ret;
-}
-
-static const void * WINAPI CRYPT_ReadSerializedElement(const BYTE *pbElement,
- DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType)
-{
-    const void *context;
-
-    TRACE("(%p, %ld, %08lx, %p)\n", pbElement, cbElement, dwContextTypeFlags,
-     pdwContentType);
-
-    if (!cbElement)
-    {
-        SetLastError(ERROR_END_OF_MEDIA);
-        return NULL;
-    }
-
-    __TRY
-    {
-        const WINE_CONTEXT_INTERFACE *contextInterface = NULL;
-        const WINE_CERT_PROP_HEADER *hdr = NULL;
-        DWORD type = 0;
-        BOOL ret;
-
-        ret = TRUE;
-        context = NULL;
-        if (dwContextTypeFlags == CERT_STORE_ALL_CONTEXT_FLAG)
-        {
-            hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CERT_PROP_ID);
-            if (hdr)
-                type = CERT_STORE_CERTIFICATE_CONTEXT;
-            else
-            {
-                hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CRL_PROP_ID);
-                if (hdr)
-                    type = CERT_STORE_CRL_CONTEXT;
-                else
-                {
-                    hdr = CRYPT_findPropID(pbElement, cbElement,
-                     CERT_CTL_PROP_ID);
-                    if (hdr)
-                        type = CERT_STORE_CTL_CONTEXT;
-                }
-            }
-        }
-        else if (dwContextTypeFlags & CERT_STORE_CERTIFICATE_CONTEXT_FLAG)
-        {
-            hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CERT_PROP_ID);
-            type = CERT_STORE_CERTIFICATE_CONTEXT;
-        }
-        else if (dwContextTypeFlags & CERT_STORE_CRL_CONTEXT_FLAG)
-        {
-            hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CRL_PROP_ID);
-            type = CERT_STORE_CRL_CONTEXT;
-        }
-        else if (dwContextTypeFlags & CERT_STORE_CTL_CONTEXT_FLAG)
-        {
-            hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CTL_PROP_ID);
-            type = CERT_STORE_CTL_CONTEXT;
-        }
-
-        switch (type)
-        {
-        case CERT_STORE_CERTIFICATE_CONTEXT:
-            contextInterface = &gCertInterface;
-            break;
-        case CERT_STORE_CRL_CONTEXT:
-            contextInterface = &gCRLInterface;
-            break;
-        case CERT_STORE_CTL_CONTEXT:
-            contextInterface = &gCTLInterface;
-            break;
-        default:
-            SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-            ret = FALSE;
-        }
-        if (!hdr)
-            ret = FALSE;
-
-        if (ret)
-            context = contextInterface->create(X509_ASN_ENCODING,
-             (BYTE *)hdr + sizeof(WINE_CERT_PROP_HEADER), hdr->cb);
-        if (ret && context)
-        {
-            BOOL noMoreProps = FALSE;
-
-            while (!noMoreProps && ret)
-            {
-                if (cbElement < sizeof(WINE_CERT_PROP_HEADER))
-                    ret = FALSE;
-                else
-                {
-                    const WINE_CERT_PROP_HEADER *hdr =
-                     (const WINE_CERT_PROP_HEADER *)pbElement;
-
-                    TRACE("prop is %ld\n", hdr->propID);
-                    cbElement -= sizeof(WINE_CERT_PROP_HEADER);
-                    pbElement += sizeof(WINE_CERT_PROP_HEADER);
-                    if (cbElement < hdr->cb)
-                    {
-                        SetLastError(HRESULT_FROM_WIN32(
-                         ERROR_INVALID_PARAMETER));
-                        ret = FALSE;
-                    }
-                    else if (!hdr->propID)
-                    {
-                        /* Like in CRYPT_findPropID, stop if the propID is zero
-                         */
-                        noMoreProps = TRUE;
-                    }
-                    else if (hdr->unknown != 1)
-                    {
-                        SetLastError(ERROR_FILE_NOT_FOUND);
-                        ret = FALSE;
-                    }
-                    else if (hdr->propID != CERT_CERT_PROP_ID &&
-                     hdr->propID != CERT_CRL_PROP_ID && hdr->propID !=
-                     CERT_CTL_PROP_ID)
-                    {
-                        /* Have to create a blob for most types, but not
-                         * for all.. arghh.
-                         */
-                        switch (hdr->propID)
-                        {
-                        case CERT_AUTO_ENROLL_PROP_ID:
-                        case CERT_CTL_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_PUBLIC_KEY_MD5_HASH_PROP_ID:
-                        case CERT_ENROLLMENT_PROP_ID:
-                        case CERT_CROSS_CERT_DIST_POINTS_PROP_ID:
-                        case CERT_RENEWAL_PROP_ID:
-                        {
-                            CRYPT_DATA_BLOB blob = { hdr->cb,
-                             (LPBYTE)pbElement };
-
-                            ret = contextInterface->setProp(context,
-                             hdr->propID, 0, &blob);
-                            break;
-                        }
-                        case CERT_DATE_STAMP_PROP_ID:
-                            ret = contextInterface->setProp(context,
-                             hdr->propID, 0, pbElement);
-                            break;
-                        default:
-                            FIXME("prop ID %ld: stub\n", hdr->propID);
-                        }
-                    }
-                    pbElement += hdr->cb;
-                    cbElement -= hdr->cb;
-                    if (!cbElement)
-                        noMoreProps = TRUE;
-                }
-            }
-            if (ret)
-            {
-                if (pdwContentType)
-                    *pdwContentType = type;
-            }
-            else
-            {
-                contextInterface->free(context);
-                context = NULL;
-            }
-        }
-    }
-    __EXCEPT_PAGE_FAULT
-    {
-        SetLastError(STATUS_ACCESS_VIOLATION);
-        context = NULL;
-    }
-    __ENDTRY
-    return context;
-}
-
-BOOL WINAPI CertAddSerializedElementToStore(HCERTSTORE hCertStore,
- const BYTE *pbElement, DWORD cbElement, DWORD dwAddDisposition, DWORD dwFlags,
- DWORD dwContextTypeFlags, DWORD *pdwContentType, const void **ppvContext)
-{
-    const void *context;
-    DWORD type;
-    BOOL ret;
-
-    TRACE("(%p, %p, %ld, %08lx, %08lx, %08lx, %p, %p)\n", hCertStore,
-     pbElement, cbElement, dwAddDisposition, dwFlags, dwContextTypeFlags,
-     pdwContentType, ppvContext);
-
-    /* Call the internal function, then delete the hashes.  Tests show this
-     * function uses real hash values, not whatever's stored in the hash
-     * property.
-     */
-    context = CRYPT_ReadSerializedElement(pbElement, cbElement,
-     dwContextTypeFlags, &type);
-    if (context)
-    {
-        const WINE_CONTEXT_INTERFACE *contextInterface = NULL;
-
-        switch (type)
-        {
-        case CERT_STORE_CERTIFICATE_CONTEXT:
-            contextInterface = &gCertInterface;
-            break;
-        case CERT_STORE_CRL_CONTEXT:
-            contextInterface = &gCRLInterface;
-            break;
-        case CERT_STORE_CTL_CONTEXT:
-            contextInterface = &gCTLInterface;
-            break;
-        default:
-            SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        }
-        if (contextInterface)
-        {
-            contextInterface->setProp(context, CERT_HASH_PROP_ID, 0, NULL);
-            contextInterface->setProp(context, CERT_MD5_HASH_PROP_ID, 0, NULL);
-            contextInterface->setProp(context, CERT_SIGNATURE_HASH_PROP_ID, 0,
-             NULL);
-            if (pdwContentType)
-                *pdwContentType = type;
-            ret = contextInterface->addContextToStore(hCertStore, context,
-             dwAddDisposition, ppvContext);
-            contextInterface->free(context);
-        }
-        else
-            ret = FALSE;
-    }
-    else
-        ret = FALSE;
-    return ret;
-}
-
-static void CRYPT_UnrefCertificateContext(PWINE_CERT_CONTEXT_REF ref)
-{
-    if (InterlockedDecrement(&ref->context->ref) == 0)
-    {
-        TRACE("%p's ref count is 0, freeing\n", ref->context);
-        CRYPT_FreeCert(ref->context);
-    }
-    else
-        TRACE("%p's ref count is %ld\n", ref->context, ref->context->ref);
-}
-
-BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext)
-{
-    TRACE("(%p)\n", pCertContext);
-
-    if (pCertContext)
-    {
-        PWINE_CERT_CONTEXT_REF ref = (PWINE_CERT_CONTEXT_REF)pCertContext;
-        PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)ref->cert.hCertStore;
-
-        CRYPT_UnrefCertificateContext(ref);
-        if (store && store->dwMagic == WINE_CRYPTCERTSTORE_MAGIC &&
-         store->freeCert)
-            store->freeCert(ref);
-        TRACE("freeing %p\n", ref);
-        CryptMemFree(ref);
-    }
-    return TRUE;
-}
-
-PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore,
-               DWORD dwCertEncodingType, DWORD dwFlags, DWORD dwType,
-               const void *pvPara, PCCERT_CONTEXT pPrevCertContext)
-{
-    FIXME("stub: %p %ld %ld %ld %p %p\n", hCertStore, dwCertEncodingType,
-       dwFlags, dwType, pvPara, pPrevCertContext);
-    SetLastError(CRYPT_E_NOT_FOUND);
-    return NULL;
-}
-
-BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore,
- HCERTSTORE hSiblingStore, DWORD dwUpdateFlags, DWORD dwPriority)
-{
-    PWINE_COLLECTIONSTORE collection = (PWINE_COLLECTIONSTORE)hCollectionStore;
-    WINECRYPT_CERTSTORE *sibling = (WINECRYPT_CERTSTORE *)hSiblingStore;
-    PWINE_STORE_LIST_ENTRY entry;
-    BOOL ret;
-
-    TRACE("(%p, %p, %08lx, %ld)\n", hCollectionStore, hSiblingStore,
-     dwUpdateFlags, dwPriority);
-
-    if (!collection || !sibling)
-        return TRUE;
-    if (collection->hdr.dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
-    {
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return FALSE;
-    }
-    if (collection->hdr.type != StoreTypeCollection)
-    {
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return FALSE;
-    }
-    if (sibling->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
-    {
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return FALSE;
-    }
-
-    entry = CryptMemAlloc(sizeof(WINE_STORE_LIST_ENTRY));
-    if (entry)
-    {
-        InterlockedIncrement(&sibling->ref);
-        TRACE("sibling %p's ref count is %ld\n", sibling, sibling->ref);
-        entry->store = sibling;
-        entry->dwUpdateFlags = dwUpdateFlags;
-        entry->dwPriority = dwPriority;
-        list_init(&entry->entry);
-        TRACE("%p: adding %p, priority %ld\n", collection, entry, dwPriority);
-        EnterCriticalSection(&collection->cs);
-        if (dwPriority)
-        {
-            PWINE_STORE_LIST_ENTRY cursor;
-            BOOL added = FALSE;
-
-            LIST_FOR_EACH_ENTRY(cursor, &collection->stores,
-             WINE_STORE_LIST_ENTRY, entry)
-            {
-                if (cursor->dwPriority < dwPriority)
-                {
-                    list_add_before(&cursor->entry, &entry->entry);
-                    added = TRUE;
-                    break;
-                }
-            }
-            if (!added)
-                list_add_tail(&collection->stores, &entry->entry);
-        }
-        else
-            list_add_tail(&collection->stores, &entry->entry);
-        LeaveCriticalSection(&collection->cs);
-        ret = TRUE;
-    }
-    else
-        ret = FALSE;
-    return ret;
-}
-
-void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore,
- HCERTSTORE hSiblingStore)
-{
-    PWINE_COLLECTIONSTORE collection = (PWINE_COLLECTIONSTORE)hCollectionStore;
-    WINECRYPT_CERTSTORE *sibling = (WINECRYPT_CERTSTORE *)hSiblingStore;
-    PWINE_STORE_LIST_ENTRY store, next;
 
-    TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore);
+#include <assert.h>
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wincrypt.h"
+#include "wine/debug.h"
+#include "crypt32_private.h"
 
-    if (!collection || !sibling)
-        return;
-    if (collection->hdr.dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
-    {
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return;
-    }
-    if (collection->hdr.type != StoreTypeCollection)
-        return;
-    if (sibling->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)
-    {
-        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));
-        return;
-    }
-    EnterCriticalSection(&collection->cs);
-    LIST_FOR_EACH_ENTRY_SAFE(store, next, &collection->stores,
-     WINE_STORE_LIST_ENTRY, entry)
-    {
-        if (store->store == sibling)
-        {
-            list_remove(&store->entry);
-            CertCloseStore(store->store, 0);
-            CryptMemFree(store);
-            break;
-        }
-    }
-    LeaveCriticalSection(&collection->cs);
-}
+WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
 PCRYPT_ATTRIBUTE WINAPI CertFindAttribute(LPCSTR pszObjId, DWORD cAttr,
  CRYPT_ATTRIBUTE rgAttr[])
@@ -3302,12 +314,402 @@ BOOL WINAPI CryptVerifyCertificateSignatureEx(HCRYPTPROV hCryptProv,
     return ret;
 }
 
-BOOL WINAPI CryptVerifyMessageSignature(/*PCRYPT_VERIFY_MESSAGE_PARA*/ void* pVerifyPara,
-          DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob,
-          BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert)
+BOOL WINAPI CertGetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext, DWORD dwFlags,
+ PCERT_ENHKEY_USAGE pUsage, DWORD *pcbUsage)
+{
+    PCERT_ENHKEY_USAGE usage = NULL;
+    DWORD bytesNeeded;
+    BOOL ret = TRUE;
+
+    TRACE("(%p, %08lx, %p, %ld)\n", pCertContext, dwFlags, pUsage, *pcbUsage);
+
+    if (!pCertContext || !pcbUsage)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    if (!(dwFlags & CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG))
+    {
+        DWORD propSize = 0;
+
+        if (CertGetCertificateContextProperty(pCertContext,
+         CERT_ENHKEY_USAGE_PROP_ID, NULL, &propSize))
+        {
+            LPBYTE buf = CryptMemAlloc(propSize);
+
+            if (buf)
+            {
+                if (CertGetCertificateContextProperty(pCertContext,
+                 CERT_ENHKEY_USAGE_PROP_ID, buf, &propSize))
+                {
+                    ret = CryptDecodeObjectEx(pCertContext->dwCertEncodingType,
+                     X509_ENHANCED_KEY_USAGE, buf, propSize,
+                     CRYPT_ENCODE_ALLOC_FLAG, NULL, &usage, &bytesNeeded);
+                }
+                CryptMemFree(buf);
+            }
+        }
+    }
+    if (!usage && !(dwFlags & CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG))
+    {
+        PCERT_EXTENSION ext = CertFindExtension(szOID_ENHANCED_KEY_USAGE,
+         pCertContext->pCertInfo->cExtension,
+         pCertContext->pCertInfo->rgExtension);
+
+        if (ext)
+        {
+            ret = CryptDecodeObjectEx(pCertContext->dwCertEncodingType,
+             X509_ENHANCED_KEY_USAGE, ext->Value.pbData, ext->Value.cbData,
+             CRYPT_ENCODE_ALLOC_FLAG, NULL, &usage, &bytesNeeded);
+        }
+    }
+    if (!usage)
+    {
+        /* If a particular location is specified, this should fail.  Otherwise
+         * it should succeed with an empty usage.  (This is true on Win2k and
+         * later, which we emulate.)
+         */
+        if (dwFlags)
+        {
+            SetLastError(CRYPT_E_NOT_FOUND);
+            ret = FALSE;
+        }
+        else
+            bytesNeeded = sizeof(CERT_ENHKEY_USAGE);
+    }
+
+    if (ret)
+    {
+        if (!pUsage)
+            *pcbUsage = bytesNeeded;
+        else if (*pcbUsage < bytesNeeded)
+        {
+            SetLastError(ERROR_MORE_DATA);
+            *pcbUsage = bytesNeeded;
+            ret = FALSE;
+        }
+        else
+        {
+            *pcbUsage = bytesNeeded;
+            if (usage)
+            {
+                DWORD i;
+                LPSTR nextOID = (LPSTR)((LPBYTE)pUsage +
+                 sizeof(CERT_ENHKEY_USAGE) +
+                 usage->cUsageIdentifier * sizeof(LPSTR));
+
+                pUsage->cUsageIdentifier = usage->cUsageIdentifier;
+                pUsage->rgpszUsageIdentifier = (LPSTR *)((LPBYTE)pUsage +
+                 sizeof(CERT_ENHKEY_USAGE));
+                for (i = 0; i < usage->cUsageIdentifier; i++)
+                {
+                    pUsage->rgpszUsageIdentifier[i] = nextOID;
+                    strcpy(nextOID, usage->rgpszUsageIdentifier[i]);
+                    nextOID += strlen(nextOID) + 1;
+                }
+            }
+            else
+                pUsage->cUsageIdentifier = 0;
+        }
+    }
+    if (usage)
+        LocalFree(usage);
+    TRACE("returning %d\n", ret);
+    return ret;
+}
+
+BOOL WINAPI CertSetEnhancedKeyUsage(PCCERT_CONTEXT pCertContext,
+ PCERT_ENHKEY_USAGE pUsage)
+{
+    BOOL ret;
+
+    TRACE("(%p, %p)\n", pCertContext, pUsage);
+
+    if (pUsage)
+    {
+        CRYPT_DATA_BLOB blob = { 0, NULL };
+
+        ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_ENHANCED_KEY_USAGE,
+         pUsage, CRYPT_ENCODE_ALLOC_FLAG, NULL, &blob.pbData, &blob.cbData);
+        if (ret)
+        {
+            ret = CertSetCertificateContextProperty(pCertContext,
+             CERT_ENHKEY_USAGE_PROP_ID, 0, &blob);
+            LocalFree(blob.pbData);
+        }
+    }
+    else
+        ret = CertSetCertificateContextProperty(pCertContext,
+         CERT_ENHKEY_USAGE_PROP_ID, 0, NULL);
+    return ret;
+}
+
+BOOL WINAPI CertAddEnhancedKeyUsageIdentifier(PCCERT_CONTEXT pCertContext,
+ LPCSTR pszUsageIdentifier)
+{
+    BOOL ret;
+    DWORD size;
+
+    TRACE("(%p, %s)\n", pCertContext, debugstr_a(pszUsageIdentifier));
+
+    if (CertGetEnhancedKeyUsage(pCertContext,
+     CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG, NULL, &size))
+    {
+        PCERT_ENHKEY_USAGE usage = CryptMemAlloc(size);
+
+        if (usage)
+        {
+            ret = CertGetEnhancedKeyUsage(pCertContext,
+             CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG, usage, &size);
+            if (ret)
+            {
+                PCERT_ENHKEY_USAGE newUsage = CryptMemAlloc(size +
+                 sizeof(LPSTR) + strlen(pszUsageIdentifier) + 1);
+
+                if (newUsage)
+                {
+                    LPSTR nextOID;
+                    DWORD i;
+
+                    newUsage->rgpszUsageIdentifier =
+                     (LPSTR *)((LPBYTE)newUsage + sizeof(CERT_ENHKEY_USAGE));
+                    nextOID = (LPSTR)((LPBYTE)newUsage->rgpszUsageIdentifier +
+                     (usage->cUsageIdentifier + 1) * sizeof(LPSTR));
+                    for (i = 0; i < usage->cUsageIdentifier; i++)
+                    {
+                        newUsage->rgpszUsageIdentifier[i] = nextOID;
+                        strcpy(nextOID, usage->rgpszUsageIdentifier[i]);
+                        nextOID += strlen(nextOID) + 1;
+                    }
+                    newUsage->rgpszUsageIdentifier[i] = nextOID;
+                    strcpy(nextOID, pszUsageIdentifier);
+                    newUsage->cUsageIdentifier = i + 1;
+                    ret = CertSetEnhancedKeyUsage(pCertContext, newUsage);
+                    CryptMemFree(newUsage);
+                }
+            }
+            CryptMemFree(usage);
+        }
+        else
+            ret = FALSE;
+    }
+    else
+    {
+        PCERT_ENHKEY_USAGE usage = CryptMemAlloc(sizeof(CERT_ENHKEY_USAGE) +
+         sizeof(LPSTR) + strlen(pszUsageIdentifier) + 1);
+
+        if (usage)
+        {
+            usage->rgpszUsageIdentifier =
+             (LPSTR *)((LPBYTE)usage + sizeof(CERT_ENHKEY_USAGE));
+            usage->rgpszUsageIdentifier[0] = (LPSTR)((LPBYTE)usage +
+             sizeof(CERT_ENHKEY_USAGE) + sizeof(LPSTR));
+            strcpy(usage->rgpszUsageIdentifier[0], pszUsageIdentifier);
+            usage->cUsageIdentifier = 1;
+            ret = CertSetEnhancedKeyUsage(pCertContext, usage);
+            CryptMemFree(usage);
+        }
+        else
+            ret = FALSE;
+    }
+    return ret;
+}
+
+BOOL WINAPI CertRemoveEnhancedKeyUsageIdentifier(PCCERT_CONTEXT pCertContext,
+ LPCSTR pszUsageIdentifier)
+{
+    BOOL ret;
+    DWORD size;
+    CERT_ENHKEY_USAGE usage;
+
+    TRACE("(%p, %s)\n", pCertContext, debugstr_a(pszUsageIdentifier));
+
+    size = sizeof(usage);
+    ret = CertGetEnhancedKeyUsage(pCertContext,
+     CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG, &usage, &size);
+    if (!ret && GetLastError() == ERROR_MORE_DATA)
+    {
+        PCERT_ENHKEY_USAGE pUsage = CryptMemAlloc(size);
+
+        if (pUsage)
+        {
+            ret = CertGetEnhancedKeyUsage(pCertContext,
+             CERT_FIND_PROP_ONLY_ENHKEY_USAGE_FLAG, pUsage, &size);
+            if (ret)
+            {
+                if (pUsage->cUsageIdentifier)
+                {
+                    DWORD i;
+                    BOOL found = FALSE;
+
+                    for (i = 0; i < pUsage->cUsageIdentifier; i++)
+                    {
+                        if (!strcmp(pUsage->rgpszUsageIdentifier[i],
+                         pszUsageIdentifier))
+                            found = TRUE;
+                        if (found && i < pUsage->cUsageIdentifier - 1)
+                            pUsage->rgpszUsageIdentifier[i] =
+                             pUsage->rgpszUsageIdentifier[i + 1];
+                    }
+                    pUsage->cUsageIdentifier--;
+                    /* Remove the usage if it's empty */
+                    if (pUsage->cUsageIdentifier)
+                        ret = CertSetEnhancedKeyUsage(pCertContext, pUsage);
+                    else
+                        ret = CertSetEnhancedKeyUsage(pCertContext, NULL);
+                }
+            }
+            CryptMemFree(pUsage);
+        }
+        else
+            ret = FALSE;
+    }
+    else
+    {
+        /* it fit in an empty usage, therefore there's nothing to remove */
+        ret = TRUE;
+    }
+    return ret;
+}
+
+BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts,
+ int *cNumOIDSs, LPSTR *rghOIDs, DWORD *pcbOIDs)
 {
-    FIXME("stub: %p, %ld, %p, %ld, %p, %p, %p\n",
-        pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob,
-        pbDecoded, pcbDecoded, ppSignerCert);
-    return FALSE;
+    BOOL ret = TRUE;
+    DWORD i, cbOIDs = 0;
+    BOOL allUsagesValid = TRUE;
+    CERT_ENHKEY_USAGE validUsages = { 0, NULL };
+
+    TRACE("(%ld, %p, %p, %p, %ld)\n", cCerts, *rghCerts, cNumOIDSs,
+     rghOIDs, *pcbOIDs);
+
+    for (i = 0; ret && i < cCerts; i++)
+    {
+        CERT_ENHKEY_USAGE usage;
+        DWORD size = sizeof(usage);
+
+        ret = CertGetEnhancedKeyUsage(rghCerts[i], 0, &usage, &size);
+        /* Success is deliberately ignored: it implies all usages are valid */
+        if (!ret && GetLastError() == ERROR_MORE_DATA)
+        {
+            PCERT_ENHKEY_USAGE pUsage = CryptMemAlloc(size);
+
+            allUsagesValid = FALSE;
+            if (pUsage)
+            {
+                ret = CertGetEnhancedKeyUsage(rghCerts[i], 0, pUsage, &size);
+                if (ret)
+                {
+                    if (!validUsages.cUsageIdentifier)
+                    {
+                        DWORD j;
+
+                        cbOIDs = pUsage->cUsageIdentifier * sizeof(LPSTR);
+                        validUsages.cUsageIdentifier = pUsage->cUsageIdentifier;
+                        for (j = 0; j < validUsages.cUsageIdentifier; j++)
+                            cbOIDs += lstrlenA(pUsage->rgpszUsageIdentifier[j])
+                             + 1;
+                        validUsages.rgpszUsageIdentifier =
+                         CryptMemAlloc(cbOIDs);
+                        if (validUsages.rgpszUsageIdentifier)
+                        {
+                            LPSTR nextOID = (LPSTR)
+                             ((LPBYTE)validUsages.rgpszUsageIdentifier +
+                             validUsages.cUsageIdentifier * sizeof(LPSTR));
+
+                            for (j = 0; j < validUsages.cUsageIdentifier; j++)
+                            {
+                                validUsages.rgpszUsageIdentifier[j] = nextOID;
+                                lstrcpyA(validUsages.rgpszUsageIdentifier[j],
+                                 pUsage->rgpszUsageIdentifier[j]);
+                                nextOID += lstrlenA(nextOID) + 1;
+                            }
+                        }
+                        else
+                            ret = FALSE;
+                    }
+                    else
+                    {
+                        DWORD j, k, validIndexes = 0, numRemoved = 0;
+
+                        /* Merge: build a bitmap of all the indexes of
+                         * validUsages.rgpszUsageIdentifier that are in pUsage.
+                         */
+                        for (j = 0; j < pUsage->cUsageIdentifier; j++)
+                        {
+                            for (k = 0; k < validUsages.cUsageIdentifier; k++)
+                            {
+                                if (!strcmp(pUsage->rgpszUsageIdentifier[j],
+                                 validUsages.rgpszUsageIdentifier[k]))
+                                {
+                                    validIndexes |= (1 << k);
+                                    break;
+                                }
+                            }
+                        }
+                        /* Merge by removing from validUsages those that are
+                         * not in the bitmap.
+                         */
+                        for (j = 0; j < validUsages.cUsageIdentifier; j++)
+                        {
+                            if (!(validIndexes & (1 << j)))
+                            {
+                                if (j < validUsages.cUsageIdentifier - 1)
+                                {
+                                    memcpy(&validUsages.rgpszUsageIdentifier[j],
+                                     &validUsages.rgpszUsageIdentifier[j +
+                                     numRemoved + 1],
+                                     (validUsages.cUsageIdentifier - numRemoved
+                                     - j - 1) * sizeof(LPSTR));
+                                    cbOIDs -= lstrlenA(
+                                     validUsages.rgpszUsageIdentifier[j]) + 1 +
+                                     sizeof(LPSTR);
+                                    numRemoved++;
+                                }
+                                else
+                                    validUsages.cUsageIdentifier--;
+                            }
+                        }
+                    }
+                }
+                CryptMemFree(pUsage);
+            }
+            else
+                ret = FALSE;
+        }
+    }
+    if (ret)
+    {
+        if (allUsagesValid)
+        {
+            *cNumOIDSs = -1;
+            *pcbOIDs = 0;
+        }
+        else
+        {
+            if (!rghOIDs || *pcbOIDs < cbOIDs)
+            {
+                *pcbOIDs = cbOIDs;
+                SetLastError(ERROR_MORE_DATA);
+                ret = FALSE;
+            }
+            else
+            {
+                LPSTR nextOID = (LPSTR)((LPBYTE)rghOIDs +
+                 validUsages.cUsageIdentifier * sizeof(LPSTR));
+
+                *pcbOIDs = cbOIDs;
+                *cNumOIDSs = validUsages.cUsageIdentifier;
+                for (i = 0; i < validUsages.cUsageIdentifier; i++)
+                {
+                    rghOIDs[i] = nextOID;
+                    lstrcpyA(nextOID, validUsages.rgpszUsageIdentifier[i]);
+                    nextOID += lstrlenA(nextOID) + 1;
+                }
+            }
+        }
+    }
+    CryptMemFree(validUsages.rgpszUsageIdentifier);
+    return ret;
 }
index 5e60131..26b946f 100644 (file)
        <file>encode.c</file>
        <file>cert.c</file>
        <file>oid.c</file>
+       <file>proplist.c</file>
        <file>protectdata.c</file>
+       <file>serialize.c</file>
+       <file>store.c</file>
+       <file>str.c</file>
        <file>crypt32.rc</file>
        <file>crypt32.spec</file>
 </module>
index af79f2f..412579b 100644 (file)
@@ -1,7 +1,36 @@
-/* $Id$ */
+/*
+ * crypt32 dll resources
+ *
+ * Copyright (C) 2006 Juan Lang
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION   "Crypt\0"
+#define REACTOS_STR_FILE_DESCRIPTION   "CryptoAPI Library\0"
 #define REACTOS_STR_INTERNAL_NAME      "crypt32\0"
 #define REACTOS_STR_ORIGINAL_FILENAME  "crypt32.dll\0"
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "cryptres.h"
+
 #include <reactos/version.rc>
+
+#include "crypt32_De.rc"
+#include "crypt32_En.rc"
+#include "crypt32_Ko.rc"
+#include "crypt32_No.rc"
index 897853c..1273062 100644 (file)
@@ -6,7 +6,7 @@
 @ stdcall CertAddEncodedCertificateToStore(long long ptr long long ptr)
 @ stub CertAddEncodedCertificateToSystemStoreA
 @ stub CertAddEncodedCertificateToSystemStoreW
-@ stub CertAddEnhancedKeyUsageIdentifier
+@ stdcall CertAddEnhancedKeyUsageIdentifier(ptr str)
 @ stdcall CertAddSerializedElementToStore(ptr ptr long long long long ptr ptr)
 @ stdcall CertAddStoreToCollection(ptr ptr long long)
 @ stdcall CertAlgIdToOID(long)
@@ -26,7 +26,7 @@
 @ stub CertDuplicateCRLContext
 @ stub CertDuplicateCTLContext
 @ stdcall CertDuplicateCertificateContext(ptr)
-@ stub CertDuplicateStore
+@ stdcall CertDuplicateStore(ptr)
 @ stub CertEnumCRLContextProperties
 @ stdcall CertEnumCRLsInStore(ptr ptr)
 @ stub CertEnumCTLContextProperties
 @ stdcall CertGetCTLContextProperty(ptr long ptr ptr)
 @ stub CertGetCertificateChain
 @ stdcall CertGetCertificateContextProperty(ptr long ptr ptr)
-@ stub CertGetEnhancedKeyUsage
+@ stdcall CertGetEnhancedKeyUsage(ptr long ptr ptr)
 @ stub CertGetIntendedKeyUsage
 @ stub CertGetIssuerCertificateFromStore
-@ stub CertGetNameStringA
-@ stub CertGetNameStringW
+@ stdcall CertGetNameStringA(ptr long long ptr ptr long)
+@ stdcall CertGetNameStringW(ptr long long ptr ptr long)
 @ stub CertGetPublicKeyLength
 @ stub CertGetSubjectCertificateFromStore
+@ stdcall CertGetValidUsages(long ptr ptr ptr ptr)
 @ stub CertIsRDNAttrsInCertificateName
-@ stub CertNameToStrA
-@ stub CertNameToStrW
+@ stdcall CertNameToStrA(long ptr long ptr long)
+@ stdcall CertNameToStrW(long ptr long ptr long)
 @ stdcall CertOIDToAlgId(str)
 @ stdcall CertOpenStore(str long long long ptr)
 @ stdcall CertOpenSystemStoreA(long str)
 @ stdcall CertOpenSystemStoreW(long wstr)
-@ stub CertRDNValueToStrA
-@ stub CertRDNValueToStrW
-@ stub CertRemoveEnhancedKeyUsageIdentifier
+@ stdcall CertRDNValueToStrA(long ptr ptr long)
+@ stdcall CertRDNValueToStrW(long ptr ptr long)
+@ stdcall CertRemoveEnhancedKeyUsageIdentifier(ptr str)
 @ stdcall CertRemoveStoreFromCollection(long long)
 @ stdcall CertSaveStore(long long long long ptr long)
 @ stdcall CertSerializeCRLStoreElement(ptr long ptr ptr)
@@ -74,7 +75,7 @@
 @ stdcall CertSetCRLContextProperty(ptr long long ptr)
 @ stdcall CertSetCTLContextProperty(ptr long long ptr)
 @ stdcall CertSetCertificateContextProperty(ptr long long ptr)
-@ stub CertSetEnhancedKeyUsage
+@ stdcall CertSetEnhancedKeyUsage(ptr ptr)
 @ stub CertStrToNameA
 @ stub CertStrToNameW
 @ stub CertVerifyCertificateChainPolicy
 @ stdcall CryptEncodeObjectEx(long str ptr long ptr ptr ptr)
 @ stub CryptEncryptMessage
 @ stub CryptEnumOIDFunction
-@ stub CryptEnumOIDInfo
+@ stdcall CryptEnumOIDInfo(long long ptr ptr)
 @ stub CryptEnumProvidersU
 @ stub CryptExportPKCS8
 @ stdcall CryptExportPublicKeyInfo(long long long ptr ptr)
 @ stdcall CryptExportPublicKeyInfoEx(long long long str long ptr ptr ptr)
-@ stub CryptFindOIDInfo
+@ stdcall CryptFindOIDInfo(long ptr long)
 @ stub CryptFormatObject
 @ stdcall CryptFreeOIDFunctionAddress(long long)
 @ stub CryptGetAsyncParam
 @ stub CryptMsgUpdate
 @ stub CryptMsgVerifyCountersignatureEncoded
 @ stdcall CryptProtectData(ptr wstr ptr ptr ptr long ptr)
+@ stdcall CryptQueryObject(long ptr long long long ptr ptr ptr ptr ptr ptr)
 @ stdcall CryptRegisterDefaultOIDFunction(long str long wstr)
 @ stdcall CryptRegisterOIDFunction(long str str wstr str)
 @ stub CryptRegisterOIDInfo
 @ stdcall I_CryptFreeTls(long long)
 @ stub I_CryptGetDefaultCryptProv
 @ stub I_CryptGetDefaultCryptProvForEncrypt
-@ stub I_CryptGetOssGlobal
+@ stdcall I_CryptGetOssGlobal(long)
 @ stdcall I_CryptGetTls(long)
 @ stub I_CryptInsertLruEntry
-@ stub I_CryptInstallOssGlobal
+@ stdcall I_CryptInstallAsn1Module(long long long)
+@ stdcall I_CryptInstallOssGlobal(long long long)
 @ stub I_CryptReleaseLruEntry
 @ stdcall I_CryptSetTls(long ptr)
 @ stub I_CryptUninstallOssGlobal
diff --git a/reactos/dll/win32/crypt32/crypt32_De.rc b/reactos/dll/win32/crypt32/crypt32_De.rc
new file mode 100644 (file)
index 0000000..81daada
--- /dev/null
@@ -0,0 +1,166 @@
+/*\r
+ * crypt32 dll resources\r
+ *\r
+ * Copyright (C) 2006 Henning Gerhardt\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ */\r
+\r
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT\r
+\r
+STRINGTABLE DISCARDABLE\r
+{\r
+    IDS_AUTHORITY_KEY_ID "Autoritätsschlüsselkennung"\r
+    IDS_KEY_ATTRIBUTES "Schlüsselattribute"\r
+    IDS_KEY_USAGE_RESTRICTION "Schlüsselbenutzungseinschränkung"\r
+    IDS_SUBJECT_ALT_NAME "Alternativer Name des Antragsstellers"\r
+    IDS_ISSUER_ALT_NAME "Alternativer Name des Ausgebers"\r
+    IDS_BASIC_CONSTRAINTS "Grundsätzliche Einschränkungen"\r
+    IDS_KEY_USAGE "Schlüsselbenutzung"\r
+    IDS_CERT_POLICIES "Zertifikatsrichtlinien"\r
+    IDS_SUBJECT_KEY_IDENTIFIER "Schlüsselkennung des Antragsstellers"\r
+    IDS_CRL_REASON_CODE "CRL Grundcode"\r
+    IDS_CRL_DIST_POINTS "CRL Verteilungspunkte"\r
+    IDS_ENHANCED_KEY_USAGE "Erweiterte Schlüsselbenutzung"\r
+    IDS_AUTHORITY_INFO_ACCESS "Autoritätsinformationszugriff"\r
+    IDS_CERT_EXTENSIONS "Zertifikatserweiterung"\r
+    IDS_NEXT_UPDATE_LOCATION "Next Update Location"\r
+    IDS_YES_OR_NO_TRUST "Vertrauen oder nicht vertrauen"\r
+    IDS_EMAIL_ADDRESS "E-Mail-Adresse"\r
+    IDS_UNSTRUCTURED_NAME "Unstrukturierter Name"\r
+    IDS_CONTENT_TYPE "Inhaltstyp"\r
+    IDS_MESSAGE_DIGEST "Nachrichtenübersicht"\r
+    IDS_SIGNING_TIME "Signierungszeit"\r
+    IDS_COUNTER_SIGN "Gegensignatur"\r
+    IDS_CHALLENGE_PASSWORD "Challenge Password"\r
+    IDS_UNSTRUCTURED_ADDRESS "Unstrukturierte Adresse"\r
+    IDS_SMIME_CAPABILITIES "SMIME Möglichkeiten"\r
+    IDS_PREFER_SIGNED_DATA "Signierte Daten bevorzugen"\r
+    IDS_CPS "CPS"\r
+    IDS_USER_NOTICE "Benutzerbenachrichtung"\r
+    IDS_OCSP "Online Zertifikationsstatusprotokoll"\r
+    IDS_CA_ISSUER "Ausgeber des Zertifikationsautorität"\r
+    IDS_CERT_TEMPLATE_NAME "Zertifkationsvorlagenname"\r
+    IDS_CERT_TYPE "Zertifikationstyp"\r
+    IDS_CERT_MANIFOLD "Zertifikationsvervielfältigung"\r
+    IDS_NETSCAPE_CERT_TYPE "Netscape Zertifikationstyp"\r
+    IDS_NETSCAPE_BASE_URL "Netscape Basis-URL"\r
+    IDS_NETSCAPE_REVOCATION_URL "Netscape Sperrungs-URL"\r
+    IDS_NETSCAPE_CA_REVOCATION_URL "Netscape CA Sperrungs-URL"\r
+    IDS_NETSCAPE_CERT_RENEWAL_URL "Netscape Zertifikationsernerung-URL"\r
+    IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Richtlinien-URL"\r
+    IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL Servername"\r
+    IDS_NETSCAPE_COMMENT "Netscape Kommentar"\r
+    IDS_SPC_SP_AGENCY_INFO "SpcSp Agentur-Information"\r
+    IDS_SPC_FINANCIAL_CRITERIA "Spc Finanzielle Kriterien"\r
+    IDS_SPC_MINIMAL_CRITERIA "Spc Minimale Kriterien"\r
+    IDS_COUNTRY "Land/Region"\r
+    IDS_ORGANIZATION "Organisation"\r
+    IDS_ORGANIZATIONAL_UNIT "Organisationseinheit"\r
+    IDS_COMMON_NAME "Allgemeiner Name"\r
+    IDS_LOCALITY "Ort"\r
+    IDS_STATE_OR_PROVINCE "Bundesland oder Provinz"\r
+    IDS_TITLE "Titel"\r
+    IDS_GIVEN_NAME "Vorname"\r
+    IDS_INITIALS "Initialen"\r
+    IDS_SUR_NAME "Nachname"\r
+    IDS_DOMAIN_COMPONENT "Domänkomponente"\r
+    IDS_STREET_ADDRESS "Straße"\r
+    IDS_SERIAL_NUMBER "Seriennummer"\r
+    IDS_CA_VERSION "CA Version"\r
+    IDS_CROSS_CA_VERSION "Kreuz CA Version"\r
+    IDS_SERIALIZED_SIG_SERIAL_NUMBER "Serialisierte Signaturseriennummer"\r
+    IDS_PRINCIPAL_NAME "Prinzipalname"\r
+    IDS_WINDOWS_PRODUCT_UPDATE "Windows Produkt Aktualisierung"\r
+    IDS_ENROLLMENT_NAME_VALUE_PAIR "Wertepaar für Eintragungsname"\r
+    IDS_OS_VERSION "Betriebssystemversion"\r
+    IDS_ENROLLMENT_CSP "Eintragungs-CSP"\r
+    IDS_CRL_NUMBER "CRL Nummer"\r
+    IDS_DELTA_CRL_INDICATOR "Delta CRL Indikator"\r
+    IDS_ISSUING_DIST_POINT "Ausgeber des Verteilungspunktes"\r
+    IDS_FRESHEST_CRL "Aktuelle CRL"\r
+    IDS_NAME_CONSTRAINTS "Namenseinschränkungen"\r
+    IDS_POLICY_MAPPINGS "Richtlinienzuordnungen"\r
+    IDS_POLICY_CONSTRAINTS "Richtlinieneinschränkungen"\r
+    IDS_CROSS_CERT_DIST_POINTS "Verteilungspunkte für Kreuzzertifikate"\r
+    IDS_APPLICATION_POLICIES "Anwendungsrichtlinien"\r
+    IDS_APPLICATION_POLICY_MAPPINGS "Anwendungsrichtlinienzuordnungen"\r
+    IDS_APPLICATION_POLICY_CONSTRAINTS "Anweungsungsrichtlinieneinschränkungen"\r
+    IDS_CMC_DATA "CMC Daten"\r
+    IDS_CMC_RESPONSE "CMC Antwort"\r
+    IDS_UNSIGNED_CMC_REQUEST "Unsignierte CMC Antwort"\r
+    IDS_CMC_STATUS_INFO "CMC Statusinformation"\r
+    IDS_CMC_EXTENSIONS "CMC Erweiterungen"\r
+    IDS_CMC_ATTRIBUTES "CMC Attribute"\r
+    IDS_PKCS_7_DATA "PKCS 7 Daten"\r
+    IDS_PKCS_7_SIGNED "PKCS 7 signiert"\r
+    IDS_PKCS_7_ENVELOPED "PKCS 7 umhüllt"\r
+    IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 signiert und umhüllt"\r
+    IDS_PKCS_7_DIGESTED "PKCS 7 Digested"\r
+    IDS_PKCS_7_ENCRYPTED "PKCS 7 verschlüsselt"\r
+    IDS_PREVIOUS_CA_CERT_HASH "Vorheriger CA Zertifikatshash"\r
+    IDS_CRL_VIRTUAL_BASE "Virtuelle Basis-CRL-Nummer"\r
+    IDS_CRL_NEXT_PUBLISH "Nächste CRL Veröffentlichung"\r
+    IDS_CA_EXCHANGE "CA Verschlüsselungszertifikat"\r
+    IDS_KEY_RECOVERY_AGENT "Agent zur Schlüsselwiederherstellung"\r
+    IDS_CERTIFICATE_TEMPLATE "Zertifikatsvorlageninformation"\r
+    IDS_ENTERPRISE_ROOT_OID "Unternehmensstamm-OID"\r
+    IDS_RDN_DUMMY_SIGNER "Attrapenunterzeichner"\r
+    IDS_ARCHIVED_KEY_ATTR "Verschlüsselter, privater Schlüssel"\r
+    IDS_CRL_SELF_CDP "Veröffentlichte CRL Standorte"\r
+    IDS_REQUIRE_CERT_CHAIN_POLICY "Erzwinge Zertifikatskettenrichtlinie"\r
+    IDS_TRANSACTION_ID "Transaktions-ID"\r
+    IDS_SENDER_NONCE "Sender einstweilen"\r
+    IDS_RECIPIENT_NONCE "Empfänger einstweilen"\r
+    IDS_REG_INFO "Registrierungsinformationen"\r
+    IDS_GET_CERTIFICATE "Bekomme Zertifikat"\r
+    IDS_GET_CRL "Bekomme CRL"\r
+    IDS_REVOKE_REQUEST "Anfrageablehnen"\r
+    IDS_QUERY_PENDING "Wartende Abfrage"\r
+    IDS_SORTED_CTL "Zertifikatsvertrauensliste"\r
+    IDS_ARCHIVED_KEY_CERT_HASH "Archivierter Schlüsselzertifikatshash"\r
+    IDS_PRIVATE_KEY_USAGE_PERIOD "Private Schlüsselbenutzungsdauer"\r
+    IDS_CLIENT_INFORMATION "Client Information"\r
+    IDS_SERVER_AUTHENTICATION "Server Authentifizierung"\r
+    IDS_CLIENT_AUTHENTICATION "Client Authentifizierung"\r
+    IDS_CODE_SIGNING "Codesignatur"\r
+    IDS_SECURE_EMAIL "Sichere E-Mail"\r
+    IDS_TIME_STAMPING "Zeitstempel"\r
+    IDS_MICROSOFT_TRUST_LIST_SIGNING "Microsoft Vertrauenslistensignatur"\r
+    IDS_MICROSOFT_TIME_STAMPING "Microsoft Zeitstempel"\r
+    IDS_IPSEC_END_SYSTEM "IP Sicherheitsendsystem"\r
+    IDS_IPSEC_TUNNEL "IP Sicherheitstunnelabschluss"\r
+    IDS_IPSEC_USER "IP Sicherheitsbenutzer"\r
+    IDS_EFS "Verschlüsseltes Dateisystem"\r
+    IDS_WHQL_CRYPTO "Windows Hardware Treiber Verifizierung"\r
+    IDS_NT5_CRYPTO "Windows System Komponenten Verifizierung"\r
+    IDS_OEM_WHQL_CRYPTO "OEM Windows System Komponenten Verifizierung"\r
+    IDS_EMBEDDED_NT_CRYPTO "Embedded Windows System Komponenten Verifizierung"\r
+    IDS_KEY_PACK_LICENSES "Schlüsselpaketlizenzen"\r
+    IDS_LICENSE_SERVER "Lizenzserver Verifizierung"\r
+    IDS_SMART_CARD_LOGON "Smartcard Login"\r
+    IDS_DIGITAL_RIGHTS "Digitale Rechte"\r
+    IDS_QUALIFIED_SUBORDINATION "Qualifizierte Unterordnung"\r
+    IDS_KEY_RECOVERY "Schlüsselwiederherstellung"\r
+    IDS_DOCUMENT_SIGNING "Dokumentensignatur"\r
+    IDS_IPSEC_IKE_INTERMEDIATE "dazwischenliegende IP Sicherheits-IKE"\r
+    IDS_FILE_RECOVERY "Dateiwiederherstellung"\r
+    IDS_ROOT_LIST_SIGNER "Stammlistengeber"\r
+    IDS_ANY_APPLICATION_POLICIES "Alle Anwendungsrichtlinien"\r
+    IDS_DS_EMAIL_REPLICATION "Verzeichnisdienst für E-Mail Replikation"\r
+    IDS_ENROLLMENT_AGENT "Agent für Zertifikationsanforderung"\r
+    IDS_LIFETIME_SIGNING "Lebensdauersignatur"\r
+    IDS_ANY_CERT_POLICY "Alle ausgegebenen Richtlinien"\r
+}\r
diff --git a/reactos/dll/win32/crypt32/crypt32_En.rc b/reactos/dll/win32/crypt32/crypt32_En.rc
new file mode 100644 (file)
index 0000000..5c02ba1
--- /dev/null
@@ -0,0 +1,166 @@
+/*\r
+ * crypt32 dll resources\r
+ *\r
+ * Copyright (C) 2006 Juan Lang\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ */\r
+\r
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT\r
+\r
+STRINGTABLE DISCARDABLE\r
+{\r
+    IDS_AUTHORITY_KEY_ID "Authority Key Identifier"\r
+    IDS_KEY_ATTRIBUTES "Key Attributes"\r
+    IDS_KEY_USAGE_RESTRICTION "Key Usage Restriction"\r
+    IDS_SUBJECT_ALT_NAME "Subject Alternative Name"\r
+    IDS_ISSUER_ALT_NAME "Issuer Alternative Name"\r
+    IDS_BASIC_CONSTRAINTS "Basic Constraints"\r
+    IDS_KEY_USAGE "Key Usage"\r
+    IDS_CERT_POLICIES "Certificate Policies"\r
+    IDS_SUBJECT_KEY_IDENTIFIER "Subject Key Identifier"\r
+    IDS_CRL_REASON_CODE "CRL Reason Code"\r
+    IDS_CRL_DIST_POINTS "CRL Distribution Points"\r
+    IDS_ENHANCED_KEY_USAGE "Enhanced Key Usage"\r
+    IDS_AUTHORITY_INFO_ACCESS "Authority Information Access"\r
+    IDS_CERT_EXTENSIONS "Certificate Extensions"\r
+    IDS_NEXT_UPDATE_LOCATION "Next Update Location"\r
+    IDS_YES_OR_NO_TRUST "Yes or No Trust"\r
+    IDS_EMAIL_ADDRESS "Email Address"\r
+    IDS_UNSTRUCTURED_NAME "Unstructured Name"\r
+    IDS_CONTENT_TYPE "Content Type"\r
+    IDS_MESSAGE_DIGEST "Message Digest"\r
+    IDS_SIGNING_TIME "Signing Time"\r
+    IDS_COUNTER_SIGN "Counter Sign"\r
+    IDS_CHALLENGE_PASSWORD "Challenge Password"\r
+    IDS_UNSTRUCTURED_ADDRESS "Unstructured Address"\r
+    IDS_SMIME_CAPABILITIES "SMIME Capabilities"\r
+    IDS_PREFER_SIGNED_DATA "Prefer Signed Data"\r
+    IDS_CPS "CPS"\r
+    IDS_USER_NOTICE "User Notice"\r
+    IDS_OCSP "On-line Certificate Status Protocol"\r
+    IDS_CA_ISSUER "Certification Authority Issuer"\r
+    IDS_CERT_TEMPLATE_NAME "Certification Template Name"\r
+    IDS_CERT_TYPE "Certificate Type"\r
+    IDS_CERT_MANIFOLD "Certificate Manifold"\r
+    IDS_NETSCAPE_CERT_TYPE "Netscape Cert Type"\r
+    IDS_NETSCAPE_BASE_URL "Netscape Base URL"\r
+    IDS_NETSCAPE_REVOCATION_URL "Netscape Revocation URL"\r
+    IDS_NETSCAPE_CA_REVOCATION_URL "Netscape CA Revocation URL"\r
+    IDS_NETSCAPE_CERT_RENEWAL_URL "Netscape Cert Renewal URL"\r
+    IDS_NETSCAPE_CA_POLICY_URL "Netscape CA Policy URL"\r
+    IDS_NETSCAPE_SSL_SERVER_NAME "Netscape SSL ServerName"\r
+    IDS_NETSCAPE_COMMENT "Netscape Comment"\r
+    IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"\r
+    IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"\r
+    IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"\r
+    IDS_COUNTRY "Country/Region"\r
+    IDS_ORGANIZATION "Organization"\r
+    IDS_ORGANIZATIONAL_UNIT "Organizational Unit"\r
+    IDS_COMMON_NAME "Common Name"\r
+    IDS_LOCALITY "Locality"\r
+    IDS_STATE_OR_PROVINCE "State or Province"\r
+    IDS_TITLE "Title"\r
+    IDS_GIVEN_NAME "Given Name"\r
+    IDS_INITIALS "Initials"\r
+    IDS_SUR_NAME "Sur Name"\r
+    IDS_DOMAIN_COMPONENT "Domain Component"\r
+    IDS_STREET_ADDRESS "Street Address"\r
+    IDS_SERIAL_NUMBER "Serial Number"\r
+    IDS_CA_VERSION "CA Version"\r
+    IDS_CROSS_CA_VERSION "Cross CA Version"\r
+    IDS_SERIALIZED_SIG_SERIAL_NUMBER "Serialized Signature Serial Number"\r
+    IDS_PRINCIPAL_NAME "Principal Name"\r
+    IDS_WINDOWS_PRODUCT_UPDATE "Windows Product Update"\r
+    IDS_ENROLLMENT_NAME_VALUE_PAIR "Enrollment Name Value Pair"\r
+    IDS_OS_VERSION "OS Version"\r
+    IDS_ENROLLMENT_CSP "Enrollment CSP"\r
+    IDS_CRL_NUMBER "CRL Number"\r
+    IDS_DELTA_CRL_INDICATOR "Delta CRL Indicator"\r
+    IDS_ISSUING_DIST_POINT "Issuing Distribution Point"\r
+    IDS_FRESHEST_CRL "Freshest CRL"\r
+    IDS_NAME_CONSTRAINTS "Name Constraints"\r
+    IDS_POLICY_MAPPINGS "Policy Mappings"\r
+    IDS_POLICY_CONSTRAINTS "Policy Constraints"\r
+    IDS_CROSS_CERT_DIST_POINTS "Cross-Certificate Distribution Points"\r
+    IDS_APPLICATION_POLICIES "Application Policies"\r
+    IDS_APPLICATION_POLICY_MAPPINGS "Application Policy Mappings"\r
+    IDS_APPLICATION_POLICY_CONSTRAINTS "Application Policy Constraints"\r
+    IDS_CMC_DATA "CMC Data"\r
+    IDS_CMC_RESPONSE "CMC Response"\r
+    IDS_UNSIGNED_CMC_REQUEST "Unsigned CMC Request"\r
+    IDS_CMC_STATUS_INFO "CMC Status Info"\r
+    IDS_CMC_EXTENSIONS "CMC Extensions"\r
+    IDS_CMC_ATTRIBUTES "CMC Attributes"\r
+    IDS_PKCS_7_DATA "PKCS 7 Data"\r
+    IDS_PKCS_7_SIGNED "PKCS 7 Signed"\r
+    IDS_PKCS_7_ENVELOPED "PKCS 7 Enveloped"\r
+    IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signed Enveloped"\r
+    IDS_PKCS_7_DIGESTED "PKCS 7 Digested"\r
+    IDS_PKCS_7_ENCRYPTED "PKCS 7 Encrypted"\r
+    IDS_PREVIOUS_CA_CERT_HASH "Previous CA Certificate Hash"\r
+    IDS_CRL_VIRTUAL_BASE "Virtual Base CRL Number"\r
+    IDS_CRL_NEXT_PUBLISH "Next CRL Publish"\r
+    IDS_CA_EXCHANGE "CA Encryption Certificate"\r
+    IDS_KEY_RECOVERY_AGENT "Key Recovery Agent"\r
+    IDS_CERTIFICATE_TEMPLATE "Certificate Template Information"\r
+    IDS_ENTERPRISE_ROOT_OID "Enterprise Root OID"\r
+    IDS_RDN_DUMMY_SIGNER "Dummy Signer"\r
+    IDS_ARCHIVED_KEY_ATTR "Encrypted Private Key"\r
+    IDS_CRL_SELF_CDP "Published CRL Locations"\r
+    IDS_REQUIRE_CERT_CHAIN_POLICY "Enforce Certificate Chain Policy"\r
+    IDS_TRANSACTION_ID "Transaction Id"\r
+    IDS_SENDER_NONCE "Sender Nonce"\r
+    IDS_RECIPIENT_NONCE "Recipient Nonce"\r
+    IDS_REG_INFO "Reg Info"\r
+    IDS_GET_CERTIFICATE "Get Certificate"\r
+    IDS_GET_CRL "Get CRL"\r
+    IDS_REVOKE_REQUEST "Revoke Request"\r
+    IDS_QUERY_PENDING "Query Pending"\r
+    IDS_SORTED_CTL "Certificate Trust List"\r
+    IDS_ARCHIVED_KEY_CERT_HASH "Archived Key Certificate Hash"\r
+    IDS_PRIVATE_KEY_USAGE_PERIOD "Private Key Usage Period"\r
+    IDS_CLIENT_INFORMATION "Client Information"\r
+    IDS_SERVER_AUTHENTICATION "Server Authentication"\r
+    IDS_CLIENT_AUTHENTICATION "Client Authentication"\r
+    IDS_CODE_SIGNING "Code Signing"\r
+    IDS_SECURE_EMAIL "Secure Email"\r
+    IDS_TIME_STAMPING "Time Stamping"\r
+    IDS_MICROSOFT_TRUST_LIST_SIGNING "Microsoft Trust List Signing"\r
+    IDS_MICROSOFT_TIME_STAMPING "Microsoft Time Stamping"\r
+    IDS_IPSEC_END_SYSTEM "IP security end system"\r
+    IDS_IPSEC_TUNNEL "IP security tunnel termination"\r
+    IDS_IPSEC_USER "IP security user"\r
+    IDS_EFS "Encrypting File System"\r
+    IDS_WHQL_CRYPTO "Windows Hardware Driver Verification"\r
+    IDS_NT5_CRYPTO "Windows System Component Verification"\r
+    IDS_OEM_WHQL_CRYPTO "OEM Windows System Component Verification"\r
+    IDS_EMBEDDED_NT_CRYPTO "Embedded Windows System Component Verification"\r
+    IDS_KEY_PACK_LICENSES "Key Pack Licenses"\r
+    IDS_LICENSE_SERVER "License Server Verification"\r
+    IDS_SMART_CARD_LOGON "Smart Card Logon"\r
+    IDS_DIGITAL_RIGHTS "Digital Rights"\r
+    IDS_QUALIFIED_SUBORDINATION "Qualified Subordination"\r
+    IDS_KEY_RECOVERY "Key Recovery"\r
+    IDS_DOCUMENT_SIGNING "Document Signing"\r
+    IDS_IPSEC_IKE_INTERMEDIATE "IP security IKE intermediate"\r
+    IDS_FILE_RECOVERY "File Recovery"\r
+    IDS_ROOT_LIST_SIGNER "Root List Signer"\r
+    IDS_ANY_APPLICATION_POLICIES "All application policies"\r
+    IDS_DS_EMAIL_REPLICATION "Directory Service Email Replication"\r
+    IDS_ENROLLMENT_AGENT "Certificate Request Agent"\r
+    IDS_LIFETIME_SIGNING "Lifetime Signing"\r
+    IDS_ANY_CERT_POLICY "All issuance policies"\r
+}\r
diff --git a/reactos/dll/win32/crypt32/crypt32_Ko.rc b/reactos/dll/win32/crypt32/crypt32_Ko.rc
new file mode 100644 (file)
index 0000000..9054e8f
--- /dev/null
@@ -0,0 +1,167 @@
+/*\r
+ * crypt32 dll resources\r
+ *\r
+ * Copyright (C) 2006 Juan Lang\r
+ * Copyright (C) 2006 YunSong Hwang\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ */\r
+\r
+LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT\r
+\r
+STRINGTABLE DISCARDABLE\r
+{\r
+    IDS_AUTHORITY_KEY_ID "Á¢±Ù Å° ½Äº°ÀÚ"\r
+    IDS_KEY_ATTRIBUTES "Å° ¼Ó¼º"\r
+    IDS_KEY_USAGE_RESTRICTION "Å° »ç¿ë Á¦ÇÑ"\r
+    IDS_SUBJECT_ALT_NAME "ÁÖÁ¦(subject) ´ëü À̸§"\r
+    IDS_ISSUER_ALT_NAME "¹ßÇàÀÚ ´ëü À̸§"\r
+    IDS_BASIC_CONSTRAINTS "±âº» Á¦¾à"\r
+    IDS_KEY_USAGE "Å° »ç¿ë¹ý"\r
+    IDS_CERT_POLICIES "ÀÎÁõ ¹æħ"\r
+    IDS_SUBJECT_KEY_IDENTIFIER "ÁÖÁ¦(Subject)Å° ½Äº°ÀÚ"\r
+    IDS_CRL_REASON_CODE "CRL ºÐº° ÄÚµå"\r
+    IDS_CRL_DIST_POINTS "CRL ¹èÆ÷  ÁöÁ¡"\r
+    IDS_ENHANCED_KEY_USAGE "È®ÀåµÈ Å° »ç¿ë¹ý"\r
+    IDS_AUTHORITY_INFO_ACCESS "±ÇÇÑ Á¤º¸ Á¢±Ù"\r
+    IDS_CERT_EXTENSIONS "ÀÎÁõ¼­ È®Àå(Certificate Extensions)"\r
+    IDS_NEXT_UPDATE_LOCATION "´ÙÀ½ ¾÷µ¥ÀÌÆ® À§Ä¡"\r
+    IDS_YES_OR_NO_TRUST "½Å·Ú(¿¹ ³ª ¾Æ´Ï¿À)"\r
+    IDS_EMAIL_ADDRESS "À̸ÞÀÏ ÁÖ¼Ò"\r
+    IDS_UNSTRUCTURED_NAME "ºñ±¸Á¶È­ À̸§"\r
+    IDS_CONTENT_TYPE "³»¿ë Çü½Ä"\r
+    IDS_MESSAGE_DIGEST "³»¿ë ¿ä¾à"\r
+    IDS_SIGNING_TIME "¼­¸í ½Ã°£"\r
+    IDS_COUNTER_SIGN "¿ª ¼­¸í(Counter Sign)"\r
+    IDS_CHALLENGE_PASSWORD "¾ÏÈ£ ¹Ù²Ù±â"\r
+    IDS_UNSTRUCTURED_ADDRESS "ºñ±¸Á¶È­ ÁÖ¼Ò"\r
+    IDS_SMIME_CAPABILITIES "SMIME Æ¯¼º"\r
+    IDS_PREFER_SIGNED_DATA "¼±È£Çϴ »çÀεȠµ¥ÀÌŸ(Prefer Signed Data)"\r
+    IDS_CPS "CPS"\r
+    IDS_USER_NOTICE "»ç¿ëÀÚ ÅëÁö"\r
+    IDS_OCSP "¿Â¶óÀΠÀÎÁõ »óÅ ÇÁ·ÎÅäÄÝ"\r
+    IDS_CA_ISSUER "ÀÎÁõ¼­ Á¢±Ù ¹ßÇàÀÚ"\r
+    IDS_CERT_TEMPLATE_NAME "ÀÎÁõ ÇüÆÇ À̸§"\r
+    IDS_CERT_TYPE "ÀÎÁõ¼­ ÇüÅÂ"\r
+    IDS_CERT_MANIFOLD "ÀÎÁõ¼­ »çº»"\r
+    IDS_NETSCAPE_CERT_TYPE "³Ý½ºÄÉÀÌÇÁ ÀÎÁõ ÇüÅÂ"\r
+    IDS_NETSCAPE_BASE_URL "³Ý½ºÄÉÀÌÇÁ ±âº» À¥ÁÖ¼Ò"\r
+    IDS_NETSCAPE_REVOCATION_URL "³Ý½ºÄÉÀÌÇÁ Ãë¼Ò À¥ÁÖ¼Ò"\r
+    IDS_NETSCAPE_CA_REVOCATION_URL "³Ý½ºÄÉÀÌÇÁ CA Ãë¼Ò À¥ÁÖ¼Ò"\r
+    IDS_NETSCAPE_CERT_RENEWAL_URL "³Ý½ºÄÉÀÌÇÁ ÀÎÁõ¼­ Àç°³ À¥ÁÖ¼Ò"\r
+    IDS_NETSCAPE_CA_POLICY_URL "³Ý½ºÄÉÀÌÇÁ CA ¹æħ URL"\r
+    IDS_NETSCAPE_SSL_SERVER_NAME "³Ý½ºÄÉÀÌÇÁ SSL ¼­¹öÀ̸§"\r
+    IDS_NETSCAPE_COMMENT "³Ý½ºÄÉÀÌÇÁ ¼³¸í"\r
+    IDS_SPC_SP_AGENCY_INFO "SpcSp°ü¸®ÀÚ Á¤º¸"\r
+    IDS_SPC_FINANCIAL_CRITERIA "SpcÀçÁ¤»ó ¿øÄ¢"\r
+    IDS_SPC_MINIMAL_CRITERIA "SpcÃÖ¼Ò ¿øÄ¢"\r
+    IDS_COUNTRY "³ª¶ó/Áö¿ª"\r
+    IDS_ORGANIZATION "´Üü"\r
+    IDS_ORGANIZATIONAL_UNIT "´Üü(Organizational Unit)"\r
+    IDS_COMMON_NAME "¾ÖĪ"\r
+    IDS_LOCALITY "¼ÒÀçÁö"\r
+    IDS_STATE_OR_PROVINCE "ÁÖ³ª Áö¹æ"\r
+    IDS_TITLE "Á¦¸ñ"\r
+    IDS_GIVEN_NAME "ÁÖ¾îÁø À̸§"\r
+    IDS_INITIALS "¸Ó¸´±ÛÀÚ"\r
+    IDS_SUR_NAME "¼º"\r
+    IDS_DOMAIN_COMPONENT "ÁÖ¼Ò ±¸¼º¿ä¼Ò"\r
+    IDS_STREET_ADDRESS "°Å¸® ÁÖ¼Ò"\r
+    IDS_SERIAL_NUMBER "½Ã¸®¾ó ¹øÈ£"\r
+    IDS_CA_VERSION "CA ¹öÁ¯"\r
+    IDS_CROSS_CA_VERSION "±³Â÷ CA ¹öÁ¯"\r
+    IDS_SERIALIZED_SIG_SERIAL_NUMBER "¿¬¼ÓµÈ(Serialized) ¼­¸í ½Ã¸®¾ó ³Ñ¹ö"\r
+    IDS_PRINCIPAL_NAME "ÁÖ¿äÇÑ À̸§"\r
+    IDS_WINDOWS_PRODUCT_UPDATE "À©µµ¿ìÁî Á¦Ç° ¾÷µ¥ÀÌÆ®"\r
+    IDS_ENROLLMENT_NAME_VALUE_PAIR "µî·Ï À̸§ °ªÀÇ ½Ö"\r
+    IDS_OS_VERSION "OS ¹öÁ¯"\r
+    IDS_ENROLLMENT_CSP "CSP µî·Ï"\r
+    IDS_CRL_NUMBER "CRL ¹øÈ£"\r
+    IDS_DELTA_CRL_INDICATOR "µ¨Å¸ CRL Ç¥½Ã±â"\r
+    IDS_ISSUING_DIST_POINT "¹ßÇàÀÚ ¹èÆ÷ À§Ä¡"\r
+    IDS_FRESHEST_CRL "ÃֽŠCRL"\r
+    IDS_NAME_CONSTRAINTS "À̸§ Á¦¾à"\r
+    IDS_POLICY_MAPPINGS "Á¤Ã¥ ´ëÀÀ"\r
+    IDS_POLICY_CONSTRAINTS "Á¤Ã¥ Á¦¾à"\r
+    IDS_CROSS_CERT_DIST_POINTS "»óÈ£ ÀÎÁõ ºÐ¹è À§Ä¡"\r
+    IDS_APPLICATION_POLICIES "Ç®±×¸² ¹æħ"\r
+    IDS_APPLICATION_POLICY_MAPPINGS "Ç®±×¸² Á¤Ã¥ ´ëÀÀ(Mappings)"\r
+    IDS_APPLICATION_POLICY_CONSTRAINTS "Ç®±×¸² Á¤Ã¥ Á¦¾à"\r
+    IDS_CMC_DATA "CMC µ¥ÀÌŸ"\r
+    IDS_CMC_RESPONSE "CMC ÀÀ´ä"\r
+    IDS_UNSIGNED_CMC_REQUEST "¼­¸íµÇÁö ¾ÊÀºCMC ¿äû"\r
+    IDS_CMC_STATUS_INFO "CMC »óÅ Á¤º¸"\r
+    IDS_CMC_EXTENSIONS "CMC È®Àå"\r
+    IDS_CMC_ATTRIBUTES "CMC ¼Ó¼º"\r
+    IDS_PKCS_7_DATA "PKCS 7 µ¥ÀÌŸ"\r
+    IDS_PKCS_7_SIGNED "PKCS 7 ¼­¸í"\r
+    IDS_PKCS_7_ENVELOPED "PKCS 7 ½Î°³"\r
+    IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 ¼­¸íµÈ ½Î°³"\r
+    IDS_PKCS_7_DIGESTED "PKCS 7 ¿ä¾à"\r
+    IDS_PKCS_7_ENCRYPTED "PKCS 7 ¾Ïȣȭ"\r
+    IDS_PREVIOUS_CA_CERT_HASH "ÀÌÀüÀÇ CA ÀÎÁõ Çؽ¬"\r
+    IDS_CRL_VIRTUAL_BASE "°¡»ó ±â¹Ý CRL ¼ýÀÚ(Virtual Base CRL Number)"\r
+    IDS_CRL_NEXT_PUBLISH "´ÙÀ½ CRL ¹ßÇà"\r
+    IDS_CA_EXCHANGE "CA ¾ÏÈ£ ÀÎÁõ"\r
+    IDS_KEY_RECOVERY_AGENT "Å° º¹±¸ °ü¸®ÀÚ"\r
+    IDS_CERTIFICATE_TEMPLATE "ÀÎÁõ ÁÖÇü(Template) Á¤º¸"\r
+    IDS_ENTERPRISE_ROOT_OID "±â¾÷ ·çÆ® OID"\r
+    IDS_RDN_DUMMY_SIGNER "°¡Â¥ »çÀÎÀÚ(Dummy Signer)"\r
+    IDS_ARCHIVED_KEY_ATTR "¾ÏȣȭµÈ °³ÀΠŰ"\r
+    IDS_CRL_SELF_CDP "¹ßÇàµÈ CRL À§Ä¡"\r
+    IDS_REQUIRE_CERT_CHAIN_POLICY "°­Á¦ ÀÎÁõ Ã¼ÀΠÁ¤Ã¥(Enforce Certificate Chain Policy)"\r
+    IDS_TRANSACTION_ID "󸮠Id"\r
+    IDS_SENDER_NONCE "Àӽà¹ß¼ÛÀÎ"\r
+    IDS_RECIPIENT_NONCE "Àӽà¼ö·ÉÀÎ"\r
+    IDS_REG_INFO "µî·Ï Á¤º¸"\r
+    IDS_GET_CERTIFICATE "ÀÎÁõ¼­ ¾ò±â"\r
+    IDS_GET_CRL "CRL ¾ò±â"\r
+    IDS_REVOKE_REQUEST "Ãë¼Ò ¿äû"\r
+    IDS_QUERY_PENDING "Áú¹®Çϴ Áß"\r
+    IDS_SORTED_CTL "ÀÎÁõµÈ ½Å·Ú ¸ñ·Ï"\r
+    IDS_ARCHIVED_KEY_CERT_HASH "¾ÐÃàµÈ Å° ÀÎÁõ Çؽ¬"\r
+    IDS_PRIVATE_KEY_USAGE_PERIOD "°³ÀΠŰ »ç¿ë ±â°£"\r
+    IDS_CLIENT_INFORMATION "Ŭ¶óÀ̾ðÆ® Á¤º¸"\r
+    IDS_SERVER_AUTHENTICATION "¼­¹ö ÀÎÁõ"\r
+    IDS_CLIENT_AUTHENTICATION "Ŭ¶óÀ̾ðÆ® ÀÎÁõ"\r
+    IDS_CODE_SIGNING "Äڵ堼­¸í"\r
+    IDS_SECURE_EMAIL "º¸¾È À̸ÞÀÏ"\r
+    IDS_TIME_STAMPING "½Ã°£ ³¯ÀÎ"\r
+    IDS_MICROSOFT_TRUST_LIST_SIGNING "¸¶ÀÌÅ©·Î¼ÒÇÁÆ® ½Å·Ú ¸ñ·Ï »çÀÎ"\r
+    IDS_MICROSOFT_TIME_STAMPING "¸¶ÀÌÅ©·Î¼ÒÇÁÆ® ½Ã°£ ³¯ÀÎ"\r
+    IDS_IPSEC_END_SYSTEM "IP º¸¾È Á¾´Ü ½Ã½ºÅÛ"\r
+    IDS_IPSEC_TUNNEL "IP º¸¾È  ÅͳΠÁ¾·á(tunnel termination)"\r
+    IDS_IPSEC_USER "IP º¸¾È »ç¿ëÀÚ"\r
+    IDS_EFS "¾ÏȣȭµÈ ÆÄÀÏ ½Ã½ºÅÛ"\r
+    IDS_WHQL_CRYPTO "À©µµ¿ìÁî Çϵå¿þ¾î µå¶óÀ̹ö °ËÁõ"\r
+    IDS_NT5_CRYPTO "À©µµ¿ìÁýºÅÛ ±¸¼º¿ä¼Ò °ËÁõ"\r
+    IDS_OEM_WHQL_CRYPTO "OEM À©µµ¿ìÁýºÅÛ ±¸¼º¿ä¼Ò °ËÁõ"\r
+    IDS_EMBEDDED_NT_CRYPTO "³»ÀåµÈ À©µµ¿ìÁýºÅÆ ±¸¼º¿ä¼Ò °ËÁß"\r
+    IDS_KEY_PACK_LICENSES "Å° ÆÑ ¶óÀ̼¾½º"\r
+    IDS_LICENSE_SERVER "¶óÀ̼¾½º ¼­¹ö °ËÁõ"\r
+    IDS_SMART_CARD_LOGON "½º¸¶Æ® Ä«µå ·Î±×ÀÎ"\r
+    IDS_DIGITAL_RIGHTS "µðÁöÅРÀúÀÛ±Ç"\r
+    IDS_QUALIFIED_SUBORDINATION "ÀÚ°ÝÀִ Á¾¼Ó°ü°è"\r
+    IDS_KEY_RECOVERY "Å° º¹±¸"\r
+    IDS_DOCUMENT_SIGNING "¹®¼­ ¼­¸í"\r
+    IDS_IPSEC_IKE_INTERMEDIATE "IP º¸¾È  IKE ¼ö´Ü(intermediate)"\r
+    IDS_FILE_RECOVERY "ÆÄÀÏ º¹±¸"\r
+    IDS_ROOT_LIST_SIGNER "·çÆ® ¸ñ·Ï ¼­¸íÀÚ"\r
+    IDS_ANY_APPLICATION_POLICIES "¸ðµç Ç®±×¸²ÀÇ ¹æħ"\r
+    IDS_DS_EMAIL_REPLICATION "µð·ºÅ丮 ¼­ºñ½º À̸ÞÀÏ ÀÀ´ä"\r
+    IDS_ENROLLMENT_AGENT "ÀÎÁõ ¿ä±¸ °ü¸®ÀÚ"\r
+    IDS_LIFETIME_SIGNING "Æò»ý ¼­¸í"\r
+    IDS_ANY_CERT_POLICY "¸ðµç ¹èÆ÷ ¹æħ"\r
+}\r
diff --git a/reactos/dll/win32/crypt32/crypt32_No.rc b/reactos/dll/win32/crypt32/crypt32_No.rc
new file mode 100644 (file)
index 0000000..3d2eb5a
--- /dev/null
@@ -0,0 +1,166 @@
+/*\r
+ * crypt32 dll resources\r
+ *\r
+ * Copyright (C) 2006 Alexander N. Sørnes <alex@thehandofagony.com>\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ */\r
+\r
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL\r
+\r
+STRINGTABLE DISCARDABLE\r
+{\r
+    IDS_AUTHORITY_KEY_ID "Identifiserer for autentiseringsnøkkel"\r
+    IDS_KEY_ATTRIBUTES "Nøkkelegenskaper"\r
+    IDS_KEY_USAGE_RESTRICTION "Begrensning av nøkkelbruk"\r
+    IDS_SUBJECT_ALT_NAME "Alternativt navn for emne"\r
+    IDS_ISSUER_ALT_NAME "Alternativt navn for utsteder"\r
+    IDS_BASIC_CONSTRAINTS "Basisbegrensninger"\r
+    IDS_KEY_USAGE "Nøkkelbruk"\r
+    IDS_CERT_POLICIES "Sertifikatholdninger"\r
+    IDS_SUBJECT_KEY_IDENTIFIER "Identifiserer for emnenøkkel"\r
+    IDS_CRL_REASON_CODE "CRL-grunnkode"\r
+    IDS_CRL_DIST_POINTS "CRL-distribusjonspunkter"\r
+    IDS_ENHANCED_KEY_USAGE "Forbedret nøkkelbruk"\r
+    IDS_AUTHORITY_INFO_ACCESS "Myndighet-informasjonstilgang"\r
+    IDS_CERT_EXTENSIONS "Sertifikatutvidelser"\r
+    IDS_NEXT_UPDATE_LOCATION "Neste oppdateringsplassering"\r
+    IDS_YES_OR_NO_TRUST "Ja eller nei tillit"\r
+    IDS_EMAIL_ADDRESS "E-postadresse"\r
+    IDS_UNSTRUCTURED_NAME "Ustrukturert navn"\r
+    IDS_CONTENT_TYPE "Innholdstype"\r
+    IDS_MESSAGE_DIGEST "Meldingssammendrag"\r
+    IDS_SIGNING_TIME "Signeringstidspunkt"\r
+    IDS_COUNTER_SIGN "Tellersymbol"\r
+    IDS_CHALLENGE_PASSWORD "Utfordre passord"\r
+    IDS_UNSTRUCTURED_ADDRESS "Ustrukturert adresse"\r
+    IDS_SMIME_CAPABILITIES "SMIME-evner"\r
+    IDS_PREFER_SIGNED_DATA "Fortrekk signert data"\r
+    IDS_CPS "CPS"\r
+    IDS_USER_NOTICE "Brukervarsel"\r
+    IDS_OCSP "On-line Certificate Status Protocol"\r
+    IDS_CA_ISSUER "Utsteder for sertifiseringsautoritet"\r
+    IDS_CERT_TEMPLATE_NAME "Navn på sertifiseringsmal"\r
+    IDS_CERT_TYPE "Sertifikattype"\r
+    IDS_CERT_MANIFOLD "Sertifikatmangfold"\r
+    IDS_NETSCAPE_CERT_TYPE "Netscape-sertifikattype"\r
+    IDS_NETSCAPE_BASE_URL "Netscape-basis-URL"\r
+    IDS_NETSCAPE_REVOCATION_URL "Netscape-tilbakekalling-URL"\r
+    IDS_NETSCAPE_CA_REVOCATION_URL "Netscape-CA-tilbakekalling-URLURL"\r
+    IDS_NETSCAPE_CERT_RENEWAL_URL "Netscape-sertifikatfornying-URL"\r
+    IDS_NETSCAPE_CA_POLICY_URL "Netscape-CA-politikk-URL"\r
+    IDS_NETSCAPE_SSL_SERVER_NAME "Netscape-SSL-tjenernavn"\r
+    IDS_NETSCAPE_COMMENT "Netscape-kommentar"\r
+    IDS_SPC_SP_AGENCY_INFO "SpcSpAgencyInfo"\r
+    IDS_SPC_FINANCIAL_CRITERIA "SpcFinancialCriteria"\r
+    IDS_SPC_MINIMAL_CRITERIA "SpcMinimalCriteria"\r
+    IDS_COUNTRY "Land/Region"\r
+    IDS_ORGANIZATION "Organisasjon"\r
+    IDS_ORGANIZATIONAL_UNIT "Organisasjonsell enhet"\r
+    IDS_COMMON_NAME "Vanlig navn"\r
+    IDS_LOCALITY "Lokalitet"\r
+    IDS_STATE_OR_PROVINCE "Fylke"\r
+    IDS_TITLE "Tittel"\r
+    IDS_GIVEN_NAME "Oppgitt navn"\r
+    IDS_INITIALS "Initialer"\r
+    IDS_SUR_NAME "Etternavn"\r
+    IDS_DOMAIN_COMPONENT "Domenekomponent"\r
+    IDS_STREET_ADDRESS "Gateadresse"\r
+    IDS_SERIAL_NUMBER "Serienummer"\r
+    IDS_CA_VERSION "CA-versjon"\r
+    IDS_CROSS_CA_VERSION "Kryss CA-versjon"\r
+    IDS_SERIALIZED_SIG_SERIAL_NUMBER "Serienummer for serialisert signatur"\r
+    IDS_PRINCIPAL_NAME "Hovednavn"\r
+    IDS_WINDOWS_PRODUCT_UPDATE "Windows-produktoppdatering"\r
+    IDS_ENROLLMENT_NAME_VALUE_PAIR "Innrullerings-navneverdipar"\r
+    IDS_OS_VERSION "OS-versjon"\r
+    IDS_ENROLLMENT_CSP "Innrullerings-CSP"\r
+    IDS_CRL_NUMBER "CRL-nummer"\r
+    IDS_DELTA_CRL_INDICATOR "Delta CRL-indikator"\r
+    IDS_ISSUING_DIST_POINT "Utsteder distribusjonspunkt"\r
+    IDS_FRESHEST_CRL "Nyeste CRL"\r
+    IDS_NAME_CONSTRAINTS "Navnebegrensninger"\r
+    IDS_POLICY_MAPPINGS "Framgangsmåtekartlegginger"\r
+    IDS_POLICY_CONSTRAINTS "Framgangsmåtebegresninger"\r
+    IDS_CROSS_CERT_DIST_POINTS "Distribusjonspunkter for kryss-sertifikat"\r
+    IDS_APPLICATION_POLICIES "Framgangsmåter for programmers"\r
+    IDS_APPLICATION_POLICY_MAPPINGS "Framgangsmåtekartlegginger for programmer"\r
+    IDS_APPLICATION_POLICY_CONSTRAINTS "Framgangsmåtebegrensninger for programmer"\r
+    IDS_CMC_DATA "CMC-data"\r
+    IDS_CMC_RESPONSE "CMS-svar"\r
+    IDS_UNSIGNED_CMC_REQUEST "Usignert CMC-forespørsel"\r
+    IDS_CMC_STATUS_INFO "CMC-statusinformasjon"\r
+    IDS_CMC_EXTENSIONS "CMC-utvidelser"\r
+    IDS_CMC_ATTRIBUTES "CMC-egenskaper"\r
+    IDS_PKCS_7_DATA "PKCS 7 Data"\r
+    IDS_PKCS_7_SIGNED "PKCS 7 Signert"\r
+    IDS_PKCS_7_ENVELOPED "PKCS 7 Innpakket"\r
+    IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signert Innpakket"\r
+    IDS_PKCS_7_DIGESTED "PKCS 7 Fordøyet"\r
+    IDS_PKCS_7_ENCRYPTED "PKCS 7 Kryptert"\r
+    IDS_PREVIOUS_CA_CERT_HASH "Forrige CA-sertifikatlappskaus"\r
+    IDS_CRL_VIRTUAL_BASE "Virtuelt basis-CRL-nummer"\r
+    IDS_CRL_NEXT_PUBLISH "Neste CRL-utgiving"\r
+    IDS_CA_EXCHANGE "CA-krypteringssertifikat"\r
+    IDS_KEY_RECOVERY_AGENT "Agent for nøkkelgjenoppretting"\r
+    IDS_CERTIFICATE_TEMPLATE "Informasjon om sertifikatmal"\r
+    IDS_ENTERPRISE_ROOT_OID "Storselskap-rot-OID"\r
+    IDS_RDN_DUMMY_SIGNER "Tullesignerer"\r
+    IDS_ARCHIVED_KEY_ATTR "Kryptert privat nøkkel"\r
+    IDS_CRL_SELF_CDP "Publisert CRL-plasseringer"\r
+    IDS_REQUIRE_CERT_CHAIN_POLICY "Håndhev sertifikatlenkepolitikk"\r
+    IDS_TRANSACTION_ID "Transaksjons-id"\r
+    IDS_SENDER_NONCE "Gjeldende sender"\r
+    IDS_RECIPIENT_NONCE "Gjeldende mottaker"\r
+    IDS_REG_INFO "Reg info"\r
+    IDS_GET_CERTIFICATE "Hent sertifikat"\r
+    IDS_GET_CRL "Hent CRL"\r
+    IDS_REVOKE_REQUEST "Gjenoppliv forespørsel"\r
+    IDS_QUERY_PENDING "Spørring venter"\r
+    IDS_SORTED_CTL "Tillitsliste for sertifikater"\r
+    IDS_ARCHIVED_KEY_CERT_HASH "Arkivert nøkkelsertifikatlappskaus"\r
+    IDS_PRIVATE_KEY_USAGE_PERIOD "Privat nøkkelbrukperiode"\r
+    IDS_CLIENT_INFORMATION "Klientinformasjon"\r
+    IDS_SERVER_AUTHENTICATION "Tjenerautentisering"\r
+    IDS_CLIENT_AUTHENTICATION "Klientautentisering"\r
+    IDS_CODE_SIGNING "Kodesignering"\r
+    IDS_SECURE_EMAIL "Sikker e-post"\r
+    IDS_TIME_STAMPING "Tidsstempling"\r
+    IDS_MICROSOFT_TRUST_LIST_SIGNING "Microsoft tillitslistesignering"\r
+    IDS_MICROSOFT_TIME_STAMPING "Microsoft tidsstempling"\r
+    IDS_IPSEC_END_SYSTEM "IP-sikkerhetsendesystem"\r
+    IDS_IPSEC_TUNNEL "IP-sikkerhetstunnel-terminering"\r
+    IDS_IPSEC_USER "IP-sikkerhetsbruker"\r
+    IDS_EFS "Krypterer filsystem"\r
+    IDS_WHQL_CRYPTO "Windows maskinvaredriver-godkjenning"\r
+    IDS_NT5_CRYPTO "Windows sytemkomponent-godkjenning"\r
+    IDS_OEM_WHQL_CRYPTO "OEM Windows systemkomponent-godkjenning"\r
+    IDS_EMBEDDED_NT_CRYPTO "Innebygget Windows systemkomponent-godkjenning"\r
+    IDS_KEY_PACK_LICENSES "Nøkkelpakkelisenser"\r
+    IDS_LICENSE_SERVER "Lisenstjener-verifisering"\r
+    IDS_SMART_CARD_LOGON "Smart Card-pålogging"\r
+    IDS_DIGITAL_RIGHTS "Digitale rettigheter"\r
+    IDS_QUALIFIED_SUBORDINATION "Kvalifisert underordinering"\r
+    IDS_KEY_RECOVERY "Nøkkelgjenoppretting"\r
+    IDS_DOCUMENT_SIGNING "Dokumentsignering"\r
+    IDS_IPSEC_IKE_INTERMEDIATE "IP-sikkerhet IKE viderekommen"\r
+    IDS_FILE_RECOVERY "Filgjenoppretting"\r
+    IDS_ROOT_LIST_SIGNER "Rotlistesignerer"\r
+    IDS_ANY_APPLICATION_POLICIES "Alle framgangsmåter for programmer"\r
+    IDS_DS_EMAIL_REPLICATION "Katalogtjeneste e-postreplikering"\r
+    IDS_ENROLLMENT_AGENT "Agent for sertifikatforespørsler"\r
+    IDS_LIFETIME_SIGNING "Livstidsignering"\r
+    IDS_ANY_CERT_POLICY "Alle framgangsmåter for utsteding"\r
+}\r
index 1bf5f6f..25c41e4 100644 (file)
 #ifndef __CRYPT32_PRIVATE_H__
 #define __CRYPT32_PRIVATE_H__
 
+/* The following aren't defined in wincrypt.h, as they're "reserved" */
+#define CERT_CERT_PROP_ID 32
+#define CERT_CRL_PROP_ID  33
+#define CERT_CTL_PROP_ID  34
+
 /* Returns a handle to the default crypto provider; loads it if necessary.
  * Returns NULL on failure.
  */
 HCRYPTPROV CRYPT_GetDefaultProvider(void);
 
-void CRYPT_InitFunctionSets(void);
-void CRYPT_FreeFunctionSets(void);
+void crypt_oid_init(HINSTANCE hinst);
+void crypt_oid_free(void);
+
+/* Helper function for store reading functions and
+ * CertAddSerializedElementToStore.  Returns a context of the appropriate type
+ * if it can, or NULL otherwise.  Doesn't validate any of the properties in
+ * the serialized context (for example, bad hashes are retained.)
+ * *pdwContentType is set to the type of the returned context.
+ */
+const void *CRYPT_ReadSerializedElement(const BYTE *pbElement,
+ DWORD cbElement, DWORD dwContextTypeFlags, DWORD *pdwContentType);
+
+/**
+ *  Context property list functions
+ */
+struct _CONTEXT_PROPERTY_LIST;
+typedef struct _CONTEXT_PROPERTY_LIST *PCONTEXT_PROPERTY_LIST;
+
+PCONTEXT_PROPERTY_LIST ContextPropertyList_Create(void);
+
+/* Searches for the property with ID id in the context.  Returns TRUE if found,
+ * and copies the property's length and a pointer to its data to blob.
+ * Otherwise returns FALSE.
+ */
+BOOL ContextPropertyList_FindProperty(PCONTEXT_PROPERTY_LIST list, DWORD id,
+ PCRYPT_DATA_BLOB blob);
+
+BOOL ContextPropertyList_SetProperty(PCONTEXT_PROPERTY_LIST list, DWORD id,
+ const BYTE *pbData, size_t cbData);
+
+void ContextPropertyList_RemoveProperty(PCONTEXT_PROPERTY_LIST list, DWORD id);
+
+DWORD ContextPropertyList_EnumPropIDs(PCONTEXT_PROPERTY_LIST list, DWORD id);
+
+void ContextPropertyList_Copy(PCONTEXT_PROPERTY_LIST to,
+ PCONTEXT_PROPERTY_LIST from);
+
+void ContextPropertyList_Free(PCONTEXT_PROPERTY_LIST list);
 
 #endif
diff --git a/reactos/dll/win32/crypt32/cryptres.h b/reactos/dll/win32/crypt32/cryptres.h
new file mode 100644 (file)
index 0000000..445be22
--- /dev/null
@@ -0,0 +1,163 @@
+/*\r
+ * Copyright 2006 Juan Lang\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ */\r
+#ifndef __WINE_CRYPTRES_H__\r
+#define __WINE_CRYPTRES_H__\r
+\r
+#define IDS_AUTHORITY_KEY_ID 1000\r
+#define IDS_KEY_ATTRIBUTES 1001\r
+#define IDS_KEY_USAGE_RESTRICTION 1002\r
+#define IDS_SUBJECT_ALT_NAME 1003\r
+#define IDS_ISSUER_ALT_NAME 1004\r
+#define IDS_BASIC_CONSTRAINTS 1005\r
+#define IDS_KEY_USAGE 1006\r
+#define IDS_CERT_POLICIES 1007\r
+#define IDS_SUBJECT_KEY_IDENTIFIER 1008\r
+#define IDS_CRL_REASON_CODE 1009\r
+#define IDS_CRL_DIST_POINTS 1010\r
+#define IDS_ENHANCED_KEY_USAGE 1011\r
+#define IDS_AUTHORITY_INFO_ACCESS 1012\r
+#define IDS_CERT_EXTENSIONS 1013\r
+#define IDS_NEXT_UPDATE_LOCATION 1014\r
+#define IDS_YES_OR_NO_TRUST 1015\r
+#define IDS_EMAIL_ADDRESS 1016\r
+#define IDS_UNSTRUCTURED_NAME 1017\r
+#define IDS_CONTENT_TYPE 1018\r
+#define IDS_MESSAGE_DIGEST 1019\r
+#define IDS_SIGNING_TIME 1020\r
+#define IDS_COUNTER_SIGN 1021\r
+#define IDS_CHALLENGE_PASSWORD 1022\r
+#define IDS_UNSTRUCTURED_ADDRESS 1023\r
+#define IDS_SMIME_CAPABILITIES 1024\r
+#define IDS_PREFER_SIGNED_DATA 1025\r
+#define IDS_CPS 1026\r
+#define IDS_USER_NOTICE 1027\r
+#define IDS_OCSP 1028\r
+#define IDS_CA_ISSUER 1029\r
+#define IDS_CERT_TEMPLATE_NAME 1030\r
+#define IDS_CERT_TYPE 1031\r
+#define IDS_CERT_MANIFOLD 1032\r
+#define IDS_NETSCAPE_CERT_TYPE 1033\r
+#define IDS_NETSCAPE_BASE_URL 1034\r
+#define IDS_NETSCAPE_REVOCATION_URL 1035\r
+#define IDS_NETSCAPE_CA_REVOCATION_URL 1036\r
+#define IDS_NETSCAPE_CERT_RENEWAL_URL 1037\r
+#define IDS_NETSCAPE_CA_POLICY_URL 1038\r
+#define IDS_NETSCAPE_SSL_SERVER_NAME 1039\r
+#define IDS_NETSCAPE_COMMENT 1040\r
+#define IDS_SPC_SP_AGENCY_INFO 1041\r
+#define IDS_SPC_FINANCIAL_CRITERIA 1042\r
+#define IDS_SPC_MINIMAL_CRITERIA 1043\r
+#define IDS_COUNTRY 1044\r
+#define IDS_ORGANIZATION 1045\r
+#define IDS_ORGANIZATIONAL_UNIT 1046\r
+#define IDS_COMMON_NAME 1047\r
+#define IDS_LOCALITY 1048\r
+#define IDS_STATE_OR_PROVINCE 1049\r
+#define IDS_TITLE 1050\r
+#define IDS_GIVEN_NAME 1051\r
+#define IDS_INITIALS 1052\r
+#define IDS_SUR_NAME 1053\r
+#define IDS_DOMAIN_COMPONENT 1054\r
+#define IDS_STREET_ADDRESS 1055\r
+#define IDS_SERIAL_NUMBER 1056\r
+#define IDS_CA_VERSION 1057\r
+#define IDS_CROSS_CA_VERSION 1058\r
+#define IDS_SERIALIZED_SIG_SERIAL_NUMBER 1059\r
+#define IDS_PRINCIPAL_NAME 1060\r
+#define IDS_WINDOWS_PRODUCT_UPDATE 1061\r
+#define IDS_ENROLLMENT_NAME_VALUE_PAIR 1062\r
+#define IDS_OS_VERSION 1063\r
+#define IDS_ENROLLMENT_CSP 1064\r
+#define IDS_CRL_NUMBER 1065\r
+#define IDS_DELTA_CRL_INDICATOR 1066\r
+#define IDS_ISSUING_DIST_POINT 1067\r
+#define IDS_FRESHEST_CRL 1068\r
+#define IDS_NAME_CONSTRAINTS 1069\r
+#define IDS_POLICY_MAPPINGS 1070\r
+#define IDS_POLICY_CONSTRAINTS 1071\r
+#define IDS_CROSS_CERT_DIST_POINTS 1072\r
+#define IDS_APPLICATION_POLICIES 1073\r
+#define IDS_APPLICATION_POLICY_MAPPINGS 1074\r
+#define IDS_APPLICATION_POLICY_CONSTRAINTS 1075\r
+#define IDS_CMC_DATA 1076\r
+#define IDS_CMC_RESPONSE 1077\r
+#define IDS_UNSIGNED_CMC_REQUEST 1078\r
+#define IDS_CMC_STATUS_INFO 1079\r
+#define IDS_CMC_EXTENSIONS 1080\r
+#define IDS_CMC_ATTRIBUTES 1081\r
+#define IDS_PKCS_7_DATA 1082\r
+#define IDS_PKCS_7_SIGNED 1083\r
+#define IDS_PKCS_7_ENVELOPED 1084\r
+#define IDS_PKCS_7_SIGNED_ENVELOPED 1085\r
+#define IDS_PKCS_7_DIGESTED 1086\r
+#define IDS_PKCS_7_ENCRYPTED 1087\r
+#define IDS_PREVIOUS_CA_CERT_HASH 1088\r
+#define IDS_CRL_VIRTUAL_BASE 1089\r
+#define IDS_CRL_NEXT_PUBLISH 1090\r
+#define IDS_CA_EXCHANGE 1091\r
+#define IDS_KEY_RECOVERY_AGENT 1092\r
+#define IDS_CERTIFICATE_TEMPLATE 1093\r
+#define IDS_ENTERPRISE_ROOT_OID 1094\r
+#define IDS_RDN_DUMMY_SIGNER 1095\r
+#define IDS_ARCHIVED_KEY_ATTR 1096\r
+#define IDS_CRL_SELF_CDP 1097\r
+#define IDS_REQUIRE_CERT_CHAIN_POLICY 1098\r
+#define IDS_TRANSACTION_ID 1099\r
+#define IDS_SENDER_NONCE 1100\r
+#define IDS_RECIPIENT_NONCE 1101\r
+#define IDS_REG_INFO 1102\r
+#define IDS_GET_CERTIFICATE 1103\r
+#define IDS_GET_CRL 1104\r
+#define IDS_REVOKE_REQUEST 1105\r
+#define IDS_QUERY_PENDING 1106\r
+#define IDS_SORTED_CTL 1107\r
+#define IDS_ARCHIVED_KEY_CERT_HASH 1108\r
+#define IDS_PRIVATE_KEY_USAGE_PERIOD 1109\r
+#define IDS_CLIENT_INFORMATION 1110\r
+#define IDS_SERVER_AUTHENTICATION 1111\r
+#define IDS_CLIENT_AUTHENTICATION 1112\r
+#define IDS_CODE_SIGNING 1113\r
+#define IDS_SECURE_EMAIL 1114\r
+#define IDS_TIME_STAMPING 1115\r
+#define IDS_MICROSOFT_TRUST_LIST_SIGNING 1116\r
+#define IDS_MICROSOFT_TIME_STAMPING 1117\r
+#define IDS_IPSEC_END_SYSTEM 1118\r
+#define IDS_IPSEC_TUNNEL 1119\r
+#define IDS_IPSEC_USER 1120\r
+#define IDS_EFS 1121\r
+#define IDS_WHQL_CRYPTO 1122\r
+#define IDS_NT5_CRYPTO 1123\r
+#define IDS_OEM_WHQL_CRYPTO 1124\r
+#define IDS_EMBEDDED_NT_CRYPTO 1125\r
+#define IDS_KEY_PACK_LICENSES 1126\r
+#define IDS_LICENSE_SERVER 1127\r
+#define IDS_SMART_CARD_LOGON 1128\r
+#define IDS_DIGITAL_RIGHTS 1129\r
+#define IDS_QUALIFIED_SUBORDINATION 1130\r
+#define IDS_KEY_RECOVERY 1131\r
+#define IDS_DOCUMENT_SIGNING 1132\r
+#define IDS_IPSEC_IKE_INTERMEDIATE 1133\r
+#define IDS_FILE_RECOVERY 1134\r
+#define IDS_ROOT_LIST_SIGNER 1135\r
+#define IDS_ANY_APPLICATION_POLICIES 1136\r
+#define IDS_DS_EMAIL_REPLICATION 1137\r
+#define IDS_ENROLLMENT_AGENT 1138\r
+#define IDS_LIFETIME_SIGNING 1139\r
+#define IDS_ANY_CERT_POLICY 1140\r
+\r
+#endif /* ndef __WINE_CRYPTRES_H__ */\r
index 25f854e..d04f747 100644 (file)
  * MSDN, especially:
  * http://msdn.microsoft.com/library/en-us/seccrypto/security/constants_for_cryptencodeobject_and_cryptdecodeobject.asp
  */
+
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
+struct GenericArray
+{
+    DWORD cItems;
+    BYTE *rgItems;
+};
+
 typedef BOOL (WINAPI *CryptEncodeObjectFunc)(DWORD, LPCSTR, const void *,
  BYTE *, DWORD *);
 typedef BOOL (WINAPI *CryptEncodeObjectExFunc)(DWORD, LPCSTR, const void *,
@@ -80,10 +90,6 @@ typedef BOOL (WINAPI *CryptDecodeObjectExFunc)(DWORD, LPCSTR, const BYTE *,
  * built-in functions, but the parameters are retained to simplify
  * CryptEncodeObjectEx/CryptDecodeObjectEx, since they must call functions in
  * external DLLs that follow these signatures.
- * FIXME: some built-in functions are suitable to be called directly by
- * CryptEncodeObjectEx/CryptDecodeObjectEx (they implement exception handling
- * and memory allocation if requested), others are only suitable to be called
- * internally.  Comment which are which.
  */
 static BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
@@ -91,6 +97,9 @@ static BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType,
 static BOOL WINAPI CRYPT_AsnEncodeExtensions(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
  PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded);
+static BOOL WINAPI CRYPT_AsnEncodeSequenceOfAny(DWORD dwCertEncodingType,
+ LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
+ PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded);
 static BOOL WINAPI CRYPT_AsnEncodeBool(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
  PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded);
@@ -122,7 +131,7 @@ static BOOL WINAPI CRYPT_AsnEncodeChoiceOfTime(DWORD dwCertEncodingType,
 static BOOL WINAPI CRYPT_AsnDecodeChoiceOfTime(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
  PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo);
-static BOOL WINAPI CRYPT_AsnDecodePubKeyInfo(DWORD dwCertEncodingType,
+static BOOL WINAPI CRYPT_AsnDecodePubKeyInfoInternal(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
  PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo);
 /* Like CRYPT_AsnDecodeExtensions, except assumes rgExtension is set ahead of
@@ -1442,6 +1451,46 @@ static BOOL WINAPI CRYPT_AsnEncodeAltName(DWORD dwCertEncodingType,
     return ret;
 }
 
+static BOOL WINAPI CRYPT_AsnEncodeBasicConstraints(DWORD dwCertEncodingType,
+ LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
+ PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded)
+{
+    BOOL ret;
+
+    __TRY
+    {
+        const CERT_BASIC_CONSTRAINTS_INFO *info =
+         (const CERT_BASIC_CONSTRAINTS_INFO *)pvStructInfo;
+        struct AsnEncodeSequenceItem items[3] = {
+         { &info->SubjectType, CRYPT_AsnEncodeBits, 0 },
+         { 0 }
+        };
+        DWORD cItem = 1;
+
+        if (info->fPathLenConstraint)
+        {
+            items[cItem].pvStructInfo = &info->dwPathLenConstraint;
+            items[cItem].encodeFunc = CRYPT_AsnEncodeInt;
+            cItem++;
+        }
+        if (info->cSubtreesConstraint)
+        {
+            items[cItem].pvStructInfo = &info->cSubtreesConstraint;
+            items[cItem].encodeFunc = CRYPT_AsnEncodeSequenceOfAny;
+            cItem++;
+        }
+        ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem,
+         dwFlags, pEncodePara, pbEncoded, pcbEncoded);
+    }
+    __EXCEPT_PAGE_FAULT
+    {
+        SetLastError(STATUS_ACCESS_VIOLATION);
+        ret = FALSE;
+    }
+    __ENDTRY
+    return ret;
+}
+
 static BOOL WINAPI CRYPT_AsnEncodeBasicConstraints2(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
  PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded)
@@ -2191,6 +2240,70 @@ static BOOL WINAPI CRYPT_AsnEncodeCRLDistPoints(DWORD dwCertEncodingType,
     return ret;
 }
 
+static BOOL WINAPI CRYPT_AsnEncodeEnhancedKeyUsage(DWORD dwCertEncodingType,
+ LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
+ PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded)
+{
+    BOOL ret;
+
+    __TRY
+    {
+        const CERT_ENHKEY_USAGE *usage =
+         (const CERT_ENHKEY_USAGE *)pvStructInfo;
+        DWORD bytesNeeded = 0, lenBytes, size, i;
+
+        ret = TRUE;
+        for (i = 0; ret && i < usage->cUsageIdentifier; i++)
+        {
+            ret = CRYPT_AsnEncodeOid(dwCertEncodingType, NULL,
+             usage->rgpszUsageIdentifier[i],
+             dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, NULL, &size);
+            if (ret)
+                bytesNeeded += size;
+        }
+        CRYPT_EncodeLen(bytesNeeded, NULL, &lenBytes);
+        bytesNeeded += 1 + lenBytes;
+        if (ret)
+        {
+            if (!pbEncoded)
+                *pcbEncoded = bytesNeeded;
+            else
+            {
+                if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara,
+                 pbEncoded, pcbEncoded, bytesNeeded)))
+                {
+                    if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG)
+                        pbEncoded = *(BYTE **)pbEncoded;
+                    *pbEncoded++ = ASN_SEQUENCEOF;
+                    CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded,
+                     &lenBytes);
+                    pbEncoded += lenBytes;
+                    for (i = 0; ret && i < usage->cUsageIdentifier; i++)
+                    {
+                        size = bytesNeeded;
+                        ret = CRYPT_AsnEncodeOid(dwCertEncodingType, NULL,
+                         usage->rgpszUsageIdentifier[i],
+                         dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, pbEncoded,
+                         &size);
+                        if (ret)
+                        {
+                            pbEncoded += size;
+                            bytesNeeded -= size;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    __EXCEPT_PAGE_FAULT
+    {
+        SetLastError(STATUS_ACCESS_VIOLATION);
+        ret = FALSE;
+    }
+    __ENDTRY
+    return ret;
+}
+
 BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
  const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara,
  void *pvEncoded, DWORD *pcbEncoded)
@@ -2244,6 +2357,9 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
         case (WORD)X509_ALTERNATE_NAME:
             encodeFunc = CRYPT_AsnEncodeAltName;
             break;
+        case (WORD)X509_BASIC_CONSTRAINTS:
+            encodeFunc = CRYPT_AsnEncodeBasicConstraints;
+            break;
         case (WORD)X509_BASIC_CONSTRAINTS2:
             encodeFunc = CRYPT_AsnEncodeBasicConstraints2;
             break;
@@ -2281,6 +2397,9 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
         case (WORD)X509_CRL_DIST_POINTS:
             encodeFunc = CRYPT_AsnEncodeCRLDistPoints;
             break;
+        case (WORD)X509_ENHANCED_KEY_USAGE:
+            encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage;
+            break;
         default:
             FIXME("%d: unimplemented\n", LOWORD(lpszStructType));
         }
@@ -2295,6 +2414,8 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
         encodeFunc = CRYPT_AsnEncodeBits;
     else if (!strcmp(lpszStructType, szOID_SUBJECT_KEY_IDENTIFIER))
         encodeFunc = CRYPT_AsnEncodeOctets;
+    else if (!strcmp(lpszStructType, szOID_BASIC_CONSTRAINTS))
+        encodeFunc = CRYPT_AsnEncodeBasicConstraints;
     else if (!strcmp(lpszStructType, szOID_BASIC_CONSTRAINTS2))
         encodeFunc = CRYPT_AsnEncodeBasicConstraints2;
     else if (!strcmp(lpszStructType, szOID_ISSUER_ALT_NAME))
@@ -2307,6 +2428,10 @@ BOOL WINAPI CryptEncodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
         encodeFunc = CRYPT_AsnEncodeAltName;
     else if (!strcmp(lpszStructType, szOID_SUBJECT_ALT_NAME2))
         encodeFunc = CRYPT_AsnEncodeAltName;
+    else if (!strcmp(lpszStructType, szOID_CRL_DIST_POINTS))
+        encodeFunc = CRYPT_AsnEncodeCRLDistPoints;
+    else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE))
+        encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage;
     else
         TRACE("OID %s not found or unimplemented, looking for DLL\n",
          debugstr_a(lpszStructType));
@@ -2704,12 +2829,6 @@ struct AsnArrayItemSize
     DWORD size;
 };
 
-struct GenericArray
-{
-    DWORD cItems;
-    BYTE *rgItems;
-};
-
 /* Decodes an array of like types into a struct GenericArray.
  * The layout and decoding of the array are described by a struct
  * AsnArrayDescriptor.
@@ -3063,12 +3182,9 @@ static BOOL WINAPI CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType,
          { 0, offsetof(CERT_INFO, Subject), CRYPT_AsnDecodeDerBlob,
            sizeof(CRYPT_DER_BLOB), FALSE, TRUE, offsetof(CERT_INFO,
            Subject.pbData) },
-         /* jil FIXME: shouldn't this have an internal version, which expects
-          * the pbData to be set?
-          */
          { ASN_SEQUENCEOF, offsetof(CERT_INFO, SubjectPublicKeyInfo),
-           CRYPT_AsnDecodePubKeyInfo, sizeof(CERT_PUBLIC_KEY_INFO), FALSE,
-           TRUE, offsetof(CERT_INFO,
+           CRYPT_AsnDecodePubKeyInfoInternal, sizeof(CERT_PUBLIC_KEY_INFO),
+           FALSE, TRUE, offsetof(CERT_INFO,
            SubjectPublicKeyInfo.Algorithm.Parameters.pbData), 0 },
          { ASN_BITSTRING, offsetof(CERT_INFO, IssuerUniqueId),
            CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), TRUE, TRUE,
@@ -3554,8 +3670,11 @@ static BOOL WINAPI CRYPT_AsnDecodeRdnAttr(DWORD dwCertEncodingType,
          sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, NULL,
          attr, pcbStructInfo, attr ? attr->pszObjId : NULL);
         if (attr)
+        {
             TRACE("attr->pszObjId is %p (%s)\n", attr->pszObjId,
              debugstr_a(attr->pszObjId));
+            TRACE("attr->dwValueType is %ld\n", attr->dwValueType);
+        }
         TRACE("returning %d (%08lx)\n", ret, GetLastError());
     }
     __EXCEPT_PAGE_FAULT
@@ -3578,9 +3697,10 @@ static BOOL WINAPI CRYPT_AsnDecodeRdn(DWORD dwCertEncodingType,
         struct AsnArrayDescriptor arrayDesc = { ASN_CONSTRUCTOR | ASN_SETOF,
          CRYPT_AsnDecodeRdnAttr, sizeof(CERT_RDN_ATTR), TRUE,
          offsetof(CERT_RDN_ATTR, pszObjId) };
+        PCERT_RDN rdn = (PCERT_RDN)pvStructInfo;
 
         ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags,
-         pDecodePara, pvStructInfo, pcbStructInfo, NULL);
+         pDecodePara, pvStructInfo, pcbStructInfo, rdn ? rdn->rgRDNAttr : NULL);
     }
     __EXCEPT_PAGE_FAULT
     {
@@ -3682,6 +3802,29 @@ static BOOL WINAPI CRYPT_AsnDecodeAlgorithmId(DWORD dwCertEncodingType,
     return ret;
 }
 
+static BOOL WINAPI CRYPT_AsnDecodePubKeyInfoInternal(DWORD dwCertEncodingType,
+ LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
+ PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo)
+{
+    BOOL ret = TRUE;
+    struct AsnDecodeSequenceItem items[] = {
+     { ASN_SEQUENCEOF, offsetof(CERT_PUBLIC_KEY_INFO, Algorithm),
+       CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER),
+       FALSE, TRUE, offsetof(CERT_PUBLIC_KEY_INFO,
+       Algorithm.pszObjId) },
+     { ASN_BITSTRING, offsetof(CERT_PUBLIC_KEY_INFO, PublicKey),
+       CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), FALSE, TRUE,
+       offsetof(CERT_PUBLIC_KEY_INFO, PublicKey.pbData) },
+    };
+    PCERT_PUBLIC_KEY_INFO info = (PCERT_PUBLIC_KEY_INFO)pvStructInfo;
+
+    ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items,
+     sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags,
+     pDecodePara, pvStructInfo, pcbStructInfo, info ?
+     info->Algorithm.Parameters.pbData : NULL);
+    return ret;
+}
+
 static BOOL WINAPI CRYPT_AsnDecodePubKeyInfo(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
  PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo)
@@ -3690,19 +3833,30 @@ static BOOL WINAPI CRYPT_AsnDecodePubKeyInfo(DWORD dwCertEncodingType,
 
     __TRY
     {
-        struct AsnDecodeSequenceItem items[] = {
-         { ASN_SEQUENCEOF, offsetof(CERT_PUBLIC_KEY_INFO, Algorithm),
-           CRYPT_AsnDecodeAlgorithmId, sizeof(CRYPT_ALGORITHM_IDENTIFIER),
-           FALSE, TRUE, offsetof(CERT_PUBLIC_KEY_INFO,
-           Algorithm.pszObjId) },
-         { ASN_BITSTRING, offsetof(CERT_PUBLIC_KEY_INFO, PublicKey),
-           CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), FALSE, TRUE,
-           offsetof(CERT_PUBLIC_KEY_INFO, PublicKey.pbData) },
-        };
+        DWORD bytesNeeded;
 
-        ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items,
-         sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags,
-         pDecodePara, pvStructInfo, pcbStructInfo, NULL);
+        if ((ret = CRYPT_AsnDecodePubKeyInfoInternal(dwCertEncodingType,
+         lpszStructType, pbEncoded, cbEncoded,
+         dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, &bytesNeeded)))
+        {
+            if (!pvStructInfo)
+                *pcbStructInfo = bytesNeeded;
+            else if ((ret = CRYPT_DecodeEnsureSpace(dwFlags, pDecodePara,
+             pvStructInfo, pcbStructInfo, bytesNeeded)))
+            {
+                PCERT_PUBLIC_KEY_INFO info;
+
+                if (dwFlags & CRYPT_DECODE_ALLOC_FLAG)
+                    pvStructInfo = *(BYTE **)pvStructInfo;
+                info = (PCERT_PUBLIC_KEY_INFO)pvStructInfo;
+                info->Algorithm.Parameters.pbData = (BYTE *)pvStructInfo +
+                 sizeof(CERT_PUBLIC_KEY_INFO);
+                ret = CRYPT_AsnDecodePubKeyInfoInternal(dwCertEncodingType,
+                 lpszStructType, pbEncoded, cbEncoded,
+                 dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, pvStructInfo,
+                 &bytesNeeded);
+            }
+        }
     }
     __EXCEPT_PAGE_FAULT
     {
@@ -3958,6 +4112,60 @@ static BOOL WINAPI CRYPT_AsnDecodePathLenConstraint(DWORD dwCertEncodingType,
     return ret;
 }
 
+static BOOL WINAPI CRYPT_AsnDecodeSubtreeConstraints(DWORD dwCertEncodingType,
+ LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
+ PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo)
+{
+    BOOL ret;
+    struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF,
+     CRYPT_AsnDecodeCopyBytes, sizeof(CERT_NAME_BLOB), TRUE,
+     offsetof(CERT_NAME_BLOB, pbData) };
+    struct GenericArray *entries = (struct GenericArray *)pvStructInfo;
+
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
+     pDecodePara, pvStructInfo, *pcbStructInfo);
+
+    ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags,
+     pDecodePara, pvStructInfo, pcbStructInfo,
+     entries ? entries->rgItems : NULL);
+    TRACE("Returning %d (%08lx)\n", ret, GetLastError());
+    return ret;
+}
+
+static BOOL WINAPI CRYPT_AsnDecodeBasicConstraints(DWORD dwCertEncodingType,
+ LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
+ PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo)
+{
+    BOOL ret;
+
+    __TRY
+    {
+        struct AsnDecodeSequenceItem items[] = {
+         { ASN_BITSTRING, offsetof(CERT_BASIC_CONSTRAINTS_INFO, SubjectType),
+           CRYPT_AsnDecodeBitsInternal, sizeof(CRYPT_BIT_BLOB), FALSE, TRUE, 
+           offsetof(CERT_BASIC_CONSTRAINTS_INFO, SubjectType.pbData), 0 },
+         { ASN_INTEGER, offsetof(CERT_BASIC_CONSTRAINTS_INFO,
+           fPathLenConstraint), CRYPT_AsnDecodePathLenConstraint,
+           sizeof(struct PATH_LEN_CONSTRAINT), TRUE, FALSE, 0, 0 },
+         { ASN_SEQUENCEOF, offsetof(CERT_BASIC_CONSTRAINTS_INFO,
+           cSubtreesConstraint), CRYPT_AsnDecodeSubtreeConstraints,
+           sizeof(struct GenericArray), TRUE, TRUE,
+           offsetof(CERT_BASIC_CONSTRAINTS_INFO, rgSubtreesConstraint), 0 },
+        };
+
+        ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items,
+         sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags,
+         pDecodePara, pvStructInfo, pcbStructInfo, NULL);
+    }
+    __EXCEPT_PAGE_FAULT
+    {
+        SetLastError(STATUS_ACCESS_VIOLATION);
+        ret = FALSE;
+    }
+    __ENDTRY
+    return ret;
+}
+
 static BOOL WINAPI CRYPT_AsnDecodeBasicConstraints2(DWORD dwCertEncodingType,
  LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
  PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo)
@@ -5043,6 +5251,32 @@ static BOOL WINAPI CRYPT_AsnDecodeCRLDistPoints(DWORD dwCertEncodingType,
     return ret;
 }
 
+static BOOL WINAPI CRYPT_AsnDecodeEnhancedKeyUsage(DWORD dwCertEncodingType,
+ LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
+ PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo)
+{
+    BOOL ret;
+
+    TRACE("%p, %ld, %08lx, %p, %p, %ld\n", pbEncoded, cbEncoded, dwFlags,
+     pDecodePara, pvStructInfo, *pcbStructInfo);
+
+    __TRY
+    {
+        struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF,
+         CRYPT_AsnDecodeOidWrapper, sizeof(LPSTR), TRUE, 0 };
+
+        ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags,
+         pDecodePara, pvStructInfo, pcbStructInfo, NULL);
+    }
+    __EXCEPT_PAGE_FAULT
+    {
+        SetLastError(STATUS_ACCESS_VIOLATION);
+        ret = FALSE;
+    }
+    __ENDTRY
+    return ret;
+}
+
 BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
  const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags,
  PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo)
@@ -5106,6 +5340,9 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
         case (WORD)X509_ALTERNATE_NAME:
             decodeFunc = CRYPT_AsnDecodeAltName;
             break;
+        case (WORD)X509_BASIC_CONSTRAINTS:
+            decodeFunc = CRYPT_AsnDecodeBasicConstraints;
+            break;
         case (WORD)X509_BASIC_CONSTRAINTS2:
             decodeFunc = CRYPT_AsnDecodeBasicConstraints2;
             break;
@@ -5143,6 +5380,9 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
         case (WORD)X509_CRL_DIST_POINTS:
             decodeFunc = CRYPT_AsnDecodeCRLDistPoints;
             break;
+        case (WORD)X509_ENHANCED_KEY_USAGE:
+            decodeFunc = CRYPT_AsnDecodeEnhancedKeyUsage;
+            break;
         default:
             FIXME("%d: unimplemented\n", LOWORD(lpszStructType));
         }
@@ -5157,6 +5397,8 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
         decodeFunc = CRYPT_AsnDecodeBits;
     else if (!strcmp(lpszStructType, szOID_SUBJECT_KEY_IDENTIFIER))
         decodeFunc = CRYPT_AsnDecodeOctets;
+    else if (!strcmp(lpszStructType, szOID_BASIC_CONSTRAINTS))
+        decodeFunc = CRYPT_AsnDecodeBasicConstraints;
     else if (!strcmp(lpszStructType, szOID_BASIC_CONSTRAINTS2))
         decodeFunc = CRYPT_AsnDecodeBasicConstraints2;
     else if (!strcmp(lpszStructType, szOID_ISSUER_ALT_NAME))
@@ -5169,6 +5411,10 @@ BOOL WINAPI CryptDecodeObjectEx(DWORD dwCertEncodingType, LPCSTR lpszStructType,
         decodeFunc = CRYPT_AsnDecodeAltName;
     else if (!strcmp(lpszStructType, szOID_SUBJECT_ALT_NAME2))
         decodeFunc = CRYPT_AsnDecodeAltName;
+    else if (!strcmp(lpszStructType, szOID_CRL_DIST_POINTS))
+        decodeFunc = CRYPT_AsnDecodeCRLDistPoints;
+    else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE))
+        decodeFunc = CRYPT_AsnDecodeEnhancedKeyUsage;
     else
         TRACE("OID %s not found or unimplemented, looking for DLL\n",
          debugstr_a(lpszStructType));
index df30206..5f31e6f 100644 (file)
@@ -39,10 +39,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved)
     switch (fdwReason)
     {
         case DLL_PROCESS_ATTACH:
-            CRYPT_InitFunctionSets();
+            DisableThreadLibraryCalls(hInstance);
+            crypt_oid_init(hInstance);
             break;
         case DLL_PROCESS_DETACH:
-            CRYPT_FreeFunctionSets();
+            crypt_oid_free();
             if (hDefProv) CryptReleaseContext(hDefProv, 0);
             break;
     }
@@ -217,96 +218,6 @@ BOOL WINAPI CryptSIPLoad
     return FALSE;
 }
 
-struct OIDToAlgID
-{
-    LPCSTR oid;
-    DWORD algID;
-};
-
-static const struct OIDToAlgID oidToAlgID[] = {
- { szOID_RSA_RSA, CALG_RSA_KEYX },
- { szOID_RSA_MD2RSA, CALG_MD2 },
- { szOID_RSA_MD4RSA, CALG_MD4 },
- { szOID_RSA_MD5RSA, CALG_MD5 },
- { szOID_RSA_SHA1RSA, CALG_SHA },
- { szOID_RSA_DH, CALG_DH_SF },
- { szOID_RSA_SMIMEalgESDH, CALG_DH_EPHEM },
- { szOID_RSA_SMIMEalgCMS3DESwrap, CALG_3DES },
- { szOID_RSA_SMIMEalgCMSRC2wrap, CALG_RC2 },
- { szOID_RSA_MD2, CALG_MD2 },
- { szOID_RSA_MD4, CALG_MD4 },
- { szOID_RSA_MD5, CALG_MD5 },
- { szOID_RSA_RC2CBC, CALG_RC2 },
- { szOID_RSA_RC4, CALG_RC4 },
- { szOID_RSA_DES_EDE3_CBC, CALG_3DES },
- { szOID_ANSI_X942_DH, CALG_DH_SF },
- { szOID_X957_DSA, CALG_DSS_SIGN },
- { szOID_X957_SHA1DSA, CALG_SHA },
- { szOID_OIWSEC_md4RSA, CALG_MD4 },
- { szOID_OIWSEC_md5RSA, CALG_MD5 },
- { szOID_OIWSEC_md4RSA2, CALG_MD4 },
- { szOID_OIWSEC_desCBC, CALG_DES },
- { szOID_OIWSEC_dsa, CALG_DSS_SIGN },
- { szOID_OIWSEC_shaDSA, CALG_SHA },
- { szOID_OIWSEC_shaRSA, CALG_SHA },
- { szOID_OIWSEC_sha, CALG_SHA },
- { szOID_OIWSEC_rsaXchg, CALG_RSA_KEYX },
- { szOID_OIWSEC_sha1, CALG_SHA },
- { szOID_OIWSEC_dsaSHA1, CALG_SHA },
- { szOID_OIWSEC_sha1RSASign, CALG_SHA },
- { szOID_OIWDIR_md2RSA, CALG_MD2 },
- { szOID_INFOSEC_mosaicUpdatedSig, CALG_SHA },
- { szOID_INFOSEC_mosaicKMandUpdSig, CALG_DSS_SIGN },
-};
-
-LPCSTR WINAPI CertAlgIdToOID(DWORD dwAlgId)
-{
-    switch (dwAlgId)
-    {
-    case CALG_RSA_KEYX:
-        return szOID_RSA_RSA;
-    case CALG_DH_EPHEM:
-        return szOID_RSA_SMIMEalgESDH;
-    case CALG_MD2:
-        return szOID_RSA_MD2;
-    case CALG_MD4:
-        return szOID_RSA_MD4;
-    case CALG_MD5:
-        return szOID_RSA_MD5;
-    case CALG_RC2:
-        return szOID_RSA_RC2CBC;
-    case CALG_RC4:
-        return szOID_RSA_RC4;
-    case CALG_3DES:
-        return szOID_RSA_DES_EDE3_CBC;
-    case CALG_DH_SF:
-        return szOID_ANSI_X942_DH;
-    case CALG_DSS_SIGN:
-        return szOID_X957_DSA;
-    case CALG_DES:
-        return szOID_OIWSEC_desCBC;
-    case CALG_SHA:
-        return szOID_OIWSEC_sha1;
-    default:
-        return NULL;
-    }
-}
-
-DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId)
-{
-    int i;
-
-    if (pszObjId)
-    {
-        for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++)
-        {
-            if (!strcmp(pszObjId, oidToAlgID[i].oid))
-                return oidToAlgID[i].algID;
-        }
-    }
-    return 0;
-}
-
 LPVOID WINAPI CryptMemAlloc(ULONG cbSize)
 {
     return HeapAlloc(GetProcessHeap(), 0, cbSize);
@@ -351,3 +262,44 @@ BOOL WINAPI I_CryptFreeTls(DWORD dwTlsIndex, DWORD unknown)
     TRACE("(%ld, %ld)\n", dwTlsIndex, unknown);
     return TlsFree(dwTlsIndex);
 }
+
+BOOL WINAPI I_CryptGetOssGlobal(DWORD x)
+{
+    FIXME("%08lx\n", x);
+    return FALSE;
+}
+
+BOOL WINAPI I_CryptInstallOssGlobal(DWORD x, DWORD y, DWORD z)
+{
+    FIXME("%08lx %08lx %08lx\n", x, y, z);
+    return FALSE;
+}
+
+BOOL WINAPI I_CryptInstallAsn1Module(void *x, DWORD y, DWORD z)
+{
+    FIXME("%p %08lx %08lx\n", x, y, z);
+    return TRUE;
+}
+
+BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void* pvObject,
+    DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags,
+    DWORD dwFlags, DWORD* pdwMsgAndCertEncodingType, DWORD* pdwContentType,
+    DWORD* pdwFormatType, HCERTSTORE* phCertStore, HCRYPTMSG* phMsg,
+    const void** ppvContext)
+{
+    FIXME( "%08lx %p %08lx %08lx %08lx %p %p %p %p %p %p", dwObjectType,
+           pvObject, dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags,
+           dwFlags, pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType,
+           phCertStore, phMsg, ppvContext);
+    return FALSE;
+}
+
+BOOL WINAPI CryptVerifyMessageSignature(/*PCRYPT_VERIFY_MESSAGE_PARA*/ void* pVerifyPara,
+          DWORD dwSignerIndex, const BYTE* pbSignedBlob, DWORD cbSignedBlob,
+          BYTE* pbDecoded, DWORD* pcbDecoded, PCCERT_CONTEXT* ppSignerCert)
+{
+    FIXME("stub: %p, %ld, %p, %ld, %p, %p, %p\n",
+        pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob,
+        pbDecoded, pcbDecoded, ppSignerCert);
+    return FALSE;
+}
index e9733a1..1555bb2 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Copyright 2002 Mike McCormack for CodeWeavers
- * Copyright 2005 Juan Lang
+ * Copyright 2005-2006 Juan Lang
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  */
 #include <stdio.h>
 #include <stdarg.h>
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winbase.h"
 #include "wincrypt.h"
 #include "winreg.h"
+#include "winuser.h"
 #include "wine/debug.h"
 #include "wine/list.h"
 #include "crypt32_private.h"
+#include "cryptres.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(crypt);
 
 static const WCHAR DllW[] = { 'D','l','l',0 };
+
+static void init_function_sets(void);
+static void init_oid_info(HINSTANCE hinst);
+static void free_function_sets(void);
+static void free_oid_info(void);
+
+void crypt_oid_init(HINSTANCE hinst)
+{
+    init_function_sets();
+    init_oid_info(hinst);
+}
+
+void crypt_oid_free(void)
+{
+    free_function_sets();
+    free_oid_info();
+}
+
 CRITICAL_SECTION funcSetCS;
 struct list funcSets;
 
@@ -47,13 +68,13 @@ struct OIDFunction
     struct list next;
 };
 
-void CRYPT_InitFunctionSets(void)
+static void init_function_sets(void)
 {
     InitializeCriticalSection(&funcSetCS);
     list_init(&funcSets);
 }
 
-void CRYPT_FreeFunctionSets(void)
+static void free_function_sets(void)
 {
     struct OIDFunctionSet *setCursor, *setNext;
 
@@ -64,7 +85,6 @@ void CRYPT_FreeFunctionSets(void)
 
         list_remove(&setCursor->next);
         CryptMemFree(setCursor->name);
-        CryptMemFree(setCursor);
         LIST_FOR_EACH_ENTRY_SAFE(functionCursor, funcNext,
          &setCursor->functions, struct OIDFunction, next)
         {
@@ -72,6 +92,7 @@ void CRYPT_FreeFunctionSets(void)
             CryptMemFree(functionCursor);
         }
         DeleteCriticalSection(&setCursor->cs);
+        CryptMemFree(setCursor);
     }
     DeleteCriticalSection(&funcSetCS);
 }
@@ -556,3 +577,555 @@ BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
     }
     return rc ? FALSE : TRUE;
 }
+
+CRITICAL_SECTION oidInfoCS;
+struct list oidInfo;
+
+static const WCHAR tripledes[] = { '3','d','e','s',0 };
+static const WCHAR cms3deswrap[] = { 'C','M','S','3','D','E','S','w','r','a',
+ 'p',0 };
+static const WCHAR cmsrc2wrap[] = { 'C','M','S','R','C','2','w','r','a','p',0 };
+static const WCHAR des[] = { 'd','e','s',0 };
+static const WCHAR md2[] = { 'm','d','2',0 };
+static const WCHAR md4[] = { 'm','d','4',0 };
+static const WCHAR md5[] = { 'm','d','5',0 };
+static const WCHAR rc2[] = { 'r','c','2',0 };
+static const WCHAR rc4[] = { 'r','c','4',0 };
+static const WCHAR sha[] = { 's','h','a',0 };
+static const WCHAR sha1[] = { 's','h','a','1',0 };
+static const WCHAR RSA[] = { 'R','S','A',0 };
+static const WCHAR RSA_KEYX[] = { 'R','S','A','_','K','E','Y','X',0 };
+static const WCHAR RSA_SIGN[] = { 'R','S','A','_','S','I','G','N',0 };
+static const WCHAR DSA[] = { 'D','S','A',0 };
+static const WCHAR DSA_SIGN[] = { 'D','S','A','_','S','I','G','N',0 };
+static const WCHAR DH[] = { 'D','H',0 };
+static const WCHAR DSS[] = { 'D','S','S',0 };
+static const WCHAR mosaicKMandUpdSig[] =
+ { 'm','o','s','a','i','c','K','M','a','n','d','U','p','d','S','i','g',0 };
+static const WCHAR ESDH[] = { 'E','S','D','H',0 };
+static const WCHAR NO_SIGN[] = { 'N','O','S','I','G','N',0 };
+static const WCHAR dsaSHA1[] = { 'd','s','a','S','H','A','1',0 };
+static const WCHAR md2RSA[] = { 'm','d','2','R','S','A',0 };
+static const WCHAR md4RSA[] = { 'm','d','4','R','S','A',0 };
+static const WCHAR md5RSA[] = { 'm','d','5','R','S','A',0 };
+static const WCHAR shaDSA[] = { 's','h','a','D','S','A',0 };
+static const WCHAR sha1DSA[] = { 's','h','a','1','D','S','A',0 };
+static const WCHAR shaRSA[] = { 's','h','a','R','S','A',0 };
+static const WCHAR sha1RSA[] = { 's','h','a','1','R','S','A',0 };
+static const WCHAR mosaicUpdatedSig[] =
+ { 'm','o','s','a','i','c','U','p','d','a','t','e','d','S','i','g',0 };
+static const WCHAR CN[] = { 'C','N',0 };
+static const WCHAR L[] = { 'L',0 };
+static const WCHAR O[] = { 'O',0 };
+static const WCHAR OU[] = { 'O','U',0 };
+static const WCHAR E[] = { 'E',0 };
+static const WCHAR C[] = { 'C',0 };
+static const WCHAR S[] = { 'S',0 };
+static const WCHAR ST[] = { 'S','T',0 };
+static const WCHAR STREET[] = { 'S','T','R','E','E','T',0 };
+static const WCHAR T[] = { 'T',0 };
+static const WCHAR Title[] = { 'T','i','t','l','e',0 };
+static const WCHAR G[] = { 'G',0 };
+static const WCHAR GivenName[] = { 'G','i','v','e','n','N','a','m','e',0 };
+static const WCHAR I[] = { 'I',0 };
+static const WCHAR Initials[] = { 'I','n','i','t','i','a','l','s',0 };
+static const WCHAR SN[] = { 'S','N',0 };
+static const WCHAR DC[] = { 'D','C',0 };
+static const WCHAR Description[] =
+ { 'D','e','s','c','r','i','p','t','i','o','n',0 };
+static const WCHAR PostalCode[] = { 'P','o','s','t','a','l','C','o','d','e',0 };
+static const WCHAR POBox[] = { 'P','O','B','o','x',0 };
+static const WCHAR Phone[] = { 'P','h','o','n','e',0 };
+static const WCHAR X21Address[] = { 'X','2','1','A','d','d','r','e','s','s',0 };
+static const WCHAR dnQualifier[] =
+ { 'd','n','Q','u','a','l','i','f','i','e','r',0 };
+static const WCHAR Email[] = { 'E','m','a','i','l',0 };
+static const WCHAR GN[] = { 'G','N',0 };
+
+static const DWORD noNullFlag = CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG;
+static const DWORD mosaicFlags = CRYPT_OID_INHIBIT_SIGNATURE_FORMAT_FLAG |
+ CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG;
+static const CRYPT_DATA_BLOB noNullBlob = { sizeof(noNullFlag),
+ (LPBYTE)&noNullFlag };
+static const CRYPT_DATA_BLOB mosaicFlagsBlob = { sizeof(mosaicFlags),
+ (LPBYTE)&mosaicFlags };
+
+static const DWORD rsaSign = CALG_RSA_SIGN;
+static const DWORD dssSign[2] = { CALG_DSS_SIGN,
+ CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG };
+static const DWORD mosaicSign[2] = { CALG_DSS_SIGN,
+ CRYPT_OID_INHIBIT_SIGNATURE_FORMAT_FLAG |
+ CRYPT_OID_NO_NULL_ALGORITHM_PARA_FLAG };
+static const CRYPT_DATA_BLOB rsaSignBlob = { sizeof(rsaSign),
+ (LPBYTE)&rsaSign };
+static const CRYPT_DATA_BLOB dssSignBlob = { sizeof(dssSign),
+ (LPBYTE)dssSign };
+static const CRYPT_DATA_BLOB mosaicSignBlob = { sizeof(mosaicSign),
+ (LPBYTE)mosaicSign };
+
+static const DWORD ia5String[] = { CERT_RDN_IA5_STRING, 0 };
+static const DWORD numericString[] = { CERT_RDN_NUMERIC_STRING, 0 };
+static const DWORD printableString[] = { CERT_RDN_PRINTABLE_STRING, 0 };
+static const DWORD domainCompTypes[] = { CERT_RDN_IA5_STRING,
+ CERT_RDN_UTF8_STRING, 0 };
+static const CRYPT_DATA_BLOB ia5StringBlob = { sizeof(ia5String),
+ (LPBYTE)ia5String };
+static const CRYPT_DATA_BLOB numericStringBlob = { sizeof(numericString),
+ (LPBYTE)numericString };
+static const CRYPT_DATA_BLOB printableStringBlob = { sizeof(printableString),
+ (LPBYTE)printableString };
+static const CRYPT_DATA_BLOB domainCompTypesBlob = { sizeof(domainCompTypes),
+ (LPBYTE)domainCompTypes };
+
+struct OIDInfoConstructor {
+    DWORD   dwGroupId;
+    LPCSTR  pszOID;
+    UINT    Algid;
+    LPCWSTR pwszName;
+    const CRYPT_DATA_BLOB *blob;
+} oidInfoConstructors[] = {
+ { 1, szOID_OIWSEC_sha1,               CALG_SHA1,     sha1, NULL },
+ { 1, szOID_OIWSEC_sha1,               CALG_SHA1,     sha, NULL },
+ { 1, szOID_OIWSEC_sha,                CALG_SHA,      sha, NULL },
+ { 1, szOID_RSA_MD5,                   CALG_MD5,      md5, NULL },
+ { 1, szOID_RSA_MD4,                   CALG_MD4,      md4, NULL },
+ { 1, szOID_RSA_MD2,                   CALG_MD2,      md2, NULL },
+
+ { 2, szOID_OIWSEC_desCBC,             CALG_DES,      des, NULL },
+ { 2, szOID_RSA_DES_EDE3_CBC,          CALG_3DES,     tripledes, NULL },
+ { 2, szOID_RSA_RC2CBC,                CALG_RC2,      rc2, NULL },
+ { 2, szOID_RSA_RC4,                   CALG_RC4,      rc4, NULL },
+ { 2, szOID_RSA_SMIMEalgCMS3DESwrap,   CALG_3DES,     cms3deswrap, NULL },
+ { 2, szOID_RSA_SMIMEalgCMSRC2wrap,    CALG_RC2,      cmsrc2wrap, NULL },
+
+ { 3, szOID_RSA_RSA,                   CALG_RSA_KEYX, RSA, NULL },
+ { 3, szOID_X957_DSA,                  CALG_DSS_SIGN, DSA, &noNullBlob },
+ { 3, szOID_ANSI_X942_DH,              CALG_DH_SF,    DH, &noNullBlob },
+ { 3, szOID_RSA_RSA,                   CALG_RSA_KEYX, RSA_KEYX, NULL },
+ { 3, szOID_RSA_RSA,                   CALG_RSA_SIGN, RSA, NULL },
+ { 3, szOID_RSA_RSA,                   CALG_RSA_SIGN, RSA_SIGN, NULL },
+ { 3, szOID_OIWSEC_dsa,                CALG_DSS_SIGN, DSA, &noNullBlob },
+ { 3, szOID_OIWSEC_dsa,                CALG_DSS_SIGN, DSS, &noNullBlob },
+ { 3, szOID_OIWSEC_dsa,                CALG_DSS_SIGN, DSA_SIGN, &noNullBlob },
+ { 3, szOID_RSA_DH,                    CALG_DH_SF,    DH, &noNullBlob },
+ { 3, szOID_OIWSEC_rsaXchg,            CALG_RSA_KEYX, RSA_KEYX, NULL },
+ { 3, szOID_INFOSEC_mosaicKMandUpdSig, CALG_DSS_SIGN, mosaicKMandUpdSig,
+   &mosaicFlagsBlob },
+ { 3, szOID_RSA_SMIMEalgESDH,          CALG_DH_EPHEM, ESDH, &noNullBlob },
+ { 3, szOID_PKIX_NO_SIGNATURE,         CALG_NO_SIGN,  NO_SIGN, NULL },
+
+ { 4, szOID_RSA_SHA1RSA,               CALG_SHA1,     sha1RSA, &rsaSignBlob },
+ { 4, szOID_RSA_MD5RSA,                CALG_MD5,      md5RSA, &rsaSignBlob },
+ { 4, szOID_X957_SHA1DSA,              CALG_SHA1,     sha1DSA, &dssSignBlob },
+ { 4, szOID_OIWSEC_sha1RSASign,        CALG_SHA1,     sha1RSA, &rsaSignBlob },
+ { 4, szOID_OIWSEC_sha1RSASign,        CALG_SHA1,     shaRSA, &rsaSignBlob },
+ { 4, szOID_OIWSEC_shaRSA,             CALG_SHA1,     shaRSA, &rsaSignBlob },
+ { 4, szOID_OIWSEC_md5RSA,             CALG_MD5,      md5RSA, &rsaSignBlob },
+ { 4, szOID_RSA_MD2RSA,                CALG_MD2,      md2RSA, &rsaSignBlob },
+ { 4, szOID_RSA_MD4RSA,                CALG_MD4,      md4RSA, &rsaSignBlob },
+ { 4, szOID_OIWSEC_md4RSA,             CALG_MD4,      md4RSA, &rsaSignBlob },
+ { 4, szOID_OIWSEC_md4RSA2,            CALG_MD4,      md4RSA, &rsaSignBlob },
+ { 4, szOID_OIWDIR_md2RSA,             CALG_MD2,      md2RSA, &rsaSignBlob },
+ { 4, szOID_OIWSEC_shaDSA,             CALG_SHA1,     sha1DSA, &dssSignBlob },
+ { 4, szOID_OIWSEC_shaDSA,             CALG_SHA1,     shaDSA, &dssSignBlob },
+ { 4, szOID_OIWSEC_dsaSHA1,            CALG_SHA1,     dsaSHA1, &dssSignBlob },
+ { 4, szOID_INFOSEC_mosaicUpdatedSig,  CALG_SHA1,     mosaicUpdatedSig,
+   &mosaicSignBlob },
+
+ { 5, szOID_COMMON_NAME,              0, CN, NULL },
+ { 5, szOID_LOCALITY_NAME,            0, L, NULL },
+ { 5, szOID_ORGANIZATION_NAME,        0, O, NULL },
+ { 5, szOID_ORGANIZATIONAL_UNIT_NAME, 0, OU, NULL },
+ { 5, szOID_RSA_emailAddr,            0, E, &ia5StringBlob },
+ { 5, szOID_RSA_emailAddr,            0, Email, &ia5StringBlob },
+ { 5, szOID_COUNTRY_NAME,             0, C, &printableStringBlob },
+ { 5, szOID_STATE_OR_PROVINCE_NAME,   0, S, NULL },
+ { 5, szOID_STATE_OR_PROVINCE_NAME,   0, ST, NULL },
+ { 5, szOID_STREET_ADDRESS,           0, STREET, NULL },
+ { 5, szOID_TITLE,                    0, T, NULL },
+ { 5, szOID_TITLE,                    0, Title, NULL },
+ { 5, szOID_GIVEN_NAME,               0, G, NULL },
+ { 5, szOID_GIVEN_NAME,               0, GN, NULL },
+ { 5, szOID_GIVEN_NAME,               0, GivenName, NULL },
+ { 5, szOID_INITIALS,                 0, I, NULL },
+ { 5, szOID_INITIALS,                 0, Initials, NULL },
+ { 5, szOID_SUR_NAME,                 0, SN, NULL },
+ { 5, szOID_DOMAIN_COMPONENT,         0, DC, &domainCompTypesBlob },
+ { 5, szOID_DESCRIPTION,              0, Description, NULL },
+ { 5, szOID_POSTAL_CODE,              0, PostalCode, NULL },
+ { 5, szOID_POST_OFFICE_BOX,          0, POBox, NULL },
+ { 5, szOID_TELEPHONE_NUMBER,         0, Phone, &printableStringBlob },
+ { 5, szOID_X21_ADDRESS,              0, X21Address, &numericStringBlob },
+ { 5, szOID_DN_QUALIFIER,             0, dnQualifier, NULL },
+
+ { 6, szOID_AUTHORITY_KEY_IDENTIFIER2, 0, (LPCWSTR)IDS_AUTHORITY_KEY_ID, NULL },
+ { 6, szOID_AUTHORITY_KEY_IDENTIFIER, 0, (LPCWSTR)IDS_AUTHORITY_KEY_ID, NULL },
+ { 6, szOID_KEY_ATTRIBUTES, 0, (LPCWSTR)IDS_KEY_ATTRIBUTES, NULL },
+ { 6, szOID_KEY_USAGE_RESTRICTION, 0, (LPCWSTR)IDS_KEY_USAGE_RESTRICTION, NULL },
+ { 6, szOID_SUBJECT_ALT_NAME2, 0, (LPCWSTR)IDS_SUBJECT_ALT_NAME, NULL },
+ { 6, szOID_SUBJECT_ALT_NAME, 0, (LPCWSTR)IDS_SUBJECT_ALT_NAME, NULL },
+ { 6, szOID_ISSUER_ALT_NAME2, 0, (LPCWSTR)IDS_ISSUER_ALT_NAME, NULL },
+ { 6, szOID_ISSUER_ALT_NAME2, 0, (LPCWSTR)IDS_ISSUER_ALT_NAME, NULL },
+ { 6, szOID_BASIC_CONSTRAINTS2, 0, (LPCWSTR)IDS_BASIC_CONSTRAINTS, NULL },
+ { 6, szOID_BASIC_CONSTRAINTS, 0, (LPCWSTR)IDS_BASIC_CONSTRAINTS, NULL },
+ { 6, szOID_KEY_USAGE, 0, (LPCWSTR)IDS_KEY_USAGE, NULL },
+ { 6, szOID_CERT_POLICIES, 0, (LPCWSTR)IDS_CERT_POLICIES, NULL },
+ { 6, szOID_SUBJECT_KEY_IDENTIFIER, 0, (LPCWSTR)IDS_SUBJECT_KEY_IDENTIFIER, NULL },
+ { 6, szOID_CRL_REASON_CODE, 0, (LPCWSTR)IDS_CRL_REASON_CODE, NULL },
+ { 6, szOID_CRL_DIST_POINTS, 0, (LPCWSTR)IDS_CRL_DIST_POINTS, NULL },
+ { 6, szOID_ENHANCED_KEY_USAGE, 0, (LPCWSTR)IDS_ENHANCED_KEY_USAGE, NULL },
+ { 6, szOID_AUTHORITY_INFO_ACCESS, 0, (LPCWSTR)IDS_AUTHORITY_INFO_ACCESS, NULL },
+ { 6, szOID_CERT_EXTENSIONS, 0, (LPCWSTR)IDS_CERT_EXTENSIONS, NULL },
+ { 6, szOID_RSA_certExtensions, 0, (LPCWSTR)IDS_CERT_EXTENSIONS, NULL },
+ { 6, szOID_NEXT_UPDATE_LOCATION, 0, (LPCWSTR)IDS_NEXT_UPDATE_LOCATION, NULL },
+ { 6, szOID_YESNO_TRUST_ATTR, 0, (LPCWSTR)IDS_YES_OR_NO_TRUST, NULL },
+ { 6, szOID_RSA_emailAddr, 0, (LPCWSTR)IDS_EMAIL_ADDRESS, NULL },
+ { 6, szOID_RSA_unstructName, 0, (LPCWSTR)IDS_UNSTRUCTURED_NAME, NULL },
+ { 6, szOID_RSA_contentType, 0, (LPCWSTR)IDS_CONTENT_TYPE, NULL },
+ { 6, szOID_RSA_messageDigest, 0, (LPCWSTR)IDS_MESSAGE_DIGEST, NULL },
+ { 6, szOID_RSA_signingTime, 0, (LPCWSTR)IDS_SIGNING_TIME, NULL },
+ { 6, szOID_RSA_counterSign, 0, (LPCWSTR)IDS_COUNTER_SIGN, NULL },
+ { 6, szOID_RSA_challengePwd, 0, (LPCWSTR)IDS_CHALLENGE_PASSWORD, NULL },
+ { 6, szOID_RSA_unstructAddr, 0, (LPCWSTR)IDS_UNSTRUCTURED_ADDRESS, NULL },
+ { 6, szOID_RSA_SMIMECapabilities, 0, (LPCWSTR)IDS_SMIME_CAPABILITIES, NULL },
+ { 6, szOID_RSA_preferSignedData, 0, (LPCWSTR)IDS_PREFER_SIGNED_DATA, NULL },
+ { 6, szOID_PKIX_POLICY_QUALIFIER_CPS, 0, (LPCWSTR)IDS_CPS, NULL },
+ { 6, szOID_PKIX_POLICY_QUALIFIER_USERNOTICE, 0, (LPCWSTR)IDS_USER_NOTICE, NULL },
+ { 6, szOID_PKIX_OCSP, 0, (LPCWSTR)IDS_OCSP, NULL },
+ { 6, szOID_PKIX_CA_ISSUERS, 0, (LPCWSTR)IDS_CA_ISSUER, NULL },
+ { 6, szOID_ENROLL_CERTTYPE_EXTENSION, 0, (LPCWSTR)IDS_CERT_TEMPLATE_NAME, NULL },
+ { 6, szOID_ENROLL_CERTTYPE_EXTENSION, 0, (LPCWSTR)IDS_CERT_TYPE, NULL },
+ { 6, szOID_CERT_MANIFOLD, 0, (LPCWSTR)IDS_CERT_MANIFOLD, NULL },
+ { 6, szOID_NETSCAPE_CERT_TYPE, 0, (LPCWSTR)IDS_NETSCAPE_CERT_TYPE, NULL },
+ { 6, szOID_NETSCAPE_BASE_URL, 0, (LPCWSTR)IDS_NETSCAPE_BASE_URL, NULL },
+ { 6, szOID_NETSCAPE_REVOCATION_URL, 0, (LPCWSTR)IDS_NETSCAPE_REVOCATION_URL, NULL },
+ { 6, szOID_NETSCAPE_CA_REVOCATION_URL, 0, (LPCWSTR)IDS_NETSCAPE_CA_REVOCATION_URL, NULL },
+ { 6, szOID_NETSCAPE_CERT_RENEWAL_URL, 0, (LPCWSTR)IDS_NETSCAPE_CERT_RENEWAL_URL, NULL },
+ { 6, szOID_NETSCAPE_CA_POLICY_URL, 0, (LPCWSTR)IDS_NETSCAPE_CA_POLICY_URL, NULL },
+ { 6, szOID_NETSCAPE_SSL_SERVER_NAME, 0, (LPCWSTR)IDS_NETSCAPE_SSL_SERVER_NAME, NULL },
+ { 6, szOID_NETSCAPE_COMMENT, 0, (LPCWSTR)IDS_NETSCAPE_COMMENT, NULL },
+ { 6, "1.3.6.1.4.1.311.2.1.10", 0, (LPCWSTR)IDS_SPC_SP_AGENCY_INFO, NULL },
+ { 6, "1.3.6.1.4.1.311.2.1.27", 0, (LPCWSTR)IDS_SPC_FINANCIAL_CRITERIA, NULL },
+ { 6, "1.3.6.1.4.1.311.2.1.26", 0, (LPCWSTR)IDS_SPC_MINIMAL_CRITERIA, NULL },
+ { 6, szOID_COUNTRY_NAME, 0, (LPCWSTR)IDS_COUNTRY, NULL },
+ { 6, szOID_ORGANIZATION_NAME, 0, (LPCWSTR)IDS_ORGANIZATION, NULL },
+ { 6, szOID_ORGANIZATIONAL_UNIT_NAME, 0, (LPCWSTR)IDS_ORGANIZATIONAL_UNIT, NULL },
+ { 6, szOID_COMMON_NAME, 0, (LPCWSTR)IDS_COMMON_NAME, NULL },
+ { 6, szOID_LOCALITY_NAME, 0, (LPCWSTR)IDS_LOCALITY, NULL },
+ { 6, szOID_STATE_OR_PROVINCE_NAME, 0, (LPCWSTR)IDS_STATE_OR_PROVINCE, NULL },
+ { 6, szOID_TITLE, 0, (LPCWSTR)IDS_TITLE, NULL },
+ { 6, szOID_GIVEN_NAME, 0, (LPCWSTR)IDS_GIVEN_NAME, NULL },
+ { 6, szOID_INITIALS, 0, (LPCWSTR)IDS_INITIALS, NULL },
+ { 6, szOID_SUR_NAME, 0, (LPCWSTR)IDS_SUR_NAME, NULL },
+ { 6, szOID_DOMAIN_COMPONENT, 0, (LPCWSTR)IDS_DOMAIN_COMPONENT, NULL },
+ { 6, szOID_STREET_ADDRESS, 0, (LPCWSTR)IDS_STREET_ADDRESS, NULL },
+ { 6, szOID_DEVICE_SERIAL_NUMBER, 0, (LPCWSTR)IDS_SERIAL_NUMBER, NULL },
+ { 6, szOID_CERTSRV_CA_VERSION, 0, (LPCWSTR)IDS_CA_VERSION, NULL },
+ { 6, szOID_CERTSRV_CROSSCA_VERSION, 0, (LPCWSTR)IDS_CROSS_CA_VERSION, NULL },
+ { 6, szOID_SERIALIZED, 0, (LPCWSTR)IDS_SERIALIZED_SIG_SERIAL_NUMBER, NULL },
+ { 6, szOID_NT_PRINCIPAL_NAME, 0, (LPCWSTR)IDS_PRINCIPAL_NAME, NULL },
+ { 6, szOID_PRODUCT_UPDATE, 0, (LPCWSTR)IDS_WINDOWS_PRODUCT_UPDATE, NULL },
+ { 6, szOID_ENROLLMENT_NAME_VALUE_PAIR, 0, (LPCWSTR)IDS_ENROLLMENT_NAME_VALUE_PAIR, NULL },
+ { 6, szOID_OS_VERSION, 0, (LPCWSTR)IDS_OS_VERSION, NULL },
+ { 6, szOID_ENROLLMENT_CSP_PROVIDER, 0, (LPCWSTR)IDS_ENROLLMENT_CSP, NULL },
+ { 6, szOID_CRL_NUMBER, 0, (LPCWSTR)IDS_CRL_NUMBER, NULL },
+ { 6, szOID_DELTA_CRL_INDICATOR, 0, (LPCWSTR)IDS_DELTA_CRL_INDICATOR, NULL },
+ { 6, szOID_ISSUING_DIST_POINT, 0, (LPCWSTR)IDS_ISSUING_DIST_POINT, NULL },
+ { 6, szOID_FRESHEST_CRL, 0, (LPCWSTR)IDS_FRESHEST_CRL, NULL },
+ { 6, szOID_NAME_CONSTRAINTS, 0, (LPCWSTR)IDS_NAME_CONSTRAINTS, NULL },
+ { 6, szOID_POLICY_MAPPINGS, 0, (LPCWSTR)IDS_POLICY_MAPPINGS, NULL },
+ { 6, szOID_LEGACY_POLICY_MAPPINGS, 0, (LPCWSTR)IDS_POLICY_MAPPINGS, NULL },
+ { 6, szOID_POLICY_CONSTRAINTS, 0, (LPCWSTR)IDS_POLICY_CONSTRAINTS, NULL },
+ { 6, szOID_CROSS_CERT_DIST_POINTS, 0, (LPCWSTR)IDS_CROSS_CERT_DIST_POINTS, NULL },
+ { 6, szOID_APPLICATION_CERT_POLICIES, 0, (LPCWSTR)IDS_APPLICATION_POLICIES, NULL },
+ { 6, szOID_APPLICATION_POLICY_MAPPINGS, 0, (LPCWSTR)IDS_APPLICATION_POLICY_MAPPINGS, NULL },
+ { 6, szOID_APPLICATION_POLICY_CONSTRAINTS, 0, (LPCWSTR)IDS_APPLICATION_POLICY_CONSTRAINTS, NULL },
+ { 6, szOID_CT_PKI_DATA, 0, (LPCWSTR)IDS_CMC_DATA, NULL },
+ { 6, szOID_CT_PKI_RESPONSE, 0, (LPCWSTR)IDS_CMC_RESPONSE, NULL },
+ { 6, szOID_CMC, 0, (LPCWSTR)IDS_UNSIGNED_CMC_REQUEST, NULL },
+ { 6, szOID_CMC_STATUS_INFO, 0, (LPCWSTR)IDS_CMC_STATUS_INFO, NULL },
+ { 6, szOID_CMC_ADD_EXTENSIONS, 0, (LPCWSTR)IDS_CMC_EXTENSIONS, NULL },
+ { 6, szOID_CTL, 0, (LPCWSTR)IDS_CMC_ATTRIBUTES, NULL },
+ { 6, szOID_RSA_data, 0, (LPCWSTR)IDS_PKCS_7_DATA, NULL },
+ { 6, szOID_RSA_signedData, 0, (LPCWSTR)IDS_PKCS_7_SIGNED, NULL },
+ { 6, szOID_RSA_envelopedData, 0, (LPCWSTR)IDS_PKCS_7_ENVELOPED, NULL },
+ { 6, szOID_RSA_signEnvData, 0, (LPCWSTR)IDS_PKCS_7_SIGNED_ENVELOPED, NULL },
+ { 6, szOID_RSA_digestedData, 0, (LPCWSTR)IDS_PKCS_7_DIGESTED, NULL },
+ { 6, szOID_RSA_encryptedData, 0, (LPCWSTR)IDS_PKCS_7_ENCRYPTED, NULL },
+ { 6, szOID_CERTSRV_PREVIOUS_CERT_HASH, 0, (LPCWSTR)IDS_PREVIOUS_CA_CERT_HASH, NULL },
+ { 6, szOID_CRL_VIRTUAL_BASE, 0, (LPCWSTR)IDS_CRL_VIRTUAL_BASE, NULL },
+ { 6, szOID_CRL_NEXT_PUBLISH, 0, (LPCWSTR)IDS_CRL_NEXT_PUBLISH, NULL },
+ { 6, szOID_KP_CA_EXCHANGE, 0, (LPCWSTR)IDS_CA_EXCHANGE, NULL },
+ { 6, szOID_KP_KEY_RECOVERY_AGENT, 0, (LPCWSTR)IDS_KEY_RECOVERY_AGENT, NULL },
+ { 6, szOID_CERTIFICATE_TEMPLATE, 0, (LPCWSTR)IDS_CERTIFICATE_TEMPLATE, NULL },
+ { 6, szOID_ENTERPRISE_OID_ROOT, 0, (LPCWSTR)IDS_ENTERPRISE_ROOT_OID, NULL },
+ { 6, szOID_RDN_DUMMY_SIGNER, 0, (LPCWSTR)IDS_RDN_DUMMY_SIGNER, NULL },
+ { 6, szOID_ARCHIVED_KEY_ATTR, 0, (LPCWSTR)IDS_ARCHIVED_KEY_ATTR, NULL },
+ { 6, szOID_CRL_SELF_CDP, 0, (LPCWSTR)IDS_CRL_SELF_CDP, NULL },
+ { 6, szOID_REQUIRE_CERT_CHAIN_POLICY, 0, (LPCWSTR)IDS_REQUIRE_CERT_CHAIN_POLICY, NULL },
+ { 6, szOID_CMC_TRANSACTION_ID, 0, (LPCWSTR)IDS_TRANSACTION_ID, NULL },
+ { 6, szOID_CMC_SENDER_NONCE, 0, (LPCWSTR)IDS_SENDER_NONCE, NULL },
+ { 6, szOID_CMC_RECIPIENT_NONCE, 0, (LPCWSTR)IDS_RECIPIENT_NONCE, NULL },
+ { 6, szOID_CMC_REG_INFO, 0, (LPCWSTR)IDS_REG_INFO, NULL },
+ { 6, szOID_CMC_GET_CERT, 0, (LPCWSTR)IDS_GET_CERTIFICATE, NULL },
+ { 6, szOID_CMC_GET_CRL, 0, (LPCWSTR)IDS_GET_CRL, NULL },
+ { 6, szOID_CMC_REVOKE_REQUEST, 0, (LPCWSTR)IDS_REVOKE_REQUEST, NULL },
+ { 6, szOID_CMC_QUERY_PENDING, 0, (LPCWSTR)IDS_QUERY_PENDING, NULL },
+ { 6, szOID_SORTED_CTL, 0, (LPCWSTR)IDS_SORTED_CTL, NULL },
+ { 6, szOID_ARCHIVED_KEY_CERT_HASH, 0, (LPCWSTR)IDS_ARCHIVED_KEY_CERT_HASH, NULL },
+ { 6, szOID_PRIVATEKEY_USAGE_PERIOD, 0, (LPCWSTR)IDS_PRIVATE_KEY_USAGE_PERIOD, NULL },
+ { 6, szOID_REQUEST_CLIENT_INFO, 0, (LPCWSTR)IDS_CLIENT_INFORMATION, NULL },
+
+ { 7, szOID_PKIX_KP_SERVER_AUTH, 0, (LPCWSTR)IDS_SERVER_AUTHENTICATION, NULL },
+ { 7, szOID_PKIX_KP_CLIENT_AUTH, 0, (LPCWSTR)IDS_CLIENT_AUTHENTICATION, NULL },
+ { 7, szOID_PKIX_KP_CODE_SIGNING, 0, (LPCWSTR)IDS_CODE_SIGNING, NULL },
+ { 7, szOID_PKIX_KP_EMAIL_PROTECTION, 0, (LPCWSTR)IDS_SECURE_EMAIL, NULL },
+ { 7, szOID_PKIX_KP_TIMESTAMP_SIGNING, 0, (LPCWSTR)IDS_TIME_STAMPING, NULL },
+ { 7, szOID_KP_CTL_USAGE_SIGNING, 0, (LPCWSTR)IDS_MICROSOFT_TRUST_LIST_SIGNING, NULL },
+ { 7, szOID_KP_TIME_STAMP_SIGNING, 0, (LPCWSTR)IDS_MICROSOFT_TIME_STAMPING, NULL },
+ { 7, szOID_PKIX_KP_IPSEC_END_SYSTEM, 0, (LPCWSTR)IDS_IPSEC_END_SYSTEM, NULL },
+ { 7, szOID_PKIX_KP_IPSEC_TUNNEL, 0, (LPCWSTR)IDS_IPSEC_TUNNEL, NULL },
+ { 7, szOID_PKIX_KP_IPSEC_USER, 0, (LPCWSTR)IDS_IPSEC_USER, NULL },
+ { 7, szOID_KP_EFS, 0, (LPCWSTR)IDS_EFS, NULL },
+ { 7, szOID_WHQL_CRYPTO, 0, (LPCWSTR)IDS_WHQL_CRYPTO, NULL },
+ { 7, szOID_NT5_CRYPTO, 0, (LPCWSTR)IDS_NT5_CRYPTO, NULL },
+ { 7, szOID_OEM_WHQL_CRYPTO, 0, (LPCWSTR)IDS_OEM_WHQL_CRYPTO, NULL },
+ { 7, szOID_EMBEDDED_NT_CRYPTO, 0, (LPCWSTR)IDS_EMBEDDED_NT_CRYPTO, NULL },
+ { 7, szOID_LICENSES, 0, (LPCWSTR)IDS_KEY_PACK_LICENSES, NULL },
+ { 7, szOID_LICENSE_SERVER, 0, (LPCWSTR)IDS_LICENSE_SERVER, NULL },
+ { 7, szOID_KP_SMARTCARD_LOGON, 0, (LPCWSTR)IDS_SMART_CARD_LOGON, NULL },
+ { 7, szOID_DRM, 0, (LPCWSTR)IDS_DIGITAL_RIGHTS, NULL },
+ { 7, szOID_KP_QUALIFIED_SUBORDINATION, 0, (LPCWSTR)IDS_QUALIFIED_SUBORDINATION, NULL },
+ { 7, szOID_KP_KEY_RECOVERY, 0, (LPCWSTR)IDS_KEY_RECOVERY, NULL },
+ { 7, szOID_KP_DOCUMENT_SIGNING, 0, (LPCWSTR)IDS_DOCUMENT_SIGNING, NULL },
+ { 7, szOID_IPSEC_KP_IKE_INTERMEDIATE, 0, (LPCWSTR)IDS_IPSEC_IKE_INTERMEDIATE, NULL },
+ { 7, szOID_EFS_RECOVERY, 0, (LPCWSTR)IDS_FILE_RECOVERY, NULL },
+ { 7, szOID_ROOT_LIST_SIGNER, 0, (LPCWSTR)IDS_ROOT_LIST_SIGNER, NULL },
+ { 7, szOID_ANY_APPLICATION_POLICY, 0, (LPCWSTR)IDS_ANY_APPLICATION_POLICIES, NULL },
+ { 7, szOID_DS_EMAIL_REPLICATION, 0, (LPCWSTR)IDS_DS_EMAIL_REPLICATION, NULL },
+ { 7, szOID_ENROLLMENT_AGENT, 0, (LPCWSTR)IDS_ENROLLMENT_AGENT, NULL },
+ { 7, szOID_KP_KEY_RECOVERY_AGENT, 0, (LPCWSTR)IDS_KEY_RECOVERY_AGENT, NULL },
+ { 7, szOID_KP_CA_EXCHANGE, 0, (LPCWSTR)IDS_CA_EXCHANGE, NULL },
+ { 7, szOID_KP_LIFETIME_SIGNING, 0, (LPCWSTR)IDS_LIFETIME_SIGNING, NULL },
+
+ { 8, szOID_ANY_CERT_POLICY, 0, (LPCWSTR)IDS_ANY_CERT_POLICY, NULL },
+};
+
+struct OIDInfo {
+    CRYPT_OID_INFO info;
+    struct list entry;
+};
+
+static void init_oid_info(HINSTANCE hinst)
+{
+    DWORD i;
+
+    InitializeCriticalSection(&oidInfoCS);
+    list_init(&oidInfo);
+    for (i = 0; i < sizeof(oidInfoConstructors) /
+     sizeof(oidInfoConstructors[0]); i++)
+    {
+        if (HIWORD(oidInfoConstructors[i].pwszName))
+        {
+            struct OIDInfo *info;
+
+            /* The name is a static string, so just use the same pointer */
+            info = CryptMemAlloc(sizeof(struct OIDInfo));
+            if (info)
+            {
+                memset(info, 0, sizeof(*info));
+                info->info.cbSize = sizeof(CRYPT_OID_INFO);
+                info->info.pszOID = oidInfoConstructors[i].pszOID;
+                info->info.pwszName = oidInfoConstructors[i].pwszName;
+                info->info.dwGroupId = oidInfoConstructors[i].dwGroupId;
+                info->info.u.Algid = oidInfoConstructors[i].Algid;
+                if (oidInfoConstructors[i].blob)
+                {
+                    info->info.ExtraInfo.cbData =
+                     oidInfoConstructors[i].blob->cbData;
+                    info->info.ExtraInfo.pbData =
+                     oidInfoConstructors[i].blob->pbData;
+                }
+                list_add_tail(&oidInfo, &info->entry);
+            }
+        }
+        else
+        {
+            int len = LoadStringW(hinst, (UINT)oidInfoConstructors[i].pwszName,
+             NULL, 0);
+
+            if (len)
+            {
+                struct OIDInfo *info = CryptMemAlloc(sizeof(struct OIDInfo) +
+                 (len + 1) * sizeof(WCHAR));
+
+                if (info)
+                {
+                    memset(info, 0, sizeof(*info));
+                    info->info.cbSize = sizeof(CRYPT_OID_INFO);
+                    info->info.pszOID = oidInfoConstructors[i].pszOID;
+                    info->info.pwszName =
+                     (LPWSTR)((LPBYTE)info + sizeof(struct OIDInfo));
+                    info->info.dwGroupId = oidInfoConstructors[i].dwGroupId;
+                    info->info.u.Algid = oidInfoConstructors[i].Algid;
+                    LoadStringW(hinst, (UINT)oidInfoConstructors[i].pwszName,
+                     (LPWSTR)info->info.pwszName, len + 1);
+                    if (oidInfoConstructors[i].blob)
+                    {
+                        info->info.ExtraInfo.cbData =
+                         oidInfoConstructors[i].blob->cbData;
+                        info->info.ExtraInfo.pbData =
+                         oidInfoConstructors[i].blob->pbData;
+                    }
+                    list_add_tail(&oidInfo, &info->entry);
+                }
+            }
+        }
+    }
+}
+
+static void free_oid_info(void)
+{
+    struct OIDInfo *info, *next;
+
+    LIST_FOR_EACH_ENTRY_SAFE(info, next, &oidInfo, struct OIDInfo, entry)
+    {
+        list_remove(&info->entry);
+        CryptMemFree(info);
+    }
+    DeleteCriticalSection(&oidInfoCS);
+}
+
+BOOL WINAPI CryptEnumOIDInfo(DWORD dwGroupId, DWORD dwFlags, void *pvArg,
+ PFN_CRYPT_ENUM_OID_INFO pfnEnumOIDInfo)
+{
+    BOOL ret = TRUE;
+    struct OIDInfo *info;
+
+    TRACE("(%ld, %08lx, %p, %p)\n", dwGroupId, dwFlags, pvArg,
+     pfnEnumOIDInfo);
+
+    EnterCriticalSection(&oidInfoCS);
+    LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
+    {
+        if (!dwGroupId || dwGroupId == info->info.dwGroupId)
+        {
+            ret = pfnEnumOIDInfo(&info->info, pvArg);
+            if (!ret)
+                break;
+        }
+    }
+    LeaveCriticalSection(&oidInfoCS);
+    return ret;
+}
+
+PCCRYPT_OID_INFO WINAPI CryptFindOIDInfo(DWORD dwKeyType, void *pvKey,
+ DWORD dwGroupId)
+{
+    PCCRYPT_OID_INFO ret = NULL;
+
+    TRACE("(%ld, %p, %ld)\n", dwKeyType, pvKey, dwGroupId);
+
+    switch(dwKeyType)
+    {
+    case CRYPT_OID_INFO_ALGID_KEY:
+    {
+        struct OIDInfo *info;
+
+        EnterCriticalSection(&oidInfoCS);
+        LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
+        {
+            if (info->info.u.Algid == *(DWORD *)pvKey &&
+             (!dwGroupId || info->info.dwGroupId == dwGroupId))
+            {
+                ret = &info->info;
+                break;
+            }
+        }
+        LeaveCriticalSection(&oidInfoCS);
+        break;
+    }
+    case CRYPT_OID_INFO_NAME_KEY:
+    {
+        struct OIDInfo *info;
+
+        EnterCriticalSection(&oidInfoCS);
+        LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
+        {
+            if (!lstrcmpW(info->info.pwszName, (LPWSTR)pvKey) &&
+             (!dwGroupId || info->info.dwGroupId == dwGroupId))
+            {
+                ret = &info->info;
+                break;
+            }
+        }
+        LeaveCriticalSection(&oidInfoCS);
+        break;
+    }
+    case CRYPT_OID_INFO_OID_KEY:
+    {
+        struct OIDInfo *info;
+        LPSTR oid = (LPSTR)pvKey;
+
+        EnterCriticalSection(&oidInfoCS);
+        LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
+        {
+            if (!lstrcmpA(info->info.pszOID, oid) &&
+             (!dwGroupId || info->info.dwGroupId == dwGroupId))
+            {
+                ret = &info->info;
+                break;
+            }
+        }
+        LeaveCriticalSection(&oidInfoCS);
+        break;
+    }
+    case CRYPT_OID_INFO_SIGN_KEY:
+    {
+        struct OIDInfo *info;
+
+        EnterCriticalSection(&oidInfoCS);
+        LIST_FOR_EACH_ENTRY(info, &oidInfo, struct OIDInfo, entry)
+        {
+            if (info->info.u.Algid == *(DWORD *)pvKey &&
+             info->info.ExtraInfo.cbData >= sizeof(DWORD) &&
+             *(DWORD *)info->info.ExtraInfo.pbData ==
+             *(DWORD *)((LPBYTE)pvKey + sizeof(DWORD)) &&
+             (!dwGroupId || info->info.dwGroupId == dwGroupId))
+            {
+                ret = &info->info;
+                break;
+            }
+        }
+        LeaveCriticalSection(&oidInfoCS);
+        break;
+    }
+    }
+    return ret;
+}
+
+LPCSTR WINAPI CertAlgIdToOID(DWORD dwAlgId)
+{
+    LPCSTR ret;
+    PCCRYPT_OID_INFO info = CryptFindOIDInfo(CRYPT_OID_INFO_ALGID_KEY,
+     &dwAlgId, 0);
+
+    if (info)
+        ret = info->pszOID;
+    else
+        ret = NULL;
+    return ret;
+}
+
+DWORD WINAPI CertOIDToAlgId(LPCSTR pszObjId)
+{
+    DWORD ret;
+    PCCRYPT_OID_INFO info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY,
+     (void *)pszObjId, 0);
+
+    if (info)
+        ret = info->u.Algid;
+    else
+        ret = 0;
+    return ret;
+}
diff --git a/reactos/dll/win32/crypt32/proplist.c b/reactos/dll/win32/crypt32/proplist.c
new file mode 100644 (file)
index 0000000..6671f0f
--- /dev/null
@@ -0,0 +1,215 @@
+/*\r
+ * Copyright 2004-2006 Juan Lang\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ */\r
+#include <assert.h>\r
+#include <stdarg.h>\r
+#include "windef.h"\r
+#include "winbase.h"\r
+#include "wincrypt.h"\r
+#include "wine/debug.h"\r
+#include "wine/list.h"\r
+#include "crypt32_private.h"\r
+\r
+WINE_DEFAULT_DEBUG_CHANNEL(crypt);\r
+\r
+typedef struct _CONTEXT_PROPERTY_LIST\r
+{\r
+    CRITICAL_SECTION cs;\r
+    struct list      properties;\r
+} CONTEXT_PROPERTY_LIST;\r
+\r
+typedef struct _CONTEXT_PROPERTY\r
+{\r
+    DWORD       propID;\r
+    DWORD       cbData;\r
+    LPBYTE      pbData;\r
+    struct list entry;\r
+} CONTEXT_PROPERTY, *PCONTEXT_PROPERTY;\r
+\r
+PCONTEXT_PROPERTY_LIST ContextPropertyList_Create(void)\r
+{\r
+    PCONTEXT_PROPERTY_LIST list = CryptMemAlloc(sizeof(CONTEXT_PROPERTY_LIST));\r
+\r
+    if (list)\r
+    {\r
+        InitializeCriticalSection(&list->cs);\r
+        list_init(&list->properties);\r
+    }\r
+    return list;\r
+}\r
+\r
+void ContextPropertyList_Free(PCONTEXT_PROPERTY_LIST list)\r
+{\r
+    PCONTEXT_PROPERTY prop, next;\r
+\r
+    LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY,\r
+     entry)\r
+    {\r
+        list_remove(&prop->entry);\r
+        CryptMemFree(prop->pbData);\r
+        CryptMemFree(prop);\r
+    }\r
+    DeleteCriticalSection(&list->cs);\r
+    CryptMemFree(list);\r
+}\r
+\r
+BOOL ContextPropertyList_FindProperty(PCONTEXT_PROPERTY_LIST list, DWORD id,\r
+ PCRYPT_DATA_BLOB blob)\r
+{\r
+    PCONTEXT_PROPERTY prop;\r
+    BOOL ret = FALSE;\r
+\r
+    TRACE("(%p, %ld, %p)\n", list, id, blob);\r
+\r
+    EnterCriticalSection(&list->cs);\r
+    LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry)\r
+    {\r
+        if (prop->propID == id)\r
+        {\r
+            blob->cbData = prop->cbData;\r
+            blob->pbData = prop->pbData;\r
+            ret = TRUE;\r
+            break;\r
+        }\r
+    }\r
+    LeaveCriticalSection(&list->cs);\r
+    return ret;\r
+}\r
+\r
+BOOL ContextPropertyList_SetProperty(PCONTEXT_PROPERTY_LIST list, DWORD id,\r
+ const BYTE *pbData, size_t cbData)\r
+{\r
+    LPBYTE data;\r
+    BOOL ret = FALSE;\r
+\r
+    if (cbData)\r
+    {\r
+        data = CryptMemAlloc(cbData);\r
+        if (data)\r
+            memcpy(data, pbData, cbData);\r
+    }\r
+    else\r
+        data = NULL;\r
+    if (!cbData || data)\r
+    {\r
+        PCONTEXT_PROPERTY prop;\r
+        BOOL found = FALSE;\r
+\r
+        EnterCriticalSection(&list->cs);\r
+        LIST_FOR_EACH_ENTRY(prop, &list->properties, CONTEXT_PROPERTY, entry)\r
+        {\r
+            if (prop->propID == id)\r
+            {\r
+                found = TRUE;\r
+                break;\r
+            }\r
+        }\r
+        if (found)\r
+        {\r
+            CryptMemFree(prop->pbData);\r
+            prop->cbData = cbData;\r
+            prop->pbData = data;\r
+            ret = TRUE;\r
+        }\r
+        else\r
+        {\r
+            prop = CryptMemAlloc(sizeof(CONTEXT_PROPERTY));\r
+            if (prop)\r
+            {\r
+                prop->propID = id;\r
+                prop->cbData = cbData;\r
+                list_init(&prop->entry);\r
+                prop->pbData = data;\r
+                list_add_tail(&list->properties, &prop->entry);\r
+                ret = TRUE;\r
+            }\r
+            else\r
+                CryptMemFree(data);\r
+        }\r
+        LeaveCriticalSection(&list->cs);\r
+    }\r
+    return ret;\r
+}\r
+\r
+void ContextPropertyList_RemoveProperty(PCONTEXT_PROPERTY_LIST list, DWORD id)\r
+{\r
+    PCONTEXT_PROPERTY prop, next;\r
+\r
+    EnterCriticalSection(&list->cs);\r
+    LIST_FOR_EACH_ENTRY_SAFE(prop, next, &list->properties, CONTEXT_PROPERTY,\r
+     entry)\r
+    {\r
+        if (prop->propID == id)\r
+        {\r
+            list_remove(&prop->entry);\r
+            CryptMemFree(prop->pbData);\r
+            CryptMemFree(prop);\r
+        }\r
+    }\r
+    LeaveCriticalSection(&list->cs);\r
+}\r
+\r
+/* Since the properties are stored in a list, this is a tad inefficient\r
+ * (O(n^2)) since I have to find the previous position every time.\r
+ */\r
+DWORD ContextPropertyList_EnumPropIDs(PCONTEXT_PROPERTY_LIST list, DWORD id)\r
+{\r
+    DWORD ret;\r
+\r
+    EnterCriticalSection(&list->cs);\r
+    if (id)\r
+    {\r
+        PCONTEXT_PROPERTY cursor = NULL;\r
+\r
+        LIST_FOR_EACH_ENTRY(cursor, &list->properties, CONTEXT_PROPERTY, entry)\r
+        {\r
+            if (cursor->propID == id)\r
+                break;\r
+        }\r
+        if (cursor)\r
+        {\r
+            if (cursor->entry.next != &list->properties)\r
+                ret = LIST_ENTRY(cursor->entry.next, CONTEXT_PROPERTY,\r
+                 entry)->propID;\r
+            else\r
+                ret = 0;\r
+        }\r
+        else\r
+            ret = 0;\r
+    }\r
+    else if (!list_empty(&list->properties))\r
+        ret = LIST_ENTRY(list->properties.next, CONTEXT_PROPERTY,\r
+         entry)->propID;\r
+    else\r
+        ret = 0;\r
+    LeaveCriticalSection(&list->cs);\r
+    return ret;\r
+}\r
+\r
+void ContextPropertyList_Copy(PCONTEXT_PROPERTY_LIST to,\r
+ PCONTEXT_PROPERTY_LIST from)\r
+{\r
+    PCONTEXT_PROPERTY prop;\r
+\r
+    EnterCriticalSection(&from->cs);\r
+    LIST_FOR_EACH_ENTRY(prop, &from->properties, CONTEXT_PROPERTY, entry)\r
+    {\r
+        ContextPropertyList_SetProperty(to, prop->propID, prop->pbData,\r
+         prop->cbData);\r
+    }\r
+    LeaveCriticalSection(&from->cs);\r
+}\r
diff --git a/reactos/dll/win32/crypt32/serialize.c b/reactos/dll/win32/crypt32/serialize.c
new file mode 100644 (file)
index 0000000..228bf2d
--- /dev/null
@@ -0,0 +1,515 @@
+/*\r
+ * Copyright 2004-2006 Juan Lang\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ */\r
+#include <stdarg.h>\r
+#include "windef.h"\r
+#include "winbase.h"\r
+#include "wincrypt.h"\r
+#include "wine/debug.h"\r
+#include "excpt.h"\r
+#include "wine/exception.h"\r
+#include "crypt32_private.h"\r
+\r
+WINE_DEFAULT_DEBUG_CHANNEL(crypt);\r
+\r
+/* Some typedefs that make it easier to abstract which type of context we're\r
+ * working with.\r
+ */\r
+typedef const void *(WINAPI *CreateContextFunc)(DWORD dwCertEncodingType,\r
+ const BYTE *pbCertEncoded, DWORD cbCertEncoded);\r
+typedef BOOL (WINAPI *AddContextToStoreFunc)(HCERTSTORE hCertStore,\r
+ const void *context, DWORD dwAddDisposition, const void **ppStoreContext);\r
+typedef BOOL (WINAPI *AddEncodedContextToStoreFunc)(HCERTSTORE hCertStore,\r
+ DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded,\r
+ DWORD dwAddDisposition, const void **ppContext);\r
+typedef const void *(WINAPI *EnumContextsInStoreFunc)(HCERTSTORE hCertStore,\r
+ const void *pPrevContext);\r
+typedef BOOL (WINAPI *GetContextPropertyFunc)(const void *context,\r
+ DWORD dwPropID, void *pvData, DWORD *pcbData);\r
+typedef BOOL (WINAPI *SetContextPropertyFunc)(const void *context,\r
+ DWORD dwPropID, DWORD dwFlags, const void *pvData);\r
+typedef BOOL (WINAPI *SerializeElementFunc)(const void *context, DWORD dwFlags,\r
+ BYTE *pbElement, DWORD *pcbElement);\r
+typedef BOOL (WINAPI *FreeContextFunc)(const void *context);\r
+typedef BOOL (WINAPI *DeleteContextFunc)(const void *context);\r
+\r
+/* An abstract context (certificate, CRL, or CTL) interface */\r
+typedef struct _WINE_CONTEXT_INTERFACE\r
+{\r
+    CreateContextFunc            create;\r
+    AddContextToStoreFunc        addContextToStore;\r
+    AddEncodedContextToStoreFunc addEncodedToStore;\r
+    EnumContextsInStoreFunc      enumContextsInStore;\r
+    GetContextPropertyFunc       getProp;\r
+    SetContextPropertyFunc       setProp;\r
+    SerializeElementFunc         serialize;\r
+    FreeContextFunc              free;\r
+    DeleteContextFunc            deleteFromStore;\r
+} WINE_CONTEXT_INTERFACE, *PWINE_CONTEXT_INTERFACE;\r
+\r
+static const WINE_CONTEXT_INTERFACE gCertInterface = {\r
+    (CreateContextFunc)CertCreateCertificateContext,\r
+    (AddContextToStoreFunc)CertAddCertificateContextToStore,\r
+    (AddEncodedContextToStoreFunc)CertAddEncodedCertificateToStore,\r
+    (EnumContextsInStoreFunc)CertEnumCertificatesInStore,\r
+    (GetContextPropertyFunc)CertGetCertificateContextProperty,\r
+    (SetContextPropertyFunc)CertSetCertificateContextProperty,\r
+    (SerializeElementFunc)CertSerializeCertificateStoreElement,\r
+    (FreeContextFunc)CertFreeCertificateContext,\r
+    (DeleteContextFunc)CertDeleteCertificateFromStore,\r
+};\r
+\r
+static const WINE_CONTEXT_INTERFACE gCRLInterface = {\r
+    (CreateContextFunc)CertCreateCRLContext,\r
+    (AddContextToStoreFunc)CertAddCRLContextToStore,\r
+    (AddEncodedContextToStoreFunc)CertAddEncodedCRLToStore,\r
+    (EnumContextsInStoreFunc)CertEnumCRLsInStore,\r
+    (GetContextPropertyFunc)CertGetCRLContextProperty,\r
+    (SetContextPropertyFunc)CertSetCRLContextProperty,\r
+    (SerializeElementFunc)CertSerializeCRLStoreElement,\r
+    (FreeContextFunc)CertFreeCRLContext,\r
+    (DeleteContextFunc)CertDeleteCRLFromStore,\r
+};\r
+\r
+static const WINE_CONTEXT_INTERFACE gCTLInterface = {\r
+    (CreateContextFunc)CertCreateCTLContext,\r
+    (AddContextToStoreFunc)CertAddCTLContextToStore,\r
+    (AddEncodedContextToStoreFunc)CertAddEncodedCTLToStore,\r
+    (EnumContextsInStoreFunc)CertEnumCTLsInStore,\r
+    (GetContextPropertyFunc)CertGetCTLContextProperty,\r
+    (SetContextPropertyFunc)CertSetCTLContextProperty,\r
+    (SerializeElementFunc)CertSerializeCTLStoreElement,\r
+    (FreeContextFunc)CertFreeCTLContext,\r
+    (DeleteContextFunc)CertDeleteCTLFromStore,\r
+};\r
+\r
+/* An extended certificate property in serialized form is prefixed by this\r
+ * header.\r
+ */\r
+typedef struct _WINE_CERT_PROP_HEADER\r
+{\r
+    DWORD propID;\r
+    DWORD unknown; /* always 1 */\r
+    DWORD cb;\r
+} WINE_CERT_PROP_HEADER, *PWINE_CERT_PROP_HEADER;\r
+\r
+BOOL WINAPI CertSerializeCRLStoreElement(PCCRL_CONTEXT pCrlContext,\r
+ DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement)\r
+{\r
+    FIXME("(%p, %08lx, %p, %p): stub\n", pCrlContext, dwFlags, pbElement,\r
+     pcbElement);\r
+    return FALSE;\r
+}\r
+\r
+BOOL WINAPI CertSerializeCTLStoreElement(PCCTL_CONTEXT pCtlContext,\r
+ DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement)\r
+{\r
+    FIXME("(%p, %08lx, %p, %p): stub\n", pCtlContext, dwFlags, pbElement,\r
+     pcbElement);\r
+    return FALSE;\r
+}\r
+\r
+BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext,\r
+ DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement)\r
+{\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %08lx, %p, %p)\n", pCertContext, dwFlags, pbElement,\r
+     pcbElement);\r
+\r
+    if (pCertContext)\r
+    {\r
+        DWORD bytesNeeded = sizeof(WINE_CERT_PROP_HEADER) +\r
+         pCertContext->cbCertEncoded;\r
+        DWORD prop = 0;\r
+\r
+        ret = TRUE;\r
+        do {\r
+            prop = CertEnumCertificateContextProperties(pCertContext, prop);\r
+            if (prop)\r
+            {\r
+                DWORD propSize = 0;\r
+\r
+                ret = CertGetCertificateContextProperty(pCertContext,\r
+                 prop, NULL, &propSize);\r
+                if (ret)\r
+                    bytesNeeded += sizeof(WINE_CERT_PROP_HEADER) + propSize;\r
+            }\r
+        } while (ret && prop != 0);\r
+\r
+        if (!pbElement)\r
+        {\r
+            *pcbElement = bytesNeeded;\r
+            ret = TRUE;\r
+        }\r
+        else if (*pcbElement < bytesNeeded)\r
+        {\r
+            *pcbElement = bytesNeeded;\r
+            SetLastError(ERROR_MORE_DATA);\r
+            ret = FALSE;\r
+        }\r
+        else\r
+        {\r
+            PWINE_CERT_PROP_HEADER hdr;\r
+            DWORD bufSize = 0;\r
+            LPBYTE buf = NULL;\r
+\r
+            prop = 0;\r
+            do {\r
+                prop = CertEnumCertificateContextProperties(pCertContext, prop);\r
+                if (prop)\r
+                {\r
+                    DWORD propSize = 0;\r
+\r
+                    ret = CertGetCertificateContextProperty(pCertContext,\r
+                     prop, NULL, &propSize);\r
+                    if (ret)\r
+                    {\r
+                        if (bufSize < propSize)\r
+                        {\r
+                            if (buf)\r
+                                buf = CryptMemRealloc(buf, propSize);\r
+                            else\r
+                                buf = CryptMemAlloc(propSize);\r
+                            bufSize = propSize;\r
+                        }\r
+                        if (buf)\r
+                        {\r
+                            ret = CertGetCertificateContextProperty(\r
+                             pCertContext, prop, buf, &propSize);\r
+                            if (ret)\r
+                            {\r
+                                hdr = (PWINE_CERT_PROP_HEADER)pbElement;\r
+                                hdr->propID = prop;\r
+                                hdr->unknown = 1;\r
+                                hdr->cb = propSize;\r
+                                pbElement += sizeof(WINE_CERT_PROP_HEADER);\r
+                                if (propSize)\r
+                                {\r
+                                    memcpy(pbElement, buf, propSize);\r
+                                    pbElement += propSize;\r
+                                }\r
+                            }\r
+                        }\r
+                        else\r
+                            ret = FALSE;\r
+                    }\r
+                }\r
+            } while (ret && prop != 0);\r
+            CryptMemFree(buf);\r
+\r
+            hdr = (PWINE_CERT_PROP_HEADER)pbElement;\r
+            hdr->propID = CERT_CERT_PROP_ID;\r
+            hdr->unknown = 1;\r
+            hdr->cb = pCertContext->cbCertEncoded;\r
+            memcpy(pbElement + sizeof(WINE_CERT_PROP_HEADER),\r
+             pCertContext->pbCertEncoded, pCertContext->cbCertEncoded);\r
+        }\r
+    }\r
+    else\r
+        ret = FALSE;\r
+    return ret;\r
+}\r
+\r
+/* Looks for the property with ID propID in the buffer buf.  Returns a pointer\r
+ * to its header if a valid header is found, NULL if not.  Valid means the\r
+ * length of thte property won't overrun buf, and the unknown field is 1.\r
+ */\r
+static const WINE_CERT_PROP_HEADER *CRYPT_findPropID(const BYTE *buf,\r
+ DWORD size, DWORD propID)\r
+{\r
+    const WINE_CERT_PROP_HEADER *ret = NULL;\r
+    BOOL done = FALSE;\r
+\r
+    while (size && !ret && !done)\r
+    {\r
+        if (size < sizeof(WINE_CERT_PROP_HEADER))\r
+        {\r
+            SetLastError(CRYPT_E_FILE_ERROR);\r
+            done = TRUE;\r
+        }\r
+        else\r
+        {\r
+            const WINE_CERT_PROP_HEADER *hdr =\r
+             (const WINE_CERT_PROP_HEADER *)buf;\r
+\r
+            size -= sizeof(WINE_CERT_PROP_HEADER);\r
+            buf += sizeof(WINE_CERT_PROP_HEADER);\r
+            if (size < hdr->cb)\r
+            {\r
+                SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+                done = TRUE;\r
+            }\r
+            else if (!hdr->propID)\r
+            {\r
+                /* assume a zero prop ID means the data are uninitialized, so\r
+                 * stop looking.\r
+                 */\r
+                done = TRUE;\r
+            }\r
+            else if (hdr->unknown != 1)\r
+            {\r
+                SetLastError(ERROR_FILE_NOT_FOUND);\r
+                done = TRUE;\r
+            }\r
+            else if (hdr->propID == propID)\r
+                ret = hdr;\r
+            else\r
+            {\r
+                buf += hdr->cb;\r
+                size -= hdr->cb;\r
+            }\r
+        }\r
+    }\r
+    return ret;\r
+}\r
+\r
+const void *CRYPT_ReadSerializedElement(const BYTE *pbElement, DWORD cbElement,\r
+ DWORD dwContextTypeFlags, DWORD *pdwContentType)\r
+{\r
+    const void *context;\r
+\r
+    TRACE("(%p, %ld, %08lx, %p)\n", pbElement, cbElement, dwContextTypeFlags,\r
+     pdwContentType);\r
+\r
+    if (!cbElement)\r
+    {\r
+        SetLastError(ERROR_END_OF_MEDIA);\r
+        return NULL;\r
+    }\r
+\r
+    __TRY\r
+    {\r
+        const WINE_CONTEXT_INTERFACE *contextInterface = NULL;\r
+        const WINE_CERT_PROP_HEADER *hdr = NULL;\r
+        DWORD type = 0;\r
+        BOOL ret;\r
+\r
+        ret = TRUE;\r
+        context = NULL;\r
+        if (dwContextTypeFlags == CERT_STORE_ALL_CONTEXT_FLAG)\r
+        {\r
+            hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CERT_PROP_ID);\r
+            if (hdr)\r
+                type = CERT_STORE_CERTIFICATE_CONTEXT;\r
+            else\r
+            {\r
+                hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CRL_PROP_ID);\r
+                if (hdr)\r
+                    type = CERT_STORE_CRL_CONTEXT;\r
+                else\r
+                {\r
+                    hdr = CRYPT_findPropID(pbElement, cbElement,\r
+                     CERT_CTL_PROP_ID);\r
+                    if (hdr)\r
+                        type = CERT_STORE_CTL_CONTEXT;\r
+                }\r
+            }\r
+        }\r
+        else if (dwContextTypeFlags & CERT_STORE_CERTIFICATE_CONTEXT_FLAG)\r
+        {\r
+            hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CERT_PROP_ID);\r
+            type = CERT_STORE_CERTIFICATE_CONTEXT;\r
+        }\r
+        else if (dwContextTypeFlags & CERT_STORE_CRL_CONTEXT_FLAG)\r
+        {\r
+            hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CRL_PROP_ID);\r
+            type = CERT_STORE_CRL_CONTEXT;\r
+        }\r
+        else if (dwContextTypeFlags & CERT_STORE_CTL_CONTEXT_FLAG)\r
+        {\r
+            hdr = CRYPT_findPropID(pbElement, cbElement, CERT_CTL_PROP_ID);\r
+            type = CERT_STORE_CTL_CONTEXT;\r
+        }\r
+\r
+        switch (type)\r
+        {\r
+        case CERT_STORE_CERTIFICATE_CONTEXT:\r
+            contextInterface = &gCertInterface;\r
+            break;\r
+        case CERT_STORE_CRL_CONTEXT:\r
+            contextInterface = &gCRLInterface;\r
+            break;\r
+        case CERT_STORE_CTL_CONTEXT:\r
+            contextInterface = &gCTLInterface;\r
+            break;\r
+        default:\r
+            SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+            ret = FALSE;\r
+        }\r
+        if (!hdr)\r
+            ret = FALSE;\r
+\r
+        if (ret)\r
+            context = contextInterface->create(X509_ASN_ENCODING,\r
+             (BYTE *)hdr + sizeof(WINE_CERT_PROP_HEADER), hdr->cb);\r
+        if (ret && context)\r
+        {\r
+            BOOL noMoreProps = FALSE;\r
+\r
+            while (!noMoreProps && ret)\r
+            {\r
+                if (cbElement < sizeof(WINE_CERT_PROP_HEADER))\r
+                    ret = FALSE;\r
+                else\r
+                {\r
+                    const WINE_CERT_PROP_HEADER *hdr =\r
+                     (const WINE_CERT_PROP_HEADER *)pbElement;\r
+\r
+                    TRACE("prop is %ld\n", hdr->propID);\r
+                    cbElement -= sizeof(WINE_CERT_PROP_HEADER);\r
+                    pbElement += sizeof(WINE_CERT_PROP_HEADER);\r
+                    if (cbElement < hdr->cb)\r
+                    {\r
+                        SetLastError(HRESULT_FROM_WIN32(\r
+                         ERROR_INVALID_PARAMETER));\r
+                        ret = FALSE;\r
+                    }\r
+                    else if (!hdr->propID)\r
+                    {\r
+                        /* Like in CRYPT_findPropID, stop if the propID is zero\r
+                         */\r
+                        noMoreProps = TRUE;\r
+                    }\r
+                    else if (hdr->unknown != 1)\r
+                    {\r
+                        SetLastError(ERROR_FILE_NOT_FOUND);\r
+                        ret = FALSE;\r
+                    }\r
+                    else if (hdr->propID != CERT_CERT_PROP_ID &&\r
+                     hdr->propID != CERT_CRL_PROP_ID && hdr->propID !=\r
+                     CERT_CTL_PROP_ID)\r
+                    {\r
+                        /* Have to create a blob for most types, but not\r
+                         * for all.. arghh.\r
+                         */\r
+                        switch (hdr->propID)\r
+                        {\r
+                        case CERT_AUTO_ENROLL_PROP_ID:\r
+                        case CERT_CTL_USAGE_PROP_ID:\r
+                        case CERT_DESCRIPTION_PROP_ID:\r
+                        case CERT_FRIENDLY_NAME_PROP_ID:\r
+                        case CERT_HASH_PROP_ID:\r
+                        case CERT_KEY_IDENTIFIER_PROP_ID:\r
+                        case CERT_MD5_HASH_PROP_ID:\r
+                        case CERT_NEXT_UPDATE_LOCATION_PROP_ID:\r
+                        case CERT_PUBKEY_ALG_PARA_PROP_ID:\r
+                        case CERT_PVK_FILE_PROP_ID:\r
+                        case CERT_SIGNATURE_HASH_PROP_ID:\r
+                        case CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID:\r
+                        case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID:\r
+                        case CERT_ENROLLMENT_PROP_ID:\r
+                        case CERT_CROSS_CERT_DIST_POINTS_PROP_ID:\r
+                        case CERT_RENEWAL_PROP_ID:\r
+                        {\r
+                            CRYPT_DATA_BLOB blob = { hdr->cb,\r
+                             (LPBYTE)pbElement };\r
+\r
+                            ret = contextInterface->setProp(context,\r
+                             hdr->propID, 0, &blob);\r
+                            break;\r
+                        }\r
+                        case CERT_DATE_STAMP_PROP_ID:\r
+                            ret = contextInterface->setProp(context,\r
+                             hdr->propID, 0, pbElement);\r
+                            break;\r
+                        default:\r
+                            FIXME("prop ID %ld: stub\n", hdr->propID);\r
+                        }\r
+                    }\r
+                    pbElement += hdr->cb;\r
+                    cbElement -= hdr->cb;\r
+                    if (!cbElement)\r
+                        noMoreProps = TRUE;\r
+                }\r
+            }\r
+            if (ret)\r
+            {\r
+                if (pdwContentType)\r
+                    *pdwContentType = type;\r
+            }\r
+            else\r
+            {\r
+                contextInterface->free(context);\r
+                context = NULL;\r
+            }\r
+        }\r
+    }\r
+    __EXCEPT_PAGE_FAULT\r
+    {\r
+        SetLastError(STATUS_ACCESS_VIOLATION);\r
+        context = NULL;\r
+    }\r
+    __ENDTRY\r
+    return context;\r
+}\r
+\r
+BOOL WINAPI CertAddSerializedElementToStore(HCERTSTORE hCertStore,\r
+ const BYTE *pbElement, DWORD cbElement, DWORD dwAddDisposition, DWORD dwFlags,\r
+ DWORD dwContextTypeFlags, DWORD *pdwContentType, const void **ppvContext)\r
+{\r
+    const void *context;\r
+    DWORD type;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %p, %ld, %08lx, %08lx, %08lx, %p, %p)\n", hCertStore,\r
+     pbElement, cbElement, dwAddDisposition, dwFlags, dwContextTypeFlags,\r
+     pdwContentType, ppvContext);\r
+\r
+    /* Call the internal function, then delete the hashes.  Tests show this\r
+     * function uses real hash values, not whatever's stored in the hash\r
+     * property.\r
+     */\r
+    context = CRYPT_ReadSerializedElement(pbElement, cbElement,\r
+     dwContextTypeFlags, &type);\r
+    if (context)\r
+    {\r
+        const WINE_CONTEXT_INTERFACE *contextInterface = NULL;\r
+\r
+        switch (type)\r
+        {\r
+        case CERT_STORE_CERTIFICATE_CONTEXT:\r
+            contextInterface = &gCertInterface;\r
+            break;\r
+        case CERT_STORE_CRL_CONTEXT:\r
+            contextInterface = &gCRLInterface;\r
+            break;\r
+        case CERT_STORE_CTL_CONTEXT:\r
+            contextInterface = &gCTLInterface;\r
+            break;\r
+        default:\r
+            SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        }\r
+        if (contextInterface)\r
+        {\r
+            contextInterface->setProp(context, CERT_HASH_PROP_ID, 0, NULL);\r
+            contextInterface->setProp(context, CERT_MD5_HASH_PROP_ID, 0, NULL);\r
+            contextInterface->setProp(context, CERT_SIGNATURE_HASH_PROP_ID, 0,\r
+             NULL);\r
+            if (pdwContentType)\r
+                *pdwContentType = type;\r
+            ret = contextInterface->addContextToStore(hCertStore, context,\r
+             dwAddDisposition, ppvContext);\r
+            contextInterface->free(context);\r
+        }\r
+        else\r
+            ret = FALSE;\r
+    }\r
+    else\r
+        ret = FALSE;\r
+    return ret;\r
+}\r
diff --git a/reactos/dll/win32/crypt32/store.c b/reactos/dll/win32/crypt32/store.c
new file mode 100644 (file)
index 0000000..3b52171
--- /dev/null
@@ -0,0 +1,2666 @@
+/*\r
+ * Copyright 2002 Mike McCormack for CodeWeavers\r
+ * Copyright 2004-2006 Juan Lang\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ *\r
+ * FIXME:\r
+ * - As you can see in the stubs below, support for CRLs and CTLs is missing.\r
+ *   Mostly this should be copy-paste work, and some code (e.g. extended\r
+ *   properties) could be shared between them.\r
+ * - The concept of physical stores and locations isn't implemented.  (This\r
+ *   doesn't mean registry stores et al aren't implemented.  See the PSDK for\r
+ *   registering and enumerating physical stores and locations.)\r
+ * - Many flags, options and whatnot are unimplemented.\r
+ */\r
+\r
+#include <assert.h>\r
+#include <stdarg.h>\r
+#include "windef.h"\r
+#include "winbase.h"\r
+#include "winnls.h"\r
+#include "winreg.h"\r
+#include "winuser.h"\r
+#include "wincrypt.h"\r
+#include "wine/debug.h"\r
+#include "wine/list.h"\r
+#include "excpt.h"\r
+#include "wine/exception.h"\r
+#include "crypt32_private.h"\r
+\r
+WINE_DEFAULT_DEBUG_CHANNEL(crypt);\r
+\r
+#define WINE_CRYPTCERTSTORE_MAGIC 0x74726563\r
+\r
+/* Some typedefs that make it easier to abstract which type of context we're\r
+ * working with.\r
+ */\r
+typedef const void *(WINAPI *CreateContextFunc)(DWORD dwCertEncodingType,\r
+ const BYTE *pbCertEncoded, DWORD cbCertEncoded);\r
+typedef BOOL (WINAPI *AddContextToStoreFunc)(HCERTSTORE hCertStore,\r
+ const void *context, DWORD dwAddDisposition, const void **ppStoreContext);\r
+typedef BOOL (WINAPI *AddEncodedContextToStoreFunc)(HCERTSTORE hCertStore,\r
+ DWORD dwCertEncodingType, const BYTE *pbEncoded, DWORD cbEncoded,\r
+ DWORD dwAddDisposition, const void **ppContext);\r
+typedef const void *(WINAPI *EnumContextsInStoreFunc)(HCERTSTORE hCertStore,\r
+ const void *pPrevContext);\r
+typedef BOOL (WINAPI *GetContextPropertyFunc)(const void *context,\r
+ DWORD dwPropID, void *pvData, DWORD *pcbData);\r
+typedef BOOL (WINAPI *SetContextPropertyFunc)(const void *context,\r
+ DWORD dwPropID, DWORD dwFlags, const void *pvData);\r
+typedef BOOL (WINAPI *SerializeElementFunc)(const void *context, DWORD dwFlags,\r
+ BYTE *pbElement, DWORD *pcbElement);\r
+typedef BOOL (WINAPI *FreeContextFunc)(const void *context);\r
+typedef BOOL (WINAPI *DeleteContextFunc)(const void *context);\r
+\r
+/* An abstract context (certificate, CRL, or CTL) interface */\r
+typedef struct _WINE_CONTEXT_INTERFACE\r
+{\r
+    CreateContextFunc            create;\r
+    AddContextToStoreFunc        addContextToStore;\r
+    AddEncodedContextToStoreFunc addEncodedToStore;\r
+    EnumContextsInStoreFunc      enumContextsInStore;\r
+    GetContextPropertyFunc       getProp;\r
+    SetContextPropertyFunc       setProp;\r
+    SerializeElementFunc         serialize;\r
+    FreeContextFunc              free;\r
+    DeleteContextFunc            deleteFromStore;\r
+} WINE_CONTEXT_INTERFACE, *PWINE_CONTEXT_INTERFACE;\r
+\r
+static const WINE_CONTEXT_INTERFACE gCertInterface = {\r
+    (CreateContextFunc)CertCreateCertificateContext,\r
+    (AddContextToStoreFunc)CertAddCertificateContextToStore,\r
+    (AddEncodedContextToStoreFunc)CertAddEncodedCertificateToStore,\r
+    (EnumContextsInStoreFunc)CertEnumCertificatesInStore,\r
+    (GetContextPropertyFunc)CertGetCertificateContextProperty,\r
+    (SetContextPropertyFunc)CertSetCertificateContextProperty,\r
+    (SerializeElementFunc)CertSerializeCertificateStoreElement,\r
+    (FreeContextFunc)CertFreeCertificateContext,\r
+    (DeleteContextFunc)CertDeleteCertificateFromStore,\r
+};\r
+\r
+static const WINE_CONTEXT_INTERFACE gCRLInterface = {\r
+    (CreateContextFunc)CertCreateCRLContext,\r
+    (AddContextToStoreFunc)CertAddCRLContextToStore,\r
+    (AddEncodedContextToStoreFunc)CertAddEncodedCRLToStore,\r
+    (EnumContextsInStoreFunc)CertEnumCRLsInStore,\r
+    (GetContextPropertyFunc)CertGetCRLContextProperty,\r
+    (SetContextPropertyFunc)CertSetCRLContextProperty,\r
+    (SerializeElementFunc)CertSerializeCRLStoreElement,\r
+    (FreeContextFunc)CertFreeCRLContext,\r
+    (DeleteContextFunc)CertDeleteCRLFromStore,\r
+};\r
+\r
+static const WINE_CONTEXT_INTERFACE gCTLInterface = {\r
+    (CreateContextFunc)CertCreateCTLContext,\r
+    (AddContextToStoreFunc)CertAddCTLContextToStore,\r
+    (AddEncodedContextToStoreFunc)CertAddEncodedCTLToStore,\r
+    (EnumContextsInStoreFunc)CertEnumCTLsInStore,\r
+    (GetContextPropertyFunc)CertGetCTLContextProperty,\r
+    (SetContextPropertyFunc)CertSetCTLContextProperty,\r
+    (SerializeElementFunc)CertSerializeCTLStoreElement,\r
+    (FreeContextFunc)CertFreeCTLContext,\r
+    (DeleteContextFunc)CertDeleteCTLFromStore,\r
+};\r
+\r
+struct WINE_CRYPTCERTSTORE;\r
+\r
+typedef struct WINE_CRYPTCERTSTORE * (*StoreOpenFunc)(HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, const void *pvPara);\r
+\r
+struct _WINE_CERT_CONTEXT;\r
+\r
+/* Called to enumerate the next certificate in a store. */\r
+typedef struct _WINE_CERT_CONTEXT * (*EnumCertFunc)\r
+ (struct WINE_CRYPTCERTSTORE *store, struct _WINE_CERT_CONTEXT *pPrev);\r
+\r
+/* Called to add a new certificate context to a store.  If ppStoreContext is\r
+ * not NULL, the added context should be returned in *ppStoreContext.\r
+ */\r
+typedef BOOL (*AddCertFunc)(struct WINE_CRYPTCERTSTORE *store,\r
+ struct _WINE_CERT_CONTEXT *context, DWORD dwAddDisposition,\r
+ PCCERT_CONTEXT *ppStoreContext);\r
+\r
+typedef enum _CertStoreType {\r
+    StoreTypeMem,\r
+    StoreTypeCollection,\r
+    StoreTypeProvider,\r
+} CertStoreType;\r
+\r
+/* A cert store is polymorphic through the use of function pointers.  A type\r
+ * is still needed to distinguish collection stores from other types.\r
+ * On the function pointers:\r
+ * - closeStore is called when the store's ref count becomes 0\r
+ * - control is optional, but should be implemented by any store that supports\r
+ *   persistence\r
+ */\r
+typedef struct WINE_CRYPTCERTSTORE\r
+{\r
+    DWORD                           dwMagic;\r
+    LONG                            ref;\r
+    DWORD                           dwOpenFlags;\r
+    HCRYPTPROV                      cryptProv;\r
+    CertStoreType                   type;\r
+    PFN_CERT_STORE_PROV_CLOSE       closeStore;\r
+    AddCertFunc                     addCert;\r
+    EnumCertFunc                    enumCert;\r
+    PFN_CERT_STORE_PROV_DELETE_CERT deleteCert;\r
+    PFN_CERT_STORE_PROV_CONTROL     control;    /* optional */\r
+} WINECRYPT_CERTSTORE, *PWINECRYPT_CERTSTORE;\r
+\r
+typedef enum _ContextType {\r
+    ContextTypeData,\r
+    ContextTypeLink,\r
+} ContextType;\r
+\r
+/* A certificate context.  This is the base type, and the two real types\r
+ * (data and link) derive from it.  Each one can be cast to a PCCERT_CONTEXT.\r
+ */\r
+typedef struct _WINE_CERT_CONTEXT\r
+{\r
+    CERT_CONTEXT cert;\r
+    LONG         ref;\r
+    ContextType  type;\r
+} WINE_CERT_CONTEXT, *PWINE_CERT_CONTEXT;\r
+typedef const struct _WINE_CERT_CONTEXT PCWINE_CERT_CONTEXT;\r
+\r
+typedef struct _WINE_CERT_CONTEXT_DATA\r
+{\r
+    CERT_CONTEXT           cert;\r
+    LONG                   ref;\r
+    ContextType            type; /* always ContextTypeData */\r
+    PCONTEXT_PROPERTY_LIST properties;\r
+} WINE_CERT_CONTEXT_DATA, *PWINE_CERT_CONTEXT_DATA;\r
+typedef const struct _WINE_CERT_CONTEXT_DATA PCWINE_CERT_CONTEXT_DATA;\r
+\r
+typedef struct _WINE_CERT_CONTEXT_LINK\r
+{\r
+    CERT_CONTEXT       cert;\r
+    LONG               ref;\r
+    ContextType        type; /* always ContextTypeLink */\r
+    PWINE_CERT_CONTEXT linked;\r
+} WINE_CERT_CONTEXT_LINK, *PWINE_CERT_CONTEXT_LINK;\r
+typedef const struct _WINE_CERT_CONTEXT_LINK PCWINE_CERT_CONTEXT_LINK;\r
+\r
+/* A mem store has a list of these.  They're also returned by the mem store\r
+ * during enumeration.\r
+ */\r
+typedef struct _WINE_CERT_LIST_ENTRY\r
+{\r
+    WINE_CERT_CONTEXT_LINK cert;\r
+    struct list entry;\r
+} WINE_CERT_LIST_ENTRY, *PWINE_CERT_LIST_ENTRY;\r
+\r
+typedef struct _WINE_MEMSTORE\r
+{\r
+    WINECRYPT_CERTSTORE hdr;\r
+    CRITICAL_SECTION    cs;\r
+    struct list         certs;\r
+} WINE_MEMSTORE, *PWINE_MEMSTORE;\r
+\r
+typedef struct _WINE_HASH_TO_DELETE\r
+{\r
+    BYTE        hash[20];\r
+    struct list entry;\r
+} WINE_HASH_TO_DELETE, *PWINE_HASH_TO_DELETE;\r
+\r
+typedef struct _WINE_REGSTOREINFO\r
+{\r
+    DWORD                dwOpenFlags;\r
+    HCRYPTPROV           cryptProv;\r
+    PWINECRYPT_CERTSTORE memStore;\r
+    HKEY                 key;\r
+    BOOL                 dirty;\r
+    CRITICAL_SECTION     cs;\r
+    struct list          certsToDelete;\r
+} WINE_REGSTOREINFO, *PWINE_REGSTOREINFO;\r
+\r
+typedef struct _WINE_STORE_LIST_ENTRY\r
+{\r
+    PWINECRYPT_CERTSTORE store;\r
+    DWORD                dwUpdateFlags;\r
+    DWORD                dwPriority;\r
+    struct list          entry;\r
+} WINE_STORE_LIST_ENTRY, *PWINE_STORE_LIST_ENTRY;\r
+\r
+/* Returned by a collection store during enumeration.\r
+ * Note: relies on the list entry being valid after use, which a number of\r
+ * conditions might make untrue (reentrancy, closing a collection store before\r
+ * continuing an enumeration on it, ...).  The tests seem to indicate this\r
+ * sort of unsafety is okay, since Windows isn't well-behaved in these\r
+ * scenarios either.\r
+ */\r
+typedef struct _WINE_COLLECTION_CERT_CONTEXT\r
+{\r
+    WINE_CERT_CONTEXT_LINK  cert;\r
+    PWINE_STORE_LIST_ENTRY storeEntry;\r
+} WINE_COLLECTION_CERT_CONTEXT, *PWINE_COLLECTION_CERT_CONTEXT;\r
+\r
+typedef struct _WINE_COLLECTIONSTORE\r
+{\r
+    WINECRYPT_CERTSTORE hdr;\r
+    CRITICAL_SECTION    cs;\r
+    struct list         stores;\r
+} WINE_COLLECTIONSTORE, *PWINE_COLLECTIONSTORE;\r
+\r
+typedef struct _WINE_PROVIDERSTORE\r
+{\r
+    WINECRYPT_CERTSTORE             hdr;\r
+    DWORD                           dwStoreProvFlags;\r
+    PWINECRYPT_CERTSTORE            memStore;\r
+    HCERTSTOREPROV                  hStoreProv;\r
+    PFN_CERT_STORE_PROV_CLOSE       provCloseStore;\r
+    PFN_CERT_STORE_PROV_WRITE_CERT  provWriteCert;\r
+    PFN_CERT_STORE_PROV_DELETE_CERT provDeleteCert;\r
+    PFN_CERT_STORE_PROV_CONTROL     provControl;\r
+} WINE_PROVIDERSTORE, *PWINE_PROVIDERSTORE;\r
+\r
+/* Internal version of CertGetCertificateContextProperty that gets properties\r
+ * directly from the context (or the context it's linked to, depending on its\r
+ * type.) Doesn't handle special-case properties, since they are handled by\r
+ * CertGetCertificateContextProperty, and are particular to the store in which\r
+ * the property exists (which is separate from the context.)\r
+ */\r
+static BOOL WINAPI CRYPT_GetCertificateContextProperty(\r
+ PWINE_CERT_CONTEXT context, DWORD dwPropId, void *pvData, DWORD *pcbData);\r
+\r
+/* Internal version of CertSetCertificateContextProperty that sets properties\r
+ * directly on the context (or the context it's linked to, depending on its\r
+ * type.) Doesn't handle special cases, since they're handled by\r
+ * CertSetCertificateContextProperty anyway.\r
+ */\r
+static BOOL WINAPI CRYPT_SetCertificateContextProperty(\r
+ PWINE_CERT_CONTEXT context, DWORD dwPropId, DWORD dwFlags,\r
+ const void *pvData);\r
+\r
+static void CRYPT_InitStore(WINECRYPT_CERTSTORE *store, HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, CertStoreType type)\r
+{\r
+    store->ref = 1;\r
+    store->dwMagic = WINE_CRYPTCERTSTORE_MAGIC;\r
+    store->type = type;\r
+    if (!hCryptProv)\r
+    {\r
+        hCryptProv = CRYPT_GetDefaultProvider();\r
+        dwFlags |= CERT_STORE_NO_CRYPT_RELEASE_FLAG;\r
+    }\r
+    store->cryptProv = hCryptProv;\r
+    store->dwOpenFlags = dwFlags;\r
+}\r
+\r
+/* Initializes the reference ref to point to context, and increments context's\r
+ * reference count.  Also sets the hCertStore member of the reference to store.\r
+ */\r
+static void CRYPT_InitCertRef(PWINE_CERT_CONTEXT_LINK ref,\r
+ PWINE_CERT_CONTEXT context, HCERTSTORE store)\r
+{\r
+    TRACE("(%p, %p)\n", ref, context);\r
+    memcpy(&ref->cert, context, sizeof(ref->cert));\r
+    ref->ref = 1;\r
+    ref->type = ContextTypeLink;\r
+    ref->linked = context;\r
+    InterlockedIncrement(&context->ref);\r
+    TRACE("%p's ref count is %ld\n", context, context->ref);\r
+    ref->cert.hCertStore = store;\r
+}\r
+\r
+static BOOL CRYPT_MemAddCert(PWINECRYPT_CERTSTORE store,\r
+ PWINE_CERT_CONTEXT cert, DWORD dwAddDisposition,\r
+ PCCERT_CONTEXT *ppStoreContext)\r
+{\r
+    WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store;\r
+    BOOL add = FALSE, ret;\r
+    PCCERT_CONTEXT existing = NULL;\r
+\r
+    TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext);\r
+\r
+    if (dwAddDisposition != CERT_STORE_ADD_ALWAYS)\r
+    {\r
+        BYTE hashToAdd[20];\r
+        DWORD size = sizeof(hashToAdd);\r
+\r
+        ret = CRYPT_GetCertificateContextProperty((PWINE_CERT_CONTEXT)cert,\r
+         CERT_HASH_PROP_ID, hashToAdd, &size);\r
+        if (ret)\r
+        {\r
+            CRYPT_HASH_BLOB blob = { sizeof(hashToAdd), hashToAdd };\r
+\r
+            existing = CertFindCertificateInStore(store,\r
+             cert->cert.dwCertEncodingType, 0, CERT_FIND_SHA1_HASH, &blob,\r
+             NULL);\r
+        }\r
+    }\r
+    switch (dwAddDisposition)\r
+    {\r
+    case CERT_STORE_ADD_ALWAYS:\r
+        add = TRUE;\r
+        break;\r
+    case CERT_STORE_ADD_NEW:\r
+    {\r
+        if (existing)\r
+        {\r
+            TRACE("found matching certificate, not adding\n");\r
+            SetLastError(CRYPT_E_EXISTS);\r
+            add = FALSE;\r
+        }\r
+        else\r
+            add = TRUE;\r
+        break;\r
+    }\r
+    case CERT_STORE_ADD_REPLACE_EXISTING:\r
+    {\r
+        add = TRUE;\r
+        if (existing)\r
+        {\r
+            TRACE("found matching certificate, replacing\n");\r
+            CertDeleteCertificateFromStore(existing);\r
+        }\r
+        break;\r
+    }\r
+    default:\r
+        FIXME("Unimplemented add disposition %ld\n", dwAddDisposition);\r
+        add = FALSE;\r
+    }\r
+    if (existing)\r
+        CertFreeCertificateContext(existing);\r
+    if (add)\r
+    {\r
+        PWINE_CERT_LIST_ENTRY entry = CryptMemAlloc(\r
+         sizeof(WINE_CERT_LIST_ENTRY));\r
+\r
+        if (entry)\r
+        {\r
+            TRACE("adding %p\n", entry);\r
+            CRYPT_InitCertRef(&entry->cert, (PWINE_CERT_CONTEXT)cert, store);\r
+            EnterCriticalSection(&ms->cs);\r
+            list_add_tail(&ms->certs, &entry->entry);\r
+            LeaveCriticalSection(&ms->cs);\r
+            if (ppStoreContext)\r
+                *ppStoreContext =\r
+                 CertDuplicateCertificateContext((PCCERT_CONTEXT)entry);\r
+            ret = TRUE;\r
+        }\r
+        else\r
+            ret = FALSE;\r
+    }\r
+    else\r
+        ret = FALSE;\r
+    TRACE("returning %d\n", ret);\r
+    return ret;\r
+}\r
+\r
+static PWINE_CERT_CONTEXT CRYPT_MemEnumCert(PWINECRYPT_CERTSTORE store,\r
+ PWINE_CERT_CONTEXT pPrev)\r
+{\r
+    WINE_MEMSTORE *ms = (WINE_MEMSTORE *)store;\r
+    PWINE_CERT_LIST_ENTRY prevEntry = (PWINE_CERT_LIST_ENTRY)pPrev;\r
+    PWINE_CERT_CONTEXT ret;\r
+    struct list *listNext;\r
+\r
+    TRACE("(%p, %p)\n", store, pPrev);\r
+    EnterCriticalSection(&ms->cs);\r
+    if (prevEntry)\r
+    {\r
+        listNext = list_next(&ms->certs, &prevEntry->entry);\r
+        CertFreeCertificateContext((PCCERT_CONTEXT)pPrev);\r
+    }\r
+    else\r
+        listNext = list_next(&ms->certs, &ms->certs);\r
+    if (listNext)\r
+        ret = (PWINE_CERT_CONTEXT)CertDuplicateCertificateContext(\r
+         (PCCERT_CONTEXT)LIST_ENTRY(listNext, WINE_CERT_LIST_ENTRY, entry));\r
+    else\r
+    {\r
+        SetLastError(CRYPT_E_NOT_FOUND);\r
+        ret = NULL;\r
+    }\r
+    LeaveCriticalSection(&ms->cs);\r
+\r
+    TRACE("returning %p\n", ret);\r
+    return ret;\r
+}\r
+\r
+static BOOL WINAPI CRYPT_MemDeleteCert(HCERTSTORE hCertStore,\r
+ PCCERT_CONTEXT pCertContext, DWORD dwFlags)\r
+{\r
+    WINE_MEMSTORE *store = (WINE_MEMSTORE *)hCertStore;\r
+    PWINE_CERT_LIST_ENTRY cert = (PWINE_CERT_LIST_ENTRY)pCertContext;\r
+    BOOL ret;\r
+\r
+    /* The passed-in context is itself a list entry, so just remove it. */\r
+    EnterCriticalSection(&store->cs);\r
+    list_remove(&cert->entry);\r
+    ret = CertFreeCertificateContext(pCertContext);\r
+    LeaveCriticalSection(&store->cs);\r
+    return ret;\r
+}\r
+\r
+static void CRYPT_MemEmptyStore(PWINE_MEMSTORE store)\r
+{\r
+    PWINE_CERT_LIST_ENTRY cert, next;\r
+\r
+    EnterCriticalSection(&store->cs);\r
+    LIST_FOR_EACH_ENTRY_SAFE(cert, next, &store->certs, WINE_CERT_LIST_ENTRY,\r
+     entry)\r
+    {\r
+        TRACE("removing %p\n", cert);\r
+        list_remove(&cert->entry);\r
+        CertFreeCertificateContext((PCCERT_CONTEXT)cert);\r
+    }\r
+    LeaveCriticalSection(&store->cs);\r
+}\r
+\r
+static void WINAPI CRYPT_MemCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)\r
+{\r
+    WINE_MEMSTORE *store = (WINE_MEMSTORE *)hCertStore;\r
+\r
+    TRACE("(%p, %08lx)\n", store, dwFlags);\r
+    if (dwFlags)\r
+        FIXME("Unimplemented flags: %08lx\n", dwFlags);\r
+\r
+    CRYPT_MemEmptyStore(store);\r
+    DeleteCriticalSection(&store->cs);\r
+    CryptMemFree(store);\r
+}\r
+\r
+static WINECRYPT_CERTSTORE *CRYPT_MemOpenStore(HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    PWINE_MEMSTORE store;\r
+\r
+    TRACE("(%ld, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);\r
+\r
+    if (dwFlags & CERT_STORE_DELETE_FLAG)\r
+    {\r
+        SetLastError(ERROR_CALL_NOT_IMPLEMENTED);\r
+        store = NULL;\r
+    }\r
+    else\r
+    {\r
+        store = CryptMemAlloc(sizeof(WINE_MEMSTORE));\r
+        if (store)\r
+        {\r
+            memset(store, 0, sizeof(WINE_MEMSTORE));\r
+            CRYPT_InitStore(&store->hdr, hCryptProv, dwFlags, StoreTypeMem);\r
+            store->hdr.closeStore    = CRYPT_MemCloseStore;\r
+            store->hdr.addCert       = CRYPT_MemAddCert;\r
+            store->hdr.enumCert      = CRYPT_MemEnumCert;\r
+            store->hdr.deleteCert    = CRYPT_MemDeleteCert;\r
+            store->hdr.control       = NULL;\r
+            InitializeCriticalSection(&store->cs);\r
+            list_init(&store->certs);\r
+        }\r
+    }\r
+    return (PWINECRYPT_CERTSTORE)store;\r
+}\r
+\r
+static BOOL CRYPT_CollectionAddCert(PWINECRYPT_CERTSTORE store,\r
+ PWINE_CERT_CONTEXT cert, DWORD dwAddDisposition,\r
+ PCCERT_CONTEXT *ppStoreContext)\r
+{\r
+    PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store;\r
+    PWINE_STORE_LIST_ENTRY entry, next;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext);\r
+\r
+    ret = FALSE;\r
+    EnterCriticalSection(&cs->cs);\r
+    LIST_FOR_EACH_ENTRY_SAFE(entry, next, &cs->stores, WINE_STORE_LIST_ENTRY,\r
+     entry)\r
+    {\r
+        if (entry->dwUpdateFlags & CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG)\r
+        {\r
+            ret = entry->store->addCert(entry->store, cert, dwAddDisposition,\r
+             ppStoreContext);\r
+            break;\r
+        }\r
+    }\r
+    LeaveCriticalSection(&cs->cs);\r
+    SetLastError(ret ? ERROR_SUCCESS : HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED));\r
+    return ret;\r
+}\r
+\r
+static void WINAPI CRYPT_CollectionCloseStore(HCERTSTORE store, DWORD dwFlags)\r
+{\r
+    PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store;\r
+    PWINE_STORE_LIST_ENTRY entry, next;\r
+\r
+    TRACE("(%p, %08lx)\n", store, dwFlags);\r
+\r
+    LIST_FOR_EACH_ENTRY_SAFE(entry, next, &cs->stores, WINE_STORE_LIST_ENTRY,\r
+     entry)\r
+    {\r
+        TRACE("closing %p\n", entry);\r
+        CertCloseStore((HCERTSTORE)entry->store, dwFlags);\r
+        CryptMemFree(entry);\r
+    }\r
+    DeleteCriticalSection(&cs->cs);\r
+    CryptMemFree(cs);\r
+}\r
+\r
+/* Advances a collection enumeration by one cert, if possible, where advancing\r
+ * means:\r
+ * - calling the current store's enumeration function once, and returning\r
+ *   the enumerated cert if one is returned\r
+ * - moving to the next store if the current store has no more items, and\r
+ *   recursively calling itself to get the next item.\r
+ * Returns NULL if the collection contains no more items or on error.\r
+ * Assumes the collection store's lock is held.\r
+ */\r
+static PWINE_COLLECTION_CERT_CONTEXT CRYPT_CollectionAdvanceEnum(\r
+ PWINE_COLLECTIONSTORE store, PWINE_STORE_LIST_ENTRY storeEntry,\r
+ PWINE_COLLECTION_CERT_CONTEXT pPrev)\r
+{\r
+    PWINE_COLLECTION_CERT_CONTEXT ret;\r
+    PWINE_CERT_CONTEXT child;\r
+    struct list *storeNext = list_next(&store->stores, &storeEntry->entry);\r
+\r
+    TRACE("(%p, %p, %p)\n", store, storeEntry, pPrev);\r
+\r
+    if (pPrev)\r
+    {\r
+        /* Ref-counting funny business: "duplicate" (addref) the child, because\r
+         * the CertFreeCertificateContext(pPrev) below can cause the ref count\r
+         * to become negative.  See comment below as well.\r
+         */\r
+        child = ((PWINE_COLLECTION_CERT_CONTEXT)pPrev)->cert.linked;\r
+        CertDuplicateCertificateContext((PCCERT_CONTEXT)child);\r
+        child = storeEntry->store->enumCert((HCERTSTORE)storeEntry->store,\r
+         child);\r
+        CertFreeCertificateContext((PCCERT_CONTEXT)pPrev);\r
+        pPrev = NULL;\r
+    }\r
+    else\r
+        child = storeEntry->store->enumCert((HCERTSTORE)storeEntry->store,\r
+         NULL);\r
+    if (child)\r
+    {\r
+        ret = CryptMemAlloc(sizeof(WINE_COLLECTION_CERT_CONTEXT));\r
+        if (ret)\r
+        {\r
+            CRYPT_InitCertRef((PWINE_CERT_CONTEXT_LINK)ret, child, store);\r
+            /* enumCert already addref'd once, and CRYPT_InitCertRef does again,\r
+             * so free child once to get the ref count right.  (Not doing so\r
+             * will leak memory if the caller calls CertFreeCertificateContext\r
+             * rather than CertEnumCertificatesInStore.)\r
+             */\r
+            CertFreeCertificateContext((PCCERT_CONTEXT)child);\r
+            ret->storeEntry = storeEntry;\r
+        }\r
+        else\r
+            CertFreeCertificateContext((PCCERT_CONTEXT)child);\r
+    }\r
+    else\r
+    {\r
+        if (storeNext)\r
+        {\r
+            storeEntry = LIST_ENTRY(storeNext, WINE_STORE_LIST_ENTRY, entry);\r
+            ret = CRYPT_CollectionAdvanceEnum(store, storeEntry, NULL);\r
+        }\r
+        else\r
+        {\r
+            SetLastError(CRYPT_E_NOT_FOUND);\r
+            ret = NULL;\r
+        }\r
+    }\r
+    TRACE("returning %p\n", ret);\r
+    return ret;\r
+}\r
+\r
+static PWINE_CERT_CONTEXT CRYPT_CollectionEnumCert(PWINECRYPT_CERTSTORE store,\r
+ PWINE_CERT_CONTEXT pPrev)\r
+{\r
+    PWINE_COLLECTIONSTORE cs = (PWINE_COLLECTIONSTORE)store;\r
+    PWINE_COLLECTION_CERT_CONTEXT prevEntry =\r
+     (PWINE_COLLECTION_CERT_CONTEXT)pPrev, ret;\r
+\r
+    TRACE("(%p, %p)\n", store, pPrev);\r
+\r
+    if (prevEntry)\r
+    {\r
+        EnterCriticalSection(&cs->cs);\r
+        ret = CRYPT_CollectionAdvanceEnum(cs, prevEntry->storeEntry, prevEntry);\r
+        LeaveCriticalSection(&cs->cs);\r
+    }\r
+    else\r
+    {\r
+        EnterCriticalSection(&cs->cs);\r
+        if (!list_empty(&cs->stores))\r
+        {\r
+            PWINE_STORE_LIST_ENTRY storeEntry;\r
+\r
+            storeEntry = LIST_ENTRY(cs->stores.next, WINE_STORE_LIST_ENTRY,\r
+             entry);\r
+            ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, NULL);\r
+        }\r
+        else\r
+        {\r
+            SetLastError(CRYPT_E_NOT_FOUND);\r
+            ret = NULL;\r
+        }\r
+        LeaveCriticalSection(&cs->cs);\r
+    }\r
+    TRACE("returning %p\n", ret);\r
+    return (PWINE_CERT_CONTEXT)ret;\r
+}\r
+\r
+static BOOL WINAPI CRYPT_CollectionDeleteCert(HCERTSTORE hCertStore,\r
+ PCCERT_CONTEXT pCertContext, DWORD dwFlags)\r
+{\r
+    PWINE_COLLECTION_CERT_CONTEXT context =\r
+     (PWINE_COLLECTION_CERT_CONTEXT)pCertContext;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %p, %08lx)\n", hCertStore, pCertContext, dwFlags);\r
+\r
+    ret = CertDeleteCertificateFromStore((PCCERT_CONTEXT)context->cert.linked);\r
+    return ret;\r
+}\r
+\r
+static WINECRYPT_CERTSTORE *CRYPT_CollectionOpenStore(HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    PWINE_COLLECTIONSTORE store;\r
+\r
+    if (dwFlags & CERT_STORE_DELETE_FLAG)\r
+    {\r
+        SetLastError(ERROR_CALL_NOT_IMPLEMENTED);\r
+        store = NULL;\r
+    }\r
+    else\r
+    {\r
+        store = CryptMemAlloc(sizeof(WINE_COLLECTIONSTORE));\r
+        if (store)\r
+        {\r
+            memset(store, 0, sizeof(WINE_COLLECTIONSTORE));\r
+            CRYPT_InitStore(&store->hdr, hCryptProv, dwFlags,\r
+             StoreTypeCollection);\r
+            store->hdr.closeStore    = CRYPT_CollectionCloseStore;\r
+            store->hdr.addCert       = CRYPT_CollectionAddCert;\r
+            store->hdr.enumCert      = CRYPT_CollectionEnumCert;\r
+            store->hdr.deleteCert    = CRYPT_CollectionDeleteCert;\r
+            InitializeCriticalSection(&store->cs);\r
+            list_init(&store->stores);\r
+        }\r
+    }\r
+    return (PWINECRYPT_CERTSTORE)store;\r
+}\r
+\r
+static void WINAPI CRYPT_ProvCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)\r
+{\r
+    PWINE_PROVIDERSTORE store = (PWINE_PROVIDERSTORE)hCertStore;\r
+\r
+    TRACE("(%p, %08lx)\n", store, dwFlags);\r
+\r
+    if (store->provCloseStore)\r
+        store->provCloseStore(store->hStoreProv, dwFlags);\r
+    if (!(store->dwStoreProvFlags & CERT_STORE_PROV_EXTERNAL_FLAG))\r
+        CertCloseStore(store->memStore, dwFlags);\r
+    CryptMemFree(store);\r
+}\r
+\r
+static BOOL CRYPT_ProvAddCert(PWINECRYPT_CERTSTORE store,\r
+ PWINE_CERT_CONTEXT cert, DWORD dwAddDisposition,\r
+ PCCERT_CONTEXT *ppStoreContext)\r
+{\r
+    PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %p, %ld, %p)\n", store, cert, dwAddDisposition, ppStoreContext);\r
+\r
+    if (ps->hdr.dwOpenFlags & CERT_STORE_READONLY_FLAG)\r
+    {\r
+        SetLastError(ERROR_ACCESS_DENIED);\r
+        ret = FALSE;\r
+    }\r
+    else\r
+    {\r
+        ret = TRUE;\r
+        if (ps->provWriteCert)\r
+            ret = ps->provWriteCert(ps->hStoreProv, (PCCERT_CONTEXT)cert,\r
+             CERT_STORE_PROV_WRITE_ADD_FLAG);\r
+        if (ret)\r
+        {\r
+            ret = ps->memStore->addCert(ps->memStore, cert,\r
+             dwAddDisposition, ppStoreContext);\r
+            /* dirty trick: replace the returned context's hCertStore with\r
+             * store.\r
+             */\r
+            if (ppStoreContext)\r
+                (*(PCERT_CONTEXT *)ppStoreContext)->hCertStore = store;\r
+        }\r
+    }\r
+    return ret;\r
+}\r
+\r
+static PWINE_CERT_CONTEXT CRYPT_ProvEnumCert(PWINECRYPT_CERTSTORE store,\r
+ PWINE_CERT_CONTEXT pPrev)\r
+{\r
+    PWINE_PROVIDERSTORE ps = (PWINE_PROVIDERSTORE)store;\r
+    PWINE_CERT_CONTEXT ret;\r
+\r
+    ret = ps->memStore->enumCert(ps->memStore, pPrev);\r
+    if (ret)\r
+    {\r
+        /* same dirty trick: replace the returned context's hCertStore with\r
+         * store.\r
+         */\r
+        ret->cert.hCertStore = store;\r
+    }\r
+    return ret;\r
+}\r
+\r
+static BOOL WINAPI CRYPT_ProvDeleteCert(HCERTSTORE hCertStore,\r
+ PCCERT_CONTEXT cert, DWORD dwFlags)\r
+{\r
+    PWINE_PROVIDERSTORE store = (PWINE_PROVIDERSTORE)hCertStore;\r
+    BOOL ret = TRUE;\r
+\r
+    TRACE("(%p, %p, %08lx)\n", hCertStore, cert, dwFlags);\r
+\r
+    if (store->provDeleteCert)\r
+        ret = store->provDeleteCert(store->hStoreProv, cert, dwFlags);\r
+    if (ret)\r
+        ret = store->memStore->deleteCert(store->memStore, cert, dwFlags);\r
+    return ret;\r
+}\r
+\r
+static BOOL WINAPI CRYPT_ProvControl(HCERTSTORE hCertStore, DWORD dwFlags,\r
+ DWORD dwCtrlType, void const *pvCtrlPara)\r
+{\r
+    PWINE_PROVIDERSTORE store = (PWINE_PROVIDERSTORE)hCertStore;\r
+    BOOL ret = TRUE;\r
+\r
+    TRACE("(%p, %08lx, %ld, %p)\n", hCertStore, dwFlags, dwCtrlType,\r
+     pvCtrlPara);\r
+\r
+    if (store->provControl)\r
+        ret = store->provControl(store->hStoreProv, dwFlags, dwCtrlType,\r
+         pvCtrlPara);\r
+    return ret;\r
+}\r
+\r
+static PWINECRYPT_CERTSTORE CRYPT_ProvCreateStore(HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, PWINECRYPT_CERTSTORE memStore, PCERT_STORE_PROV_INFO pProvInfo)\r
+{\r
+    PWINE_PROVIDERSTORE ret = (PWINE_PROVIDERSTORE)CryptMemAlloc(\r
+     sizeof(WINE_PROVIDERSTORE));\r
+\r
+    if (ret)\r
+    {\r
+        CRYPT_InitStore(&ret->hdr, hCryptProv, dwFlags,\r
+         StoreTypeProvider);\r
+        ret->dwStoreProvFlags = pProvInfo->dwStoreProvFlags;\r
+        if (ret->dwStoreProvFlags & CERT_STORE_PROV_EXTERNAL_FLAG)\r
+        {\r
+            CertCloseStore(memStore, 0);\r
+            ret->memStore = NULL;\r
+        }\r
+        else\r
+            ret->memStore = memStore;\r
+        ret->hStoreProv = pProvInfo->hStoreProv;\r
+        ret->hdr.closeStore = CRYPT_ProvCloseStore;\r
+        ret->hdr.addCert = CRYPT_ProvAddCert;\r
+        ret->hdr.enumCert = CRYPT_ProvEnumCert;\r
+        ret->hdr.deleteCert = CRYPT_ProvDeleteCert;\r
+        ret->hdr.control = CRYPT_ProvControl;\r
+        if (pProvInfo->cStoreProvFunc > CERT_STORE_PROV_CLOSE_FUNC)\r
+            ret->provCloseStore =\r
+             pProvInfo->rgpvStoreProvFunc[CERT_STORE_PROV_CLOSE_FUNC];\r
+        else\r
+            ret->provCloseStore = NULL;\r
+        if (pProvInfo->cStoreProvFunc >\r
+         CERT_STORE_PROV_WRITE_CERT_FUNC)\r
+            ret->provWriteCert = pProvInfo->rgpvStoreProvFunc[\r
+             CERT_STORE_PROV_WRITE_CERT_FUNC];\r
+        else\r
+            ret->provWriteCert = NULL;\r
+        if (pProvInfo->cStoreProvFunc >\r
+         CERT_STORE_PROV_DELETE_CERT_FUNC)\r
+            ret->provDeleteCert = pProvInfo->rgpvStoreProvFunc[\r
+             CERT_STORE_PROV_DELETE_CERT_FUNC];\r
+        else\r
+            ret->provDeleteCert = NULL;\r
+        if (pProvInfo->cStoreProvFunc >\r
+         CERT_STORE_PROV_CONTROL_FUNC)\r
+            ret->provControl = pProvInfo->rgpvStoreProvFunc[\r
+             CERT_STORE_PROV_CONTROL_FUNC];\r
+        else\r
+            ret->provControl = NULL;\r
+    }\r
+    return (PWINECRYPT_CERTSTORE)ret;\r
+}\r
+\r
+static PWINECRYPT_CERTSTORE CRYPT_ProvOpenStore(LPCSTR lpszStoreProvider,\r
+ DWORD dwEncodingType, HCRYPTPROV hCryptProv, DWORD dwFlags, const void *pvPara)\r
+{\r
+    static HCRYPTOIDFUNCSET set = NULL;\r
+    PFN_CERT_DLL_OPEN_STORE_PROV_FUNC provOpenFunc;\r
+    HCRYPTOIDFUNCADDR hFunc;\r
+    PWINECRYPT_CERTSTORE ret = NULL;\r
+\r
+    if (!set)\r
+        set = CryptInitOIDFunctionSet(CRYPT_OID_OPEN_STORE_PROV_FUNC, 0);\r
+    CryptGetOIDFunctionAddress(set, dwEncodingType, lpszStoreProvider, 0,\r
+     (void **)&provOpenFunc, &hFunc);\r
+    if (provOpenFunc)\r
+    {\r
+        CERT_STORE_PROV_INFO provInfo = { 0 };\r
+\r
+        provInfo.cbSize = sizeof(provInfo);\r
+        if (dwFlags & CERT_STORE_DELETE_FLAG)\r
+            provOpenFunc(lpszStoreProvider, dwEncodingType, hCryptProv,\r
+             dwFlags, pvPara, NULL, &provInfo);\r
+        else\r
+        {\r
+            PWINECRYPT_CERTSTORE memStore;\r
+\r
+            memStore = CRYPT_MemOpenStore(hCryptProv, dwFlags, NULL);\r
+            if (memStore)\r
+            {\r
+                if (provOpenFunc(lpszStoreProvider, dwEncodingType, hCryptProv,\r
+                 dwFlags, pvPara, memStore, &provInfo))\r
+                    ret = CRYPT_ProvCreateStore(hCryptProv, dwFlags, memStore,\r
+                     &provInfo);\r
+                else\r
+                    CertCloseStore(memStore, 0);\r
+            }\r
+        }\r
+        CryptFreeOIDFunctionAddress(hFunc, 0);\r
+    }\r
+    else\r
+        SetLastError(ERROR_FILE_NOT_FOUND);\r
+    return ret;\r
+}\r
+\r
+static void CRYPT_HashToStr(LPBYTE hash, LPWSTR asciiHash)\r
+{\r
+    static const WCHAR fmt[] = { '%','0','2','X',0 };\r
+    DWORD i;\r
+\r
+    assert(hash);\r
+    assert(asciiHash);\r
+\r
+    for (i = 0; i < 20; i++)\r
+        wsprintfW(asciiHash + i * 2, fmt, hash[i]);\r
+}\r
+\r
+static const WCHAR CertsW[] = { 'C','e','r','t','i','f','i','c','a','t','e','s',\r
+ 0 };\r
+static const WCHAR CRLsW[] = { 'C','R','L','s',0 };\r
+static const WCHAR CTLsW[] = { 'C','T','L','s',0 };\r
+static const WCHAR BlobW[] = { 'B','l','o','b',0 };\r
+\r
+static void CRYPT_RegReadSerializedFromReg(PWINE_REGSTOREINFO store, HKEY key,\r
+ DWORD contextType)\r
+{\r
+    LONG rc;\r
+    DWORD index = 0;\r
+    WCHAR subKeyName[MAX_PATH];\r
+\r
+    do {\r
+        DWORD size = sizeof(subKeyName) / sizeof(WCHAR);\r
+\r
+        rc = RegEnumKeyExW(key, index++, subKeyName, &size, NULL, NULL, NULL,\r
+         NULL);\r
+        if (!rc)\r
+        {\r
+            HKEY subKey;\r
+\r
+            rc = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey);\r
+            if (!rc)\r
+            {\r
+                LPBYTE buf = NULL;\r
+\r
+                size = 0;\r
+                rc = RegQueryValueExW(subKey, BlobW, NULL, NULL, NULL, &size);\r
+                if (!rc)\r
+                    buf = CryptMemAlloc(size);\r
+                if (buf)\r
+                {\r
+                    rc = RegQueryValueExW(subKey, BlobW, NULL, NULL, buf,\r
+                     &size);\r
+                    if (!rc)\r
+                    {\r
+                        const void *context;\r
+                        DWORD addedType;\r
+\r
+                        TRACE("Adding cert with hash %s\n",\r
+                         debugstr_w(subKeyName));\r
+                        context = CRYPT_ReadSerializedElement(buf, size,\r
+                         contextType, &addedType);\r
+                        if (context)\r
+                        {\r
+                            const WINE_CONTEXT_INTERFACE *contextInterface;\r
+                            BYTE hash[20];\r
+\r
+                            switch (addedType)\r
+                            {\r
+                            case CERT_STORE_CERTIFICATE_CONTEXT:\r
+                                contextInterface = &gCertInterface;\r
+                                break;\r
+                            case CERT_STORE_CRL_CONTEXT:\r
+                                contextInterface = &gCRLInterface;\r
+                                break;\r
+                            case CERT_STORE_CTL_CONTEXT:\r
+                                contextInterface = &gCTLInterface;\r
+                                break;\r
+                            default:\r
+                                contextInterface = NULL;\r
+                            }\r
+                            if (contextInterface)\r
+                            {\r
+                                size = sizeof(hash);\r
+                                if (contextInterface->getProp(context,\r
+                                 CERT_HASH_PROP_ID, hash, &size))\r
+                                {\r
+                                    WCHAR asciiHash[20 * 2 + 1];\r
+\r
+                                    CRYPT_HashToStr(hash, asciiHash);\r
+                                    TRACE("comparing %s\n",\r
+                                     debugstr_w(asciiHash));\r
+                                    TRACE("with %s\n", debugstr_w(subKeyName));\r
+                                    if (!lstrcmpW(asciiHash, subKeyName))\r
+                                    {\r
+                                        TRACE("hash matches, adding\n");\r
+                                        contextInterface->addContextToStore(\r
+                                         store->memStore, context,\r
+                                         CERT_STORE_ADD_REPLACE_EXISTING, NULL);\r
+                                    }\r
+                                    else\r
+                                        TRACE("hash doesn't match, ignoring\n");\r
+                                }\r
+                                contextInterface->free(context);\r
+                            }\r
+                        }\r
+                    }\r
+                    CryptMemFree(buf);\r
+                }\r
+                RegCloseKey(subKey);\r
+            }\r
+            /* Ignore intermediate errors, continue enumerating */\r
+            rc = ERROR_SUCCESS;\r
+        }\r
+    } while (!rc);\r
+}\r
+\r
+static void CRYPT_RegReadFromReg(PWINE_REGSTOREINFO store)\r
+{\r
+    static const WCHAR *subKeys[] = { CertsW, CRLsW, CTLsW };\r
+    static const DWORD contextFlags[] = { CERT_STORE_CERTIFICATE_CONTEXT_FLAG,\r
+     CERT_STORE_CRL_CONTEXT_FLAG, CERT_STORE_CTL_CONTEXT_FLAG };\r
+    DWORD i;\r
+\r
+    for (i = 0; i < sizeof(subKeys) / sizeof(subKeys[0]); i++)\r
+    {\r
+        HKEY key;\r
+        LONG rc;\r
+\r
+        rc = RegCreateKeyExW(store->key, subKeys[i], 0, NULL, 0, KEY_READ, NULL,\r
+         &key, NULL);\r
+        if (!rc)\r
+        {\r
+            CRYPT_RegReadSerializedFromReg(store, key, contextFlags[i]);\r
+            RegCloseKey(key);\r
+        }\r
+    }\r
+}\r
+\r
+/* Hash is assumed to be 20 bytes in length (a SHA-1 hash) */\r
+static BOOL CRYPT_WriteSerializedToReg(HKEY key, LPBYTE hash, LPBYTE buf,\r
+ DWORD len)\r
+{\r
+    WCHAR asciiHash[20 * 2 + 1];\r
+    LONG rc;\r
+    HKEY subKey;\r
+    BOOL ret;\r
+\r
+    CRYPT_HashToStr(hash, asciiHash);\r
+    rc = RegCreateKeyExW(key, asciiHash, 0, NULL, 0, KEY_ALL_ACCESS, NULL,\r
+     &subKey, NULL);\r
+    if (!rc)\r
+    {\r
+        rc = RegSetValueExW(subKey, BlobW, 0, REG_BINARY, buf, len);\r
+        RegCloseKey(subKey);\r
+    }\r
+    if (!rc)\r
+        ret = TRUE;\r
+    else\r
+    {\r
+        SetLastError(rc);\r
+        ret = FALSE;\r
+    }\r
+    return ret;\r
+}\r
+\r
+static BOOL CRYPT_SerializeContextsToReg(HKEY key,\r
+ const WINE_CONTEXT_INTERFACE *contextInterface, HCERTSTORE memStore)\r
+{\r
+    const void *context = NULL;\r
+    BOOL ret;\r
+\r
+    do {\r
+        context = contextInterface->enumContextsInStore(memStore, context);\r
+        if (context)\r
+        {\r
+            BYTE hash[20];\r
+            DWORD hashSize = sizeof(hash);\r
+\r
+            ret = contextInterface->getProp(context, CERT_HASH_PROP_ID, hash,\r
+             &hashSize);\r
+            if (ret)\r
+            {\r
+                DWORD size = 0;\r
+                LPBYTE buf = NULL;\r
+\r
+                ret = contextInterface->serialize(context, 0, NULL, &size);\r
+                if (size)\r
+                    buf = CryptMemAlloc(size);\r
+                if (buf)\r
+                {\r
+                    ret = contextInterface->serialize(context, 0, buf, &size);\r
+                    if (ret)\r
+                        ret = CRYPT_WriteSerializedToReg(key, hash, buf, size);\r
+                }\r
+                CryptMemFree(buf);\r
+            }\r
+        }\r
+        else\r
+            ret = TRUE;\r
+    } while (ret && context != NULL);\r
+    if (context)\r
+        contextInterface->free(context);\r
+    return ret;\r
+}\r
+\r
+static BOOL CRYPT_RegWriteToReg(PWINE_REGSTOREINFO store)\r
+{\r
+    static const WCHAR *subKeys[] = { CertsW, CRLsW, CTLsW };\r
+    static const WINE_CONTEXT_INTERFACE *interfaces[] = { &gCertInterface,\r
+     &gCRLInterface, &gCTLInterface };\r
+    struct list *listToDelete[] = { &store->certsToDelete, NULL, NULL };\r
+    BOOL ret = TRUE;\r
+    DWORD i;\r
+\r
+    for (i = 0; ret && i < sizeof(subKeys) / sizeof(subKeys[0]); i++)\r
+    {\r
+        HKEY key;\r
+        LONG rc = RegCreateKeyExW(store->key, subKeys[i], 0, NULL, 0,\r
+         KEY_ALL_ACCESS, NULL, &key, NULL);\r
+\r
+        if (!rc)\r
+        {\r
+            if (listToDelete[i])\r
+            {\r
+                PWINE_HASH_TO_DELETE toDelete, next;\r
+                WCHAR asciiHash[20 * 2 + 1];\r
+\r
+                EnterCriticalSection(&store->cs);\r
+                LIST_FOR_EACH_ENTRY_SAFE(toDelete, next, listToDelete[i],\r
+                 WINE_HASH_TO_DELETE, entry)\r
+                {\r
+                    LONG rc;\r
+\r
+                    CRYPT_HashToStr(toDelete->hash, asciiHash);\r
+                    TRACE("Removing %s\n", debugstr_w(asciiHash));\r
+                    rc = RegDeleteKeyW(key, asciiHash);\r
+                    if (rc != ERROR_SUCCESS && rc != ERROR_FILE_NOT_FOUND)\r
+                    {\r
+                        SetLastError(rc);\r
+                        ret = FALSE;\r
+                    }\r
+                    list_remove(&toDelete->entry);\r
+                    CryptMemFree(toDelete);\r
+                }\r
+                LeaveCriticalSection(&store->cs);\r
+            }\r
+            ret = CRYPT_SerializeContextsToReg(key, interfaces[i],\r
+             store->memStore);\r
+            RegCloseKey(key);\r
+        }\r
+        else\r
+        {\r
+            SetLastError(rc);\r
+            ret = FALSE;\r
+        }\r
+    }\r
+    return ret;\r
+}\r
+\r
+/* If force is true or the registry store is dirty, writes the contents of the\r
+ * store to the registry.\r
+ */\r
+static BOOL CRYPT_RegFlushStore(PWINE_REGSTOREINFO store, BOOL force)\r
+{\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %d)\n", store, force);\r
+\r
+    if (store->dirty || force)\r
+        ret = CRYPT_RegWriteToReg(store);\r
+    else\r
+        ret = TRUE;\r
+    return ret;\r
+}\r
+\r
+static void WINAPI CRYPT_RegCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)\r
+{\r
+    PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore;\r
+\r
+    TRACE("(%p, %08lx)\n", store, dwFlags);\r
+    if (dwFlags)\r
+        FIXME("Unimplemented flags: %08lx\n", dwFlags);\r
+\r
+    CRYPT_RegFlushStore(store, FALSE);\r
+    RegCloseKey(store->key);\r
+    DeleteCriticalSection(&store->cs);\r
+    CryptMemFree(store);\r
+}\r
+\r
+static BOOL WINAPI CRYPT_RegWriteCert(HCERTSTORE hCertStore,\r
+ PCCERT_CONTEXT cert, DWORD dwFlags)\r
+{\r
+    PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %p, %ld)\n", hCertStore, cert, dwFlags);\r
+\r
+    if (dwFlags & CERT_STORE_PROV_WRITE_ADD_FLAG)\r
+    {\r
+        store->dirty = TRUE;\r
+        ret = TRUE;\r
+    }\r
+    else\r
+        ret = FALSE;\r
+    return ret;\r
+}\r
+\r
+static BOOL WINAPI CRYPT_RegDeleteCert(HCERTSTORE hCertStore,\r
+ PCCERT_CONTEXT pCertContext, DWORD dwFlags)\r
+{\r
+    PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %p, %08lx)\n", store, pCertContext, dwFlags);\r
+\r
+    if (store->dwOpenFlags & CERT_STORE_READONLY_FLAG)\r
+    {\r
+        SetLastError(ERROR_ACCESS_DENIED);\r
+        ret = FALSE;\r
+    }\r
+    else\r
+    {\r
+        PWINE_HASH_TO_DELETE toDelete =\r
+         CryptMemAlloc(sizeof(WINE_HASH_TO_DELETE));\r
+\r
+        if (toDelete)\r
+        {\r
+            DWORD size = sizeof(toDelete->hash);\r
+\r
+            ret = CertGetCertificateContextProperty(pCertContext,\r
+             CERT_HASH_PROP_ID, toDelete->hash, &size);\r
+            if (ret)\r
+            {\r
+                EnterCriticalSection(&store->cs);\r
+                list_add_tail(&store->certsToDelete, &toDelete->entry);\r
+                LeaveCriticalSection(&store->cs);\r
+            }\r
+            else\r
+            {\r
+                CryptMemFree(toDelete);\r
+                ret = FALSE;\r
+            }\r
+        }\r
+        else\r
+            ret = FALSE;\r
+        if (ret)\r
+            store->dirty = TRUE;\r
+    }\r
+    return ret;\r
+}\r
+\r
+static BOOL WINAPI CRYPT_RegControl(HCERTSTORE hCertStore, DWORD dwFlags,\r
+ DWORD dwCtrlType, void const *pvCtrlPara)\r
+{\r
+    PWINE_REGSTOREINFO store = (PWINE_REGSTOREINFO)hCertStore;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %08lx, %ld, %p)\n", hCertStore, dwFlags, dwCtrlType,\r
+     pvCtrlPara);\r
+\r
+    switch (dwCtrlType)\r
+    {\r
+    case CERT_STORE_CTRL_RESYNC:\r
+        CRYPT_RegFlushStore(store, FALSE);\r
+        CRYPT_MemEmptyStore((PWINE_MEMSTORE)store->memStore);\r
+        CRYPT_RegReadFromReg(store);\r
+        ret = TRUE;\r
+        break;\r
+    case CERT_STORE_CTRL_COMMIT:\r
+        ret = CRYPT_RegFlushStore(store,\r
+         dwFlags & CERT_STORE_CTRL_COMMIT_FORCE_FLAG);\r
+        break;\r
+    default:\r
+        FIXME("%ld: stub\n", dwCtrlType);\r
+        ret = FALSE;\r
+    }\r
+    return ret;\r
+}\r
+\r
+/* Copied from shlwapi's SHDeleteKeyW, and reformatted to match this file. */\r
+static DWORD CRYPT_RecurseDeleteKey(HKEY hKey, LPCWSTR lpszSubKey)\r
+{\r
+    DWORD dwRet, dwKeyCount = 0, dwMaxSubkeyLen = 0, dwSize, i;\r
+    WCHAR szNameBuf[MAX_PATH], *lpszName = szNameBuf;\r
+    HKEY hSubKey = 0;\r
+\r
+    TRACE("(hkey=%p,%s)\n", hKey, debugstr_w(lpszSubKey));\r
+\r
+    dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);\r
+    if (!dwRet)\r
+    {\r
+        /* Find how many subkeys there are */\r
+        dwRet = RegQueryInfoKeyW(hSubKey, NULL, NULL, NULL, &dwKeyCount,\r
+         &dwMaxSubkeyLen, NULL, NULL, NULL, NULL, NULL, NULL);\r
+        if (!dwRet)\r
+        {\r
+            dwMaxSubkeyLen++;\r
+            if (dwMaxSubkeyLen > sizeof(szNameBuf)/sizeof(WCHAR))\r
+            {\r
+                /* Name too big: alloc a buffer for it */\r
+                lpszName = CryptMemAlloc(dwMaxSubkeyLen*sizeof(WCHAR));\r
+            }\r
+\r
+            if (!lpszName)\r
+                dwRet = ERROR_NOT_ENOUGH_MEMORY;\r
+            else\r
+            {\r
+                /* Recursively delete all the subkeys */\r
+                for (i = 0; i < dwKeyCount && !dwRet; i++)\r
+                {\r
+                    dwSize = dwMaxSubkeyLen;\r
+                    dwRet = RegEnumKeyExW(hSubKey, i, lpszName, &dwSize, NULL,\r
+                     NULL, NULL, NULL);\r
+                    if (!dwRet)\r
+                        dwRet = CRYPT_RecurseDeleteKey(hSubKey, lpszName);\r
+                }\r
+\r
+                if (lpszName != szNameBuf)\r
+                {\r
+                    /* Free buffer if allocated */\r
+                    CryptMemFree(lpszName);\r
+                }\r
+            }\r
+        }\r
+\r
+        RegCloseKey(hSubKey);\r
+        if (!dwRet)\r
+            dwRet = RegDeleteKeyW(hKey, lpszSubKey);\r
+    }\r
+    return dwRet;\r
+}\r
+\r
+static void *regProvFuncs[] = {\r
+    CRYPT_RegCloseStore,\r
+    NULL, /* CERT_STORE_PROV_READ_CERT_FUNC */\r
+    CRYPT_RegWriteCert,\r
+    CRYPT_RegDeleteCert,\r
+    NULL, /* CERT_STORE_PROV_SET_CERT_PROPERTY_FUNC */\r
+    NULL, /* CERT_STORE_PROV_READ_CRL_FUNC */\r
+    NULL, /* CERT_STORE_PROV_WRITE_CRL_FUNC */\r
+    NULL, /* CERT_STORE_PROV_DELETE_CRL_FUNC */\r
+    NULL, /* CERT_STORE_PROV_SET_CRL_PROPERTY_FUNC */\r
+    NULL, /* CERT_STORE_PROV_READ_CTL_FUNC */\r
+    NULL, /* CERT_STORE_PROV_WRITE_CTL_FUNC */\r
+    NULL, /* CERT_STORE_PROV_DELETE_CTL_FUNC */\r
+    NULL, /* CERT_STORE_PROV_SET_CTL_PROPERTY_FUNC */\r
+    CRYPT_RegControl,\r
+};\r
+\r
+static WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    PWINECRYPT_CERTSTORE store = NULL;\r
+\r
+    TRACE("(%ld, %08lx, %p)\n", hCryptProv, dwFlags, pvPara);\r
+\r
+    if (dwFlags & CERT_STORE_DELETE_FLAG)\r
+    {\r
+        DWORD rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CertsW);\r
+\r
+        if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS)\r
+            rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CRLsW);\r
+        if (rc == ERROR_SUCCESS || rc == ERROR_NO_MORE_ITEMS)\r
+            rc = CRYPT_RecurseDeleteKey((HKEY)pvPara, CTLsW);\r
+        if (rc == ERROR_NO_MORE_ITEMS)\r
+            rc = ERROR_SUCCESS;\r
+        SetLastError(rc);\r
+    }\r
+    else\r
+    {\r
+        HKEY key;\r
+\r
+        if (DuplicateHandle(GetCurrentProcess(), (HANDLE)pvPara,\r
+         GetCurrentProcess(), (LPHANDLE)&key,\r
+         dwFlags & CERT_STORE_READONLY_FLAG ? KEY_READ : KEY_ALL_ACCESS,\r
+         TRUE, 0))\r
+        {\r
+            PWINECRYPT_CERTSTORE memStore;\r
+\r
+            memStore = CRYPT_MemOpenStore(hCryptProv, dwFlags, NULL);\r
+            if (memStore)\r
+            {\r
+                PWINE_REGSTOREINFO regInfo = CryptMemAlloc(\r
+                 sizeof(WINE_REGSTOREINFO));\r
+\r
+                if (regInfo)\r
+                {\r
+                    CERT_STORE_PROV_INFO provInfo = { 0 };\r
+\r
+                    regInfo->dwOpenFlags = dwFlags;\r
+                    regInfo->cryptProv = hCryptProv;\r
+                    regInfo->memStore = memStore;\r
+                    regInfo->key = key;\r
+                    InitializeCriticalSection(&regInfo->cs);\r
+                    list_init(&regInfo->certsToDelete);\r
+                    CRYPT_RegReadFromReg(regInfo);\r
+                    regInfo->dirty = FALSE;\r
+                    provInfo.cbSize = sizeof(provInfo);\r
+                    provInfo.cStoreProvFunc = sizeof(regProvFuncs) /\r
+                     sizeof(regProvFuncs[0]);\r
+                    provInfo.rgpvStoreProvFunc = regProvFuncs;\r
+                    provInfo.hStoreProv = regInfo;\r
+                    store = CRYPT_ProvCreateStore(hCryptProv, dwFlags, memStore,\r
+                     &provInfo);\r
+                }\r
+            }\r
+        }\r
+    }\r
+    TRACE("returning %p\n", store);\r
+    return store;\r
+}\r
+\r
+/* FIXME: this isn't complete for the Root store, in which the top-level\r
+ * self-signed CA certs reside.  Adding a cert to the Root store should present\r
+ * the user with a dialog indicating the consequences of doing so, and asking\r
+ * the user to confirm whether the cert should be added.\r
+ */\r
+static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreW(HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    static const WCHAR fmt[] = { '%','s','\\','%','s',0 };\r
+    LPCWSTR storeName = (LPCWSTR)pvPara;\r
+    LPWSTR storePath;\r
+    PWINECRYPT_CERTSTORE store = NULL;\r
+    HKEY root;\r
+    LPCWSTR base;\r
+    BOOL ret;\r
+\r
+    TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags,\r
+     debugstr_w((LPCWSTR)pvPara));\r
+\r
+    if (!pvPara)\r
+    {\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return NULL;\r
+    }\r
+\r
+    ret = TRUE;\r
+    switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK)\r
+    {\r
+    case CERT_SYSTEM_STORE_LOCAL_MACHINE:\r
+        root = HKEY_LOCAL_MACHINE;\r
+        base = CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH;\r
+        break;\r
+    case CERT_SYSTEM_STORE_CURRENT_USER:\r
+        root = HKEY_CURRENT_USER;\r
+        base = CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH;\r
+        break;\r
+    case CERT_SYSTEM_STORE_CURRENT_SERVICE:\r
+        /* hklm\Software\Microsoft\Cryptography\Services\servicename\\r
+         * SystemCertificates\r
+         */\r
+        FIXME("CERT_SYSTEM_STORE_CURRENT_SERVICE, %s: stub\n",\r
+         debugstr_w(storeName));\r
+        return NULL;\r
+    case CERT_SYSTEM_STORE_SERVICES:\r
+        /* hklm\Software\Microsoft\Cryptography\Services\servicename\\r
+         * SystemCertificates\r
+         */\r
+        FIXME("CERT_SYSTEM_STORE_SERVICES, %s: stub\n",\r
+         debugstr_w(storeName));\r
+        return NULL;\r
+    case CERT_SYSTEM_STORE_USERS:\r
+        /* hku\user sid\Software\Microsoft\SystemCertificates */\r
+        FIXME("CERT_SYSTEM_STORE_USERS, %s: stub\n",\r
+         debugstr_w(storeName));\r
+        return NULL;\r
+    case CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY:\r
+        root = HKEY_CURRENT_USER;\r
+        base = CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH;\r
+        break;\r
+    case CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY:\r
+        root = HKEY_LOCAL_MACHINE;\r
+        base = CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH;\r
+        break;\r
+    case CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE:\r
+        /* hklm\Software\Microsoft\EnterpriseCertificates */\r
+        FIXME("CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE, %s: stub\n",\r
+         debugstr_w(storeName));\r
+        return NULL;\r
+    default:\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return NULL;\r
+    }\r
+\r
+    storePath = CryptMemAlloc((lstrlenW(base) + lstrlenW(storeName) + 2) *\r
+     sizeof(WCHAR));\r
+    if (storePath)\r
+    {\r
+        LONG rc;\r
+        HKEY key;\r
+        REGSAM sam = dwFlags & CERT_STORE_READONLY_FLAG ? KEY_READ :\r
+            KEY_ALL_ACCESS;\r
+\r
+        wsprintfW(storePath, fmt, base, storeName);\r
+        if (dwFlags & CERT_STORE_OPEN_EXISTING_FLAG)\r
+            rc = RegOpenKeyExW(root, storePath, 0, sam, &key);\r
+        else\r
+        {\r
+            DWORD disp;\r
+\r
+            rc = RegCreateKeyExW(root, storePath, 0, NULL, 0, sam, NULL,\r
+                                 &key, &disp);\r
+            if (!rc && dwFlags & CERT_STORE_CREATE_NEW_FLAG &&\r
+                disp == REG_OPENED_EXISTING_KEY)\r
+            {\r
+                RegCloseKey(key);\r
+                rc = ERROR_FILE_EXISTS;\r
+            }\r
+        }\r
+        if (!rc)\r
+        {\r
+            store = CRYPT_RegOpenStore(hCryptProv, dwFlags, key);\r
+            RegCloseKey(key);\r
+        }\r
+        else\r
+            SetLastError(rc);\r
+        CryptMemFree(storePath);\r
+    }\r
+    return store;\r
+}\r
+\r
+static PWINECRYPT_CERTSTORE CRYPT_SysRegOpenStoreA(HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    int len;\r
+    PWINECRYPT_CERTSTORE ret = NULL;\r
+\r
+    TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags,\r
+     debugstr_a((LPCSTR)pvPara));\r
+\r
+    if (!pvPara)\r
+    {\r
+        SetLastError(ERROR_FILE_NOT_FOUND);\r
+        return NULL;\r
+    }\r
+    len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, NULL, 0);\r
+    if (len)\r
+    {\r
+        LPWSTR storeName = CryptMemAlloc(len * sizeof(WCHAR));\r
+\r
+        if (storeName)\r
+        {\r
+            MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, storeName, len);\r
+            ret = CRYPT_SysRegOpenStoreW(hCryptProv, dwFlags, storeName);\r
+            CryptMemFree(storeName);\r
+        }\r
+    }\r
+    return ret;\r
+}\r
+\r
+static PWINECRYPT_CERTSTORE CRYPT_SysOpenStoreW(HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    HCERTSTORE store = 0;\r
+    BOOL ret;\r
+\r
+    TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags,\r
+     debugstr_w((LPCWSTR)pvPara));\r
+\r
+    if (!pvPara)\r
+    {\r
+        SetLastError(ERROR_FILE_NOT_FOUND);\r
+        return NULL;\r
+    }\r
+    /* This returns a different error than system registry stores if the\r
+     * location is invalid.\r
+     */\r
+    switch (dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK)\r
+    {\r
+    case CERT_SYSTEM_STORE_LOCAL_MACHINE:\r
+    case CERT_SYSTEM_STORE_CURRENT_USER:\r
+    case CERT_SYSTEM_STORE_CURRENT_SERVICE:\r
+    case CERT_SYSTEM_STORE_SERVICES:\r
+    case CERT_SYSTEM_STORE_USERS:\r
+    case CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY:\r
+    case CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY:\r
+    case CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE:\r
+        ret = TRUE;\r
+        break;\r
+    default:\r
+        SetLastError(ERROR_FILE_NOT_FOUND);\r
+        ret = FALSE;\r
+    }\r
+    if (ret)\r
+    {\r
+        HCERTSTORE regStore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W,\r
+         0, hCryptProv, dwFlags, pvPara);\r
+\r
+        if (regStore)\r
+        {\r
+            store = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,\r
+             CERT_STORE_CREATE_NEW_FLAG, NULL);\r
+            CertAddStoreToCollection(store, regStore,\r
+             dwFlags & CERT_STORE_READONLY_FLAG ? 0 :\r
+             CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);\r
+            CertCloseStore(regStore, 0);\r
+            /* CERT_SYSTEM_STORE_CURRENT_USER returns both the HKCU and HKLM\r
+             * stores.\r
+             */\r
+            if ((dwFlags & CERT_SYSTEM_STORE_LOCATION_MASK) ==\r
+             CERT_SYSTEM_STORE_CURRENT_USER)\r
+            {\r
+                dwFlags &= ~CERT_SYSTEM_STORE_CURRENT_USER;\r
+                dwFlags |= CERT_SYSTEM_STORE_LOCAL_MACHINE;\r
+                regStore = CertOpenStore(CERT_STORE_PROV_SYSTEM_REGISTRY_W, 0,\r
+                 hCryptProv, dwFlags, pvPara);\r
+                if (regStore)\r
+                {\r
+                    CertAddStoreToCollection(store, regStore,\r
+                     dwFlags & CERT_STORE_READONLY_FLAG ? 0 :\r
+                     CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, 0);\r
+                    CertCloseStore(regStore, 0);\r
+                }\r
+            }\r
+        }\r
+    }\r
+    return (PWINECRYPT_CERTSTORE)store;\r
+}\r
+\r
+static PWINECRYPT_CERTSTORE CRYPT_SysOpenStoreA(HCRYPTPROV hCryptProv,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    int len;\r
+    PWINECRYPT_CERTSTORE ret = NULL;\r
+\r
+    TRACE("(%ld, %08lx, %s)\n", hCryptProv, dwFlags,\r
+     debugstr_a((LPCSTR)pvPara));\r
+\r
+    if (!pvPara)\r
+    {\r
+        SetLastError(ERROR_FILE_NOT_FOUND);\r
+        return NULL;\r
+    }\r
+    len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, NULL, 0);\r
+    if (len)\r
+    {\r
+        LPWSTR storeName = CryptMemAlloc(len * sizeof(WCHAR));\r
+\r
+        if (storeName)\r
+        {\r
+            MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pvPara, -1, storeName, len);\r
+            ret = CRYPT_SysOpenStoreW(hCryptProv, dwFlags, storeName);\r
+            CryptMemFree(storeName);\r
+        }\r
+    }\r
+    return ret;\r
+}\r
+\r
+HCERTSTORE WINAPI CertOpenStore(LPCSTR lpszStoreProvider,\r
+ DWORD dwMsgAndCertEncodingType, HCRYPTPROV hCryptProv, DWORD dwFlags,\r
+ const void* pvPara)\r
+{\r
+    WINECRYPT_CERTSTORE *hcs;\r
+    StoreOpenFunc openFunc = NULL;\r
+\r
+    TRACE("(%s, %08lx, %08lx, %08lx, %p)\n", debugstr_a(lpszStoreProvider),\r
+          dwMsgAndCertEncodingType, hCryptProv, dwFlags, pvPara);\r
+\r
+    if (!HIWORD(lpszStoreProvider))\r
+    {\r
+        switch (LOWORD(lpszStoreProvider))\r
+        {\r
+        case (int)CERT_STORE_PROV_MEMORY:\r
+            openFunc = CRYPT_MemOpenStore;\r
+            break;\r
+        case (int)CERT_STORE_PROV_REG:\r
+            openFunc = CRYPT_RegOpenStore;\r
+            break;\r
+        case (int)CERT_STORE_PROV_COLLECTION:\r
+            openFunc = CRYPT_CollectionOpenStore;\r
+            break;\r
+        case (int)CERT_STORE_PROV_SYSTEM_A:\r
+            openFunc = CRYPT_SysOpenStoreA;\r
+            break;\r
+        case (int)CERT_STORE_PROV_SYSTEM_W:\r
+            openFunc = CRYPT_SysOpenStoreW;\r
+            break;\r
+        case (int)CERT_STORE_PROV_SYSTEM_REGISTRY_A:\r
+            openFunc = CRYPT_SysRegOpenStoreA;\r
+            break;\r
+        case (int)CERT_STORE_PROV_SYSTEM_REGISTRY_W:\r
+            openFunc = CRYPT_SysRegOpenStoreW;\r
+            break;\r
+        default:\r
+            if (LOWORD(lpszStoreProvider))\r
+                FIXME("unimplemented type %d\n", LOWORD(lpszStoreProvider));\r
+        }\r
+    }\r
+    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_MEMORY))\r
+        openFunc = CRYPT_MemOpenStore;\r
+    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM))\r
+        openFunc = CRYPT_SysOpenStoreW;\r
+    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_COLLECTION))\r
+        openFunc = CRYPT_CollectionOpenStore;\r
+    else if (!strcasecmp(lpszStoreProvider, sz_CERT_STORE_PROV_SYSTEM_REGISTRY))\r
+        openFunc = CRYPT_SysRegOpenStoreW;\r
+    else\r
+    {\r
+        FIXME("unimplemented type %s\n", lpszStoreProvider);\r
+        openFunc = NULL;\r
+    }\r
+\r
+    if (!openFunc)\r
+        hcs = CRYPT_ProvOpenStore(lpszStoreProvider, dwMsgAndCertEncodingType,\r
+         hCryptProv, dwFlags, pvPara);\r
+    else\r
+        hcs = openFunc(hCryptProv, dwFlags, pvPara);\r
+    return (HCERTSTORE)hcs;\r
+}\r
+\r
+HCERTSTORE WINAPI CertOpenSystemStoreA(HCRYPTPROV hProv,\r
+ LPCSTR szSubSystemProtocol)\r
+{\r
+    if (!szSubSystemProtocol)\r
+    {\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return 0;\r
+    }\r
+    return CertOpenStore(CERT_STORE_PROV_SYSTEM_A, 0, hProv,\r
+     CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol);\r
+}\r
+\r
+HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV hProv,\r
+ LPCWSTR szSubSystemProtocol)\r
+{\r
+    if (!szSubSystemProtocol)\r
+    {\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return 0;\r
+    }\r
+    return CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, hProv,\r
+     CERT_SYSTEM_STORE_CURRENT_USER, szSubSystemProtocol);\r
+}\r
+\r
+BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType,\r
+             DWORD dwSaveAs, DWORD dwSaveTo, void* pvSaveToPara, DWORD dwFlags)\r
+{\r
+    FIXME("(%p,%ld,%ld,%ld,%p,%08lx) stub!\n", hCertStore, \r
+          dwMsgAndCertEncodingType, dwSaveAs, dwSaveTo, pvSaveToPara, dwFlags);\r
+    return TRUE;\r
+}\r
+\r
+PCCRL_CONTEXT WINAPI CertCreateCRLContext( DWORD dwCertEncodingType,\r
+  const BYTE* pbCrlEncoded, DWORD cbCrlEncoded)\r
+{\r
+    PCRL_CONTEXT pcrl;\r
+    BYTE* data;\r
+\r
+    TRACE("%08lx %p %08lx\n", dwCertEncodingType, pbCrlEncoded, cbCrlEncoded);\r
+\r
+    /* FIXME: semi-stub, need to use CryptDecodeObjectEx to decode the CRL. */\r
+    pcrl = CryptMemAlloc( sizeof (CRL_CONTEXT) );\r
+    if( !pcrl )\r
+        return NULL;\r
+\r
+    data = CryptMemAlloc( cbCrlEncoded );\r
+    if( !data )\r
+    {\r
+        CryptMemFree( pcrl );\r
+        return NULL;\r
+    }\r
+\r
+    pcrl->dwCertEncodingType = dwCertEncodingType;\r
+    pcrl->pbCrlEncoded       = data;\r
+    pcrl->cbCrlEncoded       = cbCrlEncoded;\r
+    pcrl->pCrlInfo           = NULL;\r
+    pcrl->hCertStore         = 0;\r
+\r
+    return pcrl;\r
+}\r
+\r
+/* Decodes the encoded certificate and creates the certificate context for it.\r
+ */\r
+static PWINE_CERT_CONTEXT CRYPT_CreateCertificateContext(\r
+ DWORD dwCertEncodingType, const BYTE *pbCertEncoded, DWORD cbCertEncoded)\r
+{\r
+    PWINE_CERT_CONTEXT_DATA cert = NULL;\r
+    BOOL ret;\r
+    PCERT_SIGNED_CONTENT_INFO signedCert = NULL;\r
+    PCERT_INFO certInfo = NULL;\r
+    DWORD size = 0;\r
+\r
+    TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCertEncoded,\r
+     cbCertEncoded);\r
+\r
+    /* First try to decode it as a signed cert. */\r
+    ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT, pbCertEncoded,\r
+     cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&signedCert, &size);\r
+    if (ret)\r
+    {\r
+        size = 0;\r
+        ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED,\r
+         signedCert->ToBeSigned.pbData, signedCert->ToBeSigned.cbData,\r
+         CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&certInfo, &size);\r
+        LocalFree(signedCert);\r
+    }\r
+    /* Failing that, try it as an unsigned cert */\r
+    if (!ret)\r
+    {\r
+        size = 0;\r
+        ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED,\r
+         pbCertEncoded, cbCertEncoded,\r
+         CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL,\r
+         (BYTE *)&certInfo, &size);\r
+    }\r
+    if (ret)\r
+    {\r
+        BYTE *data = NULL;\r
+\r
+        cert = CryptMemAlloc(sizeof(WINE_CERT_CONTEXT_DATA));\r
+        if (!cert)\r
+            goto end;\r
+        data = CryptMemAlloc(cbCertEncoded);\r
+        if (!data)\r
+        {\r
+            CryptMemFree(cert);\r
+            cert = NULL;\r
+            goto end;\r
+        }\r
+        memcpy(data, pbCertEncoded, cbCertEncoded);\r
+        cert->cert.dwCertEncodingType = dwCertEncodingType;\r
+        cert->cert.pbCertEncoded      = data;\r
+        cert->cert.cbCertEncoded      = cbCertEncoded;\r
+        cert->cert.pCertInfo          = certInfo;\r
+        cert->cert.hCertStore         = 0;\r
+        cert->ref = 1;\r
+        cert->type = ContextTypeData;\r
+        cert->properties = ContextPropertyList_Create();\r
+    }\r
+\r
+end:\r
+    return (PWINE_CERT_CONTEXT)cert;\r
+}\r
+\r
+PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType,\r
+ const BYTE *pbCertEncoded, DWORD cbCertEncoded)\r
+{\r
+    PWINE_CERT_CONTEXT cert;\r
+\r
+    TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCertEncoded,\r
+     cbCertEncoded);\r
+\r
+    cert = CRYPT_CreateCertificateContext(dwCertEncodingType, pbCertEncoded,\r
+     cbCertEncoded);\r
+    return (PCCERT_CONTEXT)cert;\r
+}\r
+\r
+/* If context is a link, follows it to its linked context (recursively, if\r
+ * necessary) and returns the data context associated with the link.\r
+ * Otherwise just returns context.\r
+ */\r
+static inline PWINE_CERT_CONTEXT_DATA CertContext_GetDataContext(\r
+ PWINE_CERT_CONTEXT context)\r
+{\r
+    PWINE_CERT_CONTEXT ptr = context;\r
+\r
+    while (ptr && ptr->type == ContextTypeLink)\r
+        ptr = ((PWINE_CERT_CONTEXT_LINK)ptr)->linked;\r
+    return (ptr && ptr->type == ContextTypeData) ?\r
+     (PWINE_CERT_CONTEXT_DATA)ptr : NULL;\r
+}\r
+\r
+DWORD WINAPI CertEnumCertificateContextProperties(PCCERT_CONTEXT pCertContext,\r
+ DWORD dwPropId)\r
+{\r
+    PWINE_CERT_CONTEXT_DATA linked = CertContext_GetDataContext(\r
+     (PWINE_CERT_CONTEXT)pCertContext);\r
+    DWORD ret;\r
+\r
+    TRACE("(%p, %ld)\n", pCertContext, dwPropId);\r
+\r
+    if (linked)\r
+        ret = ContextPropertyList_EnumPropIDs(linked->properties, dwPropId);\r
+    else\r
+        ret = 0;\r
+    return ret;\r
+}\r
+\r
+static BOOL CRYPT_GetCertHashProp(PWINE_CERT_CONTEXT context, DWORD dwPropId,\r
+ ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData,\r
+ DWORD *pcbData)\r
+{\r
+    BOOL ret = CryptHashCertificate(0, algID, 0, toHash, toHashLen, pvData,\r
+     pcbData);\r
+    if (ret)\r
+    {\r
+        CRYPT_DATA_BLOB blob = { *pcbData, pvData };\r
+\r
+        ret = CRYPT_SetCertificateContextProperty(context, dwPropId,\r
+         0, &blob);\r
+    }\r
+    return ret;\r
+}\r
+\r
+static BOOL WINAPI CRYPT_GetCertificateContextProperty(\r
+ PWINE_CERT_CONTEXT context, DWORD dwPropId, void *pvData, DWORD *pcbData)\r
+{\r
+    PWINE_CERT_CONTEXT_DATA linked = CertContext_GetDataContext(context);\r
+    BOOL ret;\r
+    CRYPT_DATA_BLOB blob;\r
+\r
+    TRACE("(%p, %ld, %p, %p)\n", context, dwPropId, pvData, pcbData);\r
+\r
+    if (linked)\r
+        ret = ContextPropertyList_FindProperty(linked->properties, dwPropId,\r
+         &blob);\r
+    else\r
+        ret = FALSE;\r
+    if (ret)\r
+    {\r
+        if (!pvData)\r
+        {\r
+            *pcbData = blob.cbData;\r
+            ret = TRUE;\r
+        }\r
+        else if (*pcbData < blob.cbData)\r
+        {\r
+            SetLastError(ERROR_MORE_DATA);\r
+            *pcbData = blob.cbData;\r
+        }\r
+        else\r
+        {\r
+            memcpy(pvData, blob.pbData, blob.cbData);\r
+            *pcbData = blob.cbData;\r
+            ret = TRUE;\r
+        }\r
+    }\r
+    else\r
+    {\r
+        /* Implicit properties */\r
+        switch (dwPropId)\r
+        {\r
+        case CERT_SHA1_HASH_PROP_ID:\r
+            ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_SHA1,\r
+             context->cert.pbCertEncoded, context->cert.cbCertEncoded, pvData,\r
+             pcbData);\r
+            break;\r
+        case CERT_MD5_HASH_PROP_ID:\r
+            ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5,\r
+             context->cert.pbCertEncoded, context->cert.cbCertEncoded, pvData,\r
+             pcbData);\r
+            break;\r
+        case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID:\r
+            ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5,\r
+             context->cert.pCertInfo->Subject.pbData,\r
+             context->cert.pCertInfo->Subject.cbData,\r
+             pvData, pcbData);\r
+            break;\r
+        case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID:\r
+            ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5,\r
+             context->cert.pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData,\r
+             context->cert.pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData,\r
+             pvData, pcbData);\r
+            break;\r
+        case CERT_SIGNATURE_HASH_PROP_ID:\r
+        case CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID:\r
+            FIXME("implicit property %ld\n", dwPropId);\r
+            SetLastError(CRYPT_E_NOT_FOUND);\r
+            break;\r
+        default:\r
+            SetLastError(CRYPT_E_NOT_FOUND);\r
+        }\r
+    }\r
+    TRACE("returning %d\n", ret);\r
+    return ret;\r
+}\r
+\r
+BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext,\r
+ DWORD dwPropId, void *pvData, DWORD *pcbData)\r
+{\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %ld, %p, %p)\n", pCertContext, dwPropId, pvData, pcbData);\r
+\r
+    /* Special cases for invalid/special prop IDs.\r
+     */\r
+    switch (dwPropId)\r
+    {\r
+    case 0:\r
+    case CERT_CERT_PROP_ID:\r
+    case CERT_CRL_PROP_ID:\r
+    case CERT_CTL_PROP_ID:\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return FALSE;\r
+    case CERT_ACCESS_STATE_PROP_ID:\r
+        if (!pvData)\r
+        {\r
+            *pcbData = sizeof(DWORD);\r
+            return TRUE;\r
+        }\r
+        else if (*pcbData < sizeof(DWORD))\r
+        {\r
+            SetLastError(ERROR_MORE_DATA);\r
+            *pcbData = sizeof(DWORD);\r
+            return FALSE;\r
+        }\r
+        else\r
+        {\r
+            DWORD state = 0;\r
+\r
+            if (pCertContext->hCertStore)\r
+            {\r
+                PWINECRYPT_CERTSTORE store =\r
+                 (PWINECRYPT_CERTSTORE)pCertContext->hCertStore;\r
+\r
+                if (!(store->dwOpenFlags & CERT_STORE_READONLY_FLAG))\r
+                    state |= CERT_ACCESS_STATE_WRITE_PERSIST_FLAG;\r
+            }\r
+            *(DWORD *)pvData = state;\r
+            return TRUE;\r
+        }\r
+    }\r
+\r
+    ret = CRYPT_GetCertificateContextProperty((PWINE_CERT_CONTEXT)pCertContext,\r
+     dwPropId, pvData, pcbData);\r
+    TRACE("returning %d\n", ret);\r
+    return ret;\r
+}\r
+\r
+static BOOL WINAPI CRYPT_SetCertificateContextProperty(\r
+ PWINE_CERT_CONTEXT context, DWORD dwPropId, DWORD dwFlags, const void *pvData)\r
+{\r
+    PWINE_CERT_CONTEXT_DATA linked = CertContext_GetDataContext(context);\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %ld, %08lx, %p)\n", context, dwPropId, dwFlags, pvData);\r
+\r
+    if (!linked)\r
+        ret = FALSE;\r
+    else if (!pvData)\r
+    {\r
+        ContextPropertyList_RemoveProperty(linked->properties, dwPropId);\r
+        ret = TRUE;\r
+    }\r
+    else\r
+    {\r
+        switch (dwPropId)\r
+        {\r
+        case CERT_AUTO_ENROLL_PROP_ID:\r
+        case CERT_CTL_USAGE_PROP_ID: /* same as CERT_ENHKEY_USAGE_PROP_ID */\r
+        case CERT_DESCRIPTION_PROP_ID:\r
+        case CERT_FRIENDLY_NAME_PROP_ID:\r
+        case CERT_HASH_PROP_ID:\r
+        case CERT_KEY_IDENTIFIER_PROP_ID:\r
+        case CERT_MD5_HASH_PROP_ID:\r
+        case CERT_NEXT_UPDATE_LOCATION_PROP_ID:\r
+        case CERT_PUBKEY_ALG_PARA_PROP_ID:\r
+        case CERT_PVK_FILE_PROP_ID:\r
+        case CERT_SIGNATURE_HASH_PROP_ID:\r
+        case CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID:\r
+        case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID:\r
+        case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID:\r
+        case CERT_ENROLLMENT_PROP_ID:\r
+        case CERT_CROSS_CERT_DIST_POINTS_PROP_ID:\r
+        case CERT_RENEWAL_PROP_ID:\r
+        {\r
+            PCRYPT_DATA_BLOB blob = (PCRYPT_DATA_BLOB)pvData;\r
+\r
+            ret = ContextPropertyList_SetProperty(linked->properties, dwPropId,\r
+             blob->pbData, blob->cbData);\r
+            break;\r
+        }\r
+        case CERT_DATE_STAMP_PROP_ID:\r
+            ret = ContextPropertyList_SetProperty(linked->properties, dwPropId,\r
+             pvData, sizeof(FILETIME));\r
+            break;\r
+        default:\r
+            FIXME("%ld: stub\n", dwPropId);\r
+            ret = FALSE;\r
+        }\r
+    }\r
+    TRACE("returning %d\n", ret);\r
+    return ret;\r
+}\r
+\r
+BOOL WINAPI CertSetCertificateContextProperty(PCCERT_CONTEXT pCertContext,\r
+ DWORD dwPropId, DWORD dwFlags, const void *pvData)\r
+{\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %ld, %08lx, %p)\n", pCertContext, dwPropId, dwFlags, pvData);\r
+\r
+    /* Handle special cases for "read-only"/invalid prop IDs.  Windows just\r
+     * crashes on most of these, I'll be safer.\r
+     */\r
+    switch (dwPropId)\r
+    {\r
+    case 0:\r
+    case CERT_ACCESS_STATE_PROP_ID:\r
+    case CERT_CERT_PROP_ID:\r
+    case CERT_CRL_PROP_ID:\r
+    case CERT_CTL_PROP_ID:\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return FALSE;\r
+    }\r
+    ret = CRYPT_SetCertificateContextProperty((PWINE_CERT_CONTEXT)pCertContext,\r
+     dwPropId, dwFlags, pvData);\r
+    TRACE("returning %d\n", ret);\r
+    return ret;\r
+}\r
+\r
+PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext(\r
+ PCCERT_CONTEXT pCertContext)\r
+{\r
+    PWINE_CERT_CONTEXT context = (PWINE_CERT_CONTEXT)pCertContext;\r
+\r
+    TRACE("(%p)\n", pCertContext);\r
+    InterlockedIncrement(&context->ref);\r
+    return pCertContext;\r
+}\r
+\r
+BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE hCertStore,\r
+ PCCERT_CONTEXT pCertContext, DWORD dwAddDisposition,\r
+ PCCERT_CONTEXT *ppStoreContext)\r
+{\r
+    PWINECRYPT_CERTSTORE store = (PWINECRYPT_CERTSTORE)hCertStore;\r
+    PWINE_CERT_CONTEXT_DATA linked = CertContext_GetDataContext(\r
+     (PWINE_CERT_CONTEXT)pCertContext);\r
+    PWINE_CERT_CONTEXT cert;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %p, %08lx, %p)\n", hCertStore, pCertContext,\r
+     dwAddDisposition, ppStoreContext);\r
+\r
+    /* FIXME: some tests needed to verify return codes */\r
+    if (!store)\r
+    {\r
+        SetLastError(ERROR_INVALID_PARAMETER);\r
+        return FALSE;\r
+    }\r
+    if (store->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)\r
+    {\r
+        SetLastError(ERROR_INVALID_PARAMETER);\r
+        return FALSE;\r
+    }\r
+\r
+    cert = CRYPT_CreateCertificateContext(pCertContext->dwCertEncodingType,\r
+     pCertContext->pbCertEncoded, pCertContext->cbCertEncoded);\r
+    if (cert)\r
+    {\r
+        PWINE_CERT_CONTEXT_DATA certData = CertContext_GetDataContext(cert);\r
+\r
+        ContextPropertyList_Copy(certData->properties, linked->properties);\r
+        ret = store->addCert(store, cert, dwAddDisposition, ppStoreContext);\r
+        CertFreeCertificateContext((PCCERT_CONTEXT)cert);\r
+    }\r
+    else\r
+        ret = FALSE;\r
+    return ret;\r
+}\r
+\r
+BOOL WINAPI CertAddEncodedCertificateToStore(HCERTSTORE hCertStore,\r
+ DWORD dwCertEncodingType, const BYTE *pbCertEncoded, DWORD cbCertEncoded,\r
+ DWORD dwAddDisposition, PCCERT_CONTEXT *ppCertContext)\r
+{\r
+    WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %08lx, %p, %ld, %08lx, %p)\n", hCertStore, dwCertEncodingType,\r
+     pbCertEncoded, cbCertEncoded, dwAddDisposition, ppCertContext);\r
+\r
+    if (!hcs)\r
+        ret = FALSE;\r
+    else if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)\r
+        ret = FALSE;\r
+    else\r
+    {\r
+        PWINE_CERT_CONTEXT cert = CRYPT_CreateCertificateContext(\r
+         dwCertEncodingType, pbCertEncoded, cbCertEncoded);\r
+\r
+        if (cert)\r
+        {\r
+            ret = hcs->addCert(hcs, cert, dwAddDisposition, ppCertContext);\r
+            CertFreeCertificateContext((PCCERT_CONTEXT)cert);\r
+        }\r
+        else\r
+            ret = FALSE;\r
+    }\r
+    return ret;\r
+}\r
+\r
+PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore,\r
+ PCCERT_CONTEXT pPrev)\r
+{\r
+    WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore;\r
+    PCCERT_CONTEXT ret;\r
+\r
+    TRACE("(%p, %p)\n", hCertStore, pPrev);\r
+    if (!hCertStore)\r
+        ret = NULL;\r
+    else if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)\r
+        ret = NULL;\r
+    else\r
+        ret = (PCCERT_CONTEXT)hcs->enumCert(hcs, (PWINE_CERT_CONTEXT)pPrev);\r
+    return ret;\r
+}\r
+\r
+BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext)\r
+{\r
+    BOOL ret;\r
+\r
+    TRACE("(%p)\n", pCertContext);\r
+\r
+    if (!pCertContext)\r
+        ret = TRUE;\r
+    else if (!pCertContext->hCertStore)\r
+    {\r
+        ret = TRUE;\r
+        CertFreeCertificateContext(pCertContext);\r
+    }\r
+    else\r
+    {\r
+        PWINECRYPT_CERTSTORE hcs =\r
+         (PWINECRYPT_CERTSTORE)pCertContext->hCertStore;\r
+\r
+        if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)\r
+            ret = FALSE;\r
+        else\r
+            ret = hcs->deleteCert(hcs, pCertContext, 0);\r
+        CertFreeCertificateContext(pCertContext);\r
+    }\r
+    return ret;\r
+}\r
+\r
+BOOL WINAPI CertAddEncodedCRLToStore(HCERTSTORE hCertStore,\r
+ DWORD dwCertEncodingType, const BYTE *pbCrlEncoded, DWORD cbCrlEncoded,\r
+ DWORD dwAddDisposition, PCCRL_CONTEXT *ppCrlContext)\r
+{\r
+    FIXME("(%p, %08lx, %p, %ld, %08lx, %p): stub\n", hCertStore,\r
+     dwCertEncodingType, pbCrlEncoded, cbCrlEncoded, dwAddDisposition,\r
+     ppCrlContext);\r
+    return FALSE;\r
+}\r
+\r
+BOOL WINAPI CertAddCRLContextToStore( HCERTSTORE hCertStore,\r
+             PCCRL_CONTEXT pCrlContext, DWORD dwAddDisposition,\r
+             PCCRL_CONTEXT* ppStoreContext )\r
+{\r
+    FIXME("%p %p %08lx %p\n", hCertStore, pCrlContext,\r
+          dwAddDisposition, ppStoreContext);\r
+    return TRUE;\r
+}\r
+\r
+BOOL WINAPI CertFreeCRLContext( PCCRL_CONTEXT pCrlContext)\r
+{\r
+    FIXME("%p\n", pCrlContext );\r
+\r
+    return TRUE;\r
+}\r
+\r
+BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext)\r
+{\r
+    FIXME("(%p): stub\n", pCrlContext);\r
+    return TRUE;\r
+}\r
+\r
+PCCRL_CONTEXT WINAPI CertEnumCRLsInStore(HCERTSTORE hCertStore,\r
+ PCCRL_CONTEXT pPrev)\r
+{\r
+    FIXME("(%p, %p): stub\n", hCertStore, pPrev);\r
+    return NULL;\r
+}\r
+\r
+PCCTL_CONTEXT WINAPI CertCreateCTLContext(DWORD dwCertEncodingType,\r
+  const BYTE* pbCtlEncoded, DWORD cbCtlEncoded)\r
+{\r
+    FIXME("(%08lx, %p, %08lx): stub\n", dwCertEncodingType, pbCtlEncoded,\r
+     cbCtlEncoded);\r
+    return NULL;\r
+}\r
+\r
+BOOL WINAPI CertAddEncodedCTLToStore(HCERTSTORE hCertStore,\r
+ DWORD dwMsgAndCertEncodingType, const BYTE *pbCtlEncoded, DWORD cbCtlEncoded,\r
+ DWORD dwAddDisposition, PCCTL_CONTEXT *ppCtlContext)\r
+{\r
+    FIXME("(%p, %08lx, %p, %ld, %08lx, %p): stub\n", hCertStore,\r
+     dwMsgAndCertEncodingType, pbCtlEncoded, cbCtlEncoded, dwAddDisposition,\r
+     ppCtlContext);\r
+    return FALSE;\r
+}\r
+\r
+BOOL WINAPI CertAddCTLContextToStore(HCERTSTORE hCertStore,\r
+ PCCTL_CONTEXT pCtlContext, DWORD dwAddDisposition,\r
+ PCCTL_CONTEXT* ppStoreContext)\r
+{\r
+    FIXME("(%p, %p, %08lx, %p): stub\n", hCertStore, pCtlContext,\r
+     dwAddDisposition, ppStoreContext);\r
+    return TRUE;\r
+}\r
+\r
+BOOL WINAPI CertFreeCTLContext(PCCTL_CONTEXT pCtlContext)\r
+{\r
+    FIXME("(%p): stub\n", pCtlContext );\r
+    return TRUE;\r
+}\r
+\r
+BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext)\r
+{\r
+    FIXME("(%p): stub\n", pCtlContext);\r
+    return TRUE;\r
+}\r
+\r
+PCCTL_CONTEXT WINAPI CertEnumCTLsInStore(HCERTSTORE hCertStore,\r
+ PCCTL_CONTEXT pPrev)\r
+{\r
+    FIXME("(%p, %p): stub\n", hCertStore, pPrev);\r
+    return NULL;\r
+}\r
+\r
+HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE hCertStore)\r
+{\r
+    WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore;\r
+\r
+    TRACE("(%p)\n", hCertStore);\r
+\r
+    if (hcs && hcs->dwMagic == WINE_CRYPTCERTSTORE_MAGIC)\r
+        InterlockedIncrement(&hcs->ref);\r
+    return hCertStore;\r
+}\r
+\r
+BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags)\r
+{\r
+    WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *) hCertStore;\r
+\r
+    TRACE("(%p, %08lx)\n", hCertStore, dwFlags);\r
+\r
+    if( ! hCertStore )\r
+        return TRUE;\r
+\r
+    if ( hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC )\r
+        return FALSE;\r
+\r
+    if (InterlockedDecrement(&hcs->ref) == 0)\r
+    {\r
+        TRACE("%p's ref count is 0, freeing\n", hcs);\r
+        hcs->dwMagic = 0;\r
+        if (!(hcs->dwOpenFlags & CERT_STORE_NO_CRYPT_RELEASE_FLAG))\r
+            CryptReleaseContext(hcs->cryptProv, 0);\r
+        hcs->closeStore(hcs, dwFlags);\r
+    }\r
+    else\r
+        TRACE("%p's ref count is %ld\n", hcs, hcs->ref);\r
+    return TRUE;\r
+}\r
+\r
+BOOL WINAPI CertControlStore(HCERTSTORE hCertStore, DWORD dwFlags,\r
+ DWORD dwCtrlType, void const *pvCtrlPara)\r
+{\r
+    WINECRYPT_CERTSTORE *hcs = (WINECRYPT_CERTSTORE *)hCertStore;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %08lx, %ld, %p)\n", hCertStore, dwFlags, dwCtrlType,\r
+     pvCtrlPara);\r
+\r
+    if (!hcs)\r
+        ret = FALSE;\r
+    else if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)\r
+        ret = FALSE;\r
+    else\r
+    {\r
+        if (hcs->control)\r
+            ret = hcs->control(hCertStore, dwFlags, dwCtrlType, pvCtrlPara);\r
+        else\r
+            ret = TRUE;\r
+    }\r
+    return ret;\r
+}\r
+\r
+BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext,\r
+ DWORD dwPropId, void *pvData, DWORD *pcbData)\r
+{\r
+    FIXME("(%p, %ld, %p, %p): stub\n", pCRLContext, dwPropId, pvData, pcbData);\r
+    return FALSE;\r
+}\r
+\r
+BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext,\r
+ DWORD dwPropId, DWORD dwFlags, const void *pvData)\r
+{\r
+    FIXME("(%p, %ld, %08lx, %p): stub\n", pCRLContext, dwPropId, dwFlags,\r
+     pvData);\r
+    return FALSE;\r
+}\r
+\r
+BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext,\r
+ DWORD dwPropId, void *pvData, DWORD *pcbData)\r
+{\r
+    FIXME("(%p, %ld, %p, %p): stub\n", pCTLContext, dwPropId, pvData, pcbData);\r
+    return FALSE;\r
+}\r
+\r
+BOOL WINAPI CertSetCTLContextProperty(PCCTL_CONTEXT pCTLContext,\r
+ DWORD dwPropId, DWORD dwFlags, const void *pvData)\r
+{\r
+    FIXME("(%p, %ld, %08lx, %p): stub\n", pCTLContext, dwPropId, dwFlags,\r
+     pvData);\r
+    return FALSE;\r
+}\r
+\r
+static void CertDataContext_Free(PWINE_CERT_CONTEXT_DATA context)\r
+{\r
+    CryptMemFree(context->cert.pbCertEncoded);\r
+    LocalFree(context->cert.pCertInfo);\r
+    ContextPropertyList_Free(context->properties);\r
+    CryptMemFree(context);\r
+}\r
+\r
+static void CertLinkContext_Free(PWINE_CERT_CONTEXT_LINK context)\r
+{\r
+    CertFreeCertificateContext((PCCERT_CONTEXT)context->linked);\r
+    CryptMemFree(context);\r
+}\r
+\r
+static void CertContext_Release(PWINE_CERT_CONTEXT context)\r
+{\r
+    if (InterlockedDecrement(&context->ref) == 0)\r
+    {\r
+        TRACE("freeing %p\n", context);\r
+        switch (context->type)\r
+        {\r
+        case ContextTypeData:\r
+            CertDataContext_Free((PWINE_CERT_CONTEXT_DATA)context);\r
+            break;\r
+        case ContextTypeLink:\r
+            CertLinkContext_Free((PWINE_CERT_CONTEXT_LINK)context);\r
+            break;\r
+        default:\r
+            assert(0);\r
+        }\r
+    }\r
+    else\r
+        TRACE("%p's ref count is %ld\n", context, context->ref);\r
+}\r
+\r
+BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext)\r
+{\r
+    TRACE("(%p)\n", pCertContext);\r
+\r
+    if (pCertContext)\r
+        CertContext_Release((PWINE_CERT_CONTEXT)pCertContext);\r
+    return TRUE;\r
+}\r
+\r
+typedef BOOL (*CertCompareFunc)(PCCERT_CONTEXT pCertContext, DWORD dwType,\r
+ DWORD dwFlags, const void *pvPara);\r
+\r
+static BOOL compare_cert_any(PCCERT_CONTEXT pCertContext, DWORD dwType,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    return TRUE;\r
+}\r
+\r
+static BOOL compare_cert_by_md5_hash(PCCERT_CONTEXT pCertContext, DWORD dwType,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    BOOL ret;\r
+    BYTE hash[16];\r
+    DWORD size = sizeof(hash);\r
+\r
+    ret = CertGetCertificateContextProperty(pCertContext,\r
+     CERT_MD5_HASH_PROP_ID, hash, &size);\r
+    if (ret)\r
+    {\r
+        const CRYPT_HASH_BLOB *pHash = (const CRYPT_HASH_BLOB *)pvPara;\r
+\r
+        if (size == pHash->cbData)\r
+            ret = !memcmp(pHash->pbData, hash, size);\r
+        else\r
+            ret = FALSE;\r
+    }\r
+    return ret;\r
+}\r
+\r
+static BOOL compare_cert_by_sha1_hash(PCCERT_CONTEXT pCertContext, DWORD dwType,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    BOOL ret;\r
+    BYTE hash[20];\r
+    DWORD size = sizeof(hash);\r
+\r
+    ret = CertGetCertificateContextProperty(pCertContext,\r
+     CERT_SHA1_HASH_PROP_ID, hash, &size);\r
+    if (ret)\r
+    {\r
+        const CRYPT_HASH_BLOB *pHash = (const CRYPT_HASH_BLOB *)pvPara;\r
+\r
+        if (size == pHash->cbData)\r
+            ret = !memcmp(pHash->pbData, hash, size);\r
+        else\r
+            ret = FALSE;\r
+    }\r
+    return ret;\r
+}\r
+\r
+static BOOL compare_cert_by_name(PCCERT_CONTEXT pCertContext, DWORD dwType,\r
+ DWORD dwFlags, const void *pvPara)\r
+{\r
+    const CERT_NAME_BLOB *blob = (const CERT_NAME_BLOB *)pvPara, *toCompare;\r
+    BOOL ret;\r
+\r
+    if (dwType & CERT_INFO_SUBJECT_FLAG)\r
+        toCompare = &pCertContext->pCertInfo->Subject;\r
+    else\r
+        toCompare = &pCertContext->pCertInfo->Issuer;\r
+    if (toCompare->cbData == blob->cbData)\r
+        ret = !memcmp(toCompare->pbData, blob->pbData, blob->cbData);\r
+    else\r
+        ret = FALSE;\r
+    return ret;\r
+}\r
+\r
+static BOOL compare_cert_by_subject_cert(PCCERT_CONTEXT pCertContext,\r
+ DWORD dwType, DWORD dwFlags, const void *pvPara)\r
+{\r
+    const CERT_INFO *pCertInfo = (const CERT_INFO *)pvPara;\r
+    BOOL ret;\r
+\r
+    if (pCertInfo->Issuer.cbData == pCertContext->pCertInfo->Subject.cbData)\r
+        ret = !memcmp(pCertInfo->Issuer.pbData,\r
+         pCertContext->pCertInfo->Subject.pbData, pCertInfo->Issuer.cbData);\r
+    else\r
+        ret = FALSE;\r
+    return ret;\r
+}\r
+\r
+PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore,\r
+               DWORD dwCertEncodingType, DWORD dwFlags, DWORD dwType,\r
+               const void *pvPara, PCCERT_CONTEXT pPrevCertContext)\r
+{\r
+    PCCERT_CONTEXT ret;\r
+    CertCompareFunc compare;\r
+\r
+    TRACE("(%p, %ld, %ld, %ld, %p, %p)\n", hCertStore, dwCertEncodingType,\r
+        dwFlags, dwType, pvPara, pPrevCertContext);\r
+\r
+    switch (dwType >> CERT_COMPARE_SHIFT)\r
+    {\r
+    case CERT_COMPARE_ANY:\r
+        compare = compare_cert_any;\r
+        break;\r
+    case CERT_COMPARE_MD5_HASH:\r
+        compare = compare_cert_by_md5_hash;\r
+        break;\r
+    case CERT_COMPARE_SHA1_HASH:\r
+        compare = compare_cert_by_sha1_hash;\r
+        break;\r
+    case CERT_COMPARE_NAME:\r
+        compare = compare_cert_by_name;\r
+        break;\r
+    case CERT_COMPARE_SUBJECT_CERT:\r
+        compare = compare_cert_by_subject_cert;\r
+        break;\r
+    default:\r
+        FIXME("find type %08lx unimplemented\n", dwType);\r
+        compare = NULL;\r
+    }\r
+\r
+    if (compare)\r
+    {\r
+        BOOL matches = FALSE;\r
+\r
+        ret = pPrevCertContext;\r
+        do {\r
+            ret = CertEnumCertificatesInStore(hCertStore, ret);\r
+            if (ret)\r
+                matches = compare(ret, dwType, dwFlags, pvPara);\r
+        } while (ret != NULL && !matches);\r
+        if (!ret)\r
+            SetLastError(CRYPT_E_NOT_FOUND);\r
+    }\r
+    else\r
+    {\r
+        SetLastError(CRYPT_E_NOT_FOUND);\r
+        ret = NULL;\r
+    }\r
+    return ret;\r
+}\r
+\r
+BOOL WINAPI CertAddStoreToCollection(HCERTSTORE hCollectionStore,\r
+ HCERTSTORE hSiblingStore, DWORD dwUpdateFlags, DWORD dwPriority)\r
+{\r
+    PWINE_COLLECTIONSTORE collection = (PWINE_COLLECTIONSTORE)hCollectionStore;\r
+    WINECRYPT_CERTSTORE *sibling = (WINECRYPT_CERTSTORE *)hSiblingStore;\r
+    PWINE_STORE_LIST_ENTRY entry;\r
+    BOOL ret;\r
+\r
+    TRACE("(%p, %p, %08lx, %ld)\n", hCollectionStore, hSiblingStore,\r
+     dwUpdateFlags, dwPriority);\r
+\r
+    if (!collection || !sibling)\r
+        return TRUE;\r
+    if (collection->hdr.dwMagic != WINE_CRYPTCERTSTORE_MAGIC)\r
+    {\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return FALSE;\r
+    }\r
+    if (collection->hdr.type != StoreTypeCollection)\r
+    {\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return FALSE;\r
+    }\r
+    if (sibling->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)\r
+    {\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return FALSE;\r
+    }\r
+\r
+    entry = CryptMemAlloc(sizeof(WINE_STORE_LIST_ENTRY));\r
+    if (entry)\r
+    {\r
+        InterlockedIncrement(&sibling->ref);\r
+        TRACE("sibling %p's ref count is %ld\n", sibling, sibling->ref);\r
+        entry->store = sibling;\r
+        entry->dwUpdateFlags = dwUpdateFlags;\r
+        entry->dwPriority = dwPriority;\r
+        list_init(&entry->entry);\r
+        TRACE("%p: adding %p, priority %ld\n", collection, entry, dwPriority);\r
+        EnterCriticalSection(&collection->cs);\r
+        if (dwPriority)\r
+        {\r
+            PWINE_STORE_LIST_ENTRY cursor;\r
+            BOOL added = FALSE;\r
+\r
+            LIST_FOR_EACH_ENTRY(cursor, &collection->stores,\r
+             WINE_STORE_LIST_ENTRY, entry)\r
+            {\r
+                if (cursor->dwPriority < dwPriority)\r
+                {\r
+                    list_add_before(&cursor->entry, &entry->entry);\r
+                    added = TRUE;\r
+                    break;\r
+                }\r
+            }\r
+            if (!added)\r
+                list_add_tail(&collection->stores, &entry->entry);\r
+        }\r
+        else\r
+            list_add_tail(&collection->stores, &entry->entry);\r
+        LeaveCriticalSection(&collection->cs);\r
+        ret = TRUE;\r
+    }\r
+    else\r
+        ret = FALSE;\r
+    return ret;\r
+}\r
+\r
+void WINAPI CertRemoveStoreFromCollection(HCERTSTORE hCollectionStore,\r
+ HCERTSTORE hSiblingStore)\r
+{\r
+    PWINE_COLLECTIONSTORE collection = (PWINE_COLLECTIONSTORE)hCollectionStore;\r
+    WINECRYPT_CERTSTORE *sibling = (WINECRYPT_CERTSTORE *)hSiblingStore;\r
+    PWINE_STORE_LIST_ENTRY store, next;\r
+\r
+    TRACE("(%p, %p)\n", hCollectionStore, hSiblingStore);\r
+\r
+    if (!collection || !sibling)\r
+        return;\r
+    if (collection->hdr.dwMagic != WINE_CRYPTCERTSTORE_MAGIC)\r
+    {\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return;\r
+    }\r
+    if (collection->hdr.type != StoreTypeCollection)\r
+        return;\r
+    if (sibling->dwMagic != WINE_CRYPTCERTSTORE_MAGIC)\r
+    {\r
+        SetLastError(HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER));\r
+        return;\r
+    }\r
+    EnterCriticalSection(&collection->cs);\r
+    LIST_FOR_EACH_ENTRY_SAFE(store, next, &collection->stores,\r
+     WINE_STORE_LIST_ENTRY, entry)\r
+    {\r
+        if (store->store == sibling)\r
+        {\r
+            list_remove(&store->entry);\r
+            CertCloseStore(store->store, 0);\r
+            CryptMemFree(store);\r
+            break;\r
+        }\r
+    }\r
+    LeaveCriticalSection(&collection->cs);\r
+}\r
diff --git a/reactos/dll/win32/crypt32/str.c b/reactos/dll/win32/crypt32/str.c
new file mode 100644 (file)
index 0000000..46acb97
--- /dev/null
@@ -0,0 +1,441 @@
+/*\r
+ * Copyright 2006 Juan Lang for CodeWeavers\r
+ *\r
+ * This library is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU Lesser General Public\r
+ * License as published by the Free Software Foundation; either\r
+ * version 2.1 of the License, or (at your option) any later version.\r
+ *\r
+ * This library is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\r
+ * Lesser General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU Lesser General Public\r
+ * License along with this library; if not, write to the Free Software\r
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
+ */\r
+#include <stdarg.h>\r
+#include "windef.h"\r
+#include "winbase.h"\r
+#include "winnls.h"\r
+#include "wincrypt.h"\r
+#include "wine/debug.h"\r
+\r
+WINE_DEFAULT_DEBUG_CHANNEL(crypt);\r
+\r
+DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,\r
+ LPSTR psz, DWORD csz)\r
+{\r
+    DWORD ret = 0;\r
+\r
+    TRACE("(%ld, %p, %p, %ld)\n", dwValueType, pValue, psz, csz);\r
+\r
+    switch (dwValueType)\r
+    {\r
+    case CERT_RDN_ANY_TYPE:\r
+        break;\r
+    case CERT_RDN_PRINTABLE_STRING:\r
+    case CERT_RDN_IA5_STRING:\r
+        if (!psz || !csz)\r
+            ret = pValue->cbData;\r
+        else\r
+        {\r
+            DWORD chars = min(pValue->cbData, csz - 1);\r
+\r
+            if (chars)\r
+            {\r
+                memcpy(psz, pValue->pbData, chars);\r
+                ret += chars;\r
+                csz -= chars;\r
+            }\r
+        }\r
+        break;\r
+    default:\r
+        FIXME("string type %ld unimplemented\n", dwValueType);\r
+    }\r
+    if (psz && csz)\r
+    {\r
+        *(psz + ret) = '\0';\r
+        csz--;\r
+        ret++;\r
+    }\r
+    else\r
+        ret++;\r
+    return ret;\r
+}\r
+\r
+DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue,\r
+ LPWSTR psz, DWORD csz)\r
+{\r
+    DWORD ret = 0;\r
+\r
+    TRACE("(%ld, %p, %p, %ld)\n", dwValueType, pValue, psz, csz);\r
+\r
+    switch (dwValueType)\r
+    {\r
+    case CERT_RDN_ANY_TYPE:\r
+        break;\r
+    case CERT_RDN_PRINTABLE_STRING:\r
+    case CERT_RDN_IA5_STRING:\r
+        if (!psz || !csz)\r
+            ret = pValue->cbData;\r
+        else\r
+        {\r
+            DWORD chars = min(pValue->cbData, csz - 1);\r
+\r
+            if (chars)\r
+            {\r
+                DWORD i;\r
+\r
+                for (i = 0; i < chars; i++)\r
+                    psz[i] = pValue->pbData[i];\r
+                ret += chars;\r
+                csz -= chars;\r
+            }\r
+        }\r
+        break;\r
+    default:\r
+        FIXME("string type %ld unimplemented\n", dwValueType);\r
+    }\r
+    if (psz && csz)\r
+    {\r
+        *(psz + ret) = '\0';\r
+        csz--;\r
+        ret++;\r
+    }\r
+    else\r
+        ret++;\r
+    return ret;\r
+}\r
+\r
+DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName,\r
+ DWORD dwStrType, LPSTR psz, DWORD csz)\r
+{\r
+    static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG |\r
+     CERT_NAME_STR_REVERSE_FLAG | CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG;\r
+    static const char commaSep[] = ", ";\r
+    static const char semiSep[] = "; ";\r
+    static const char crlfSep[] = "\r\n";\r
+    static const char plusSep[] = " + ";\r
+    static const char spaceSep[] = " ";\r
+    DWORD ret = 0, bytes = 0;\r
+    BOOL bRet;\r
+    CERT_NAME_INFO *info;\r
+\r
+    TRACE("(%ld, %p, %08lx, %p, %ld)\n", dwCertEncodingType, pName, dwStrType,\r
+     psz, csz);\r
+    if (dwStrType & unsupportedFlags)\r
+        FIXME("unsupported flags: %08lx\n", dwStrType & unsupportedFlags);\r
+\r
+    bRet = CryptDecodeObjectEx(dwCertEncodingType, X509_NAME, pName->pbData,\r
+     pName->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &bytes);\r
+    if (bRet)\r
+    {\r
+        DWORD i, j, sepLen, rdnSepLen;\r
+        LPCSTR sep, rdnSep;\r
+\r
+        if (dwStrType & CERT_NAME_STR_SEMICOLON_FLAG)\r
+            sep = semiSep;\r
+        else if (dwStrType & CERT_NAME_STR_CRLF_FLAG)\r
+            sep = crlfSep;\r
+        else\r
+            sep = commaSep;\r
+        sepLen = strlen(sep);\r
+        if (dwStrType & CERT_NAME_STR_NO_PLUS_FLAG)\r
+            rdnSep = spaceSep;\r
+        else\r
+            rdnSep = plusSep;\r
+        rdnSepLen = strlen(rdnSep);\r
+        for (i = 0; ret < csz && i < info->cRDN; i++)\r
+        {\r
+            for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++)\r
+            {\r
+                DWORD chars;\r
+\r
+                if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR)\r
+                {\r
+                    /* - 1 is needed to account for the NULL terminator. */\r
+                    chars = min(\r
+                     lstrlenA(info->rgRDN[i].rgRDNAttr[j].pszObjId),\r
+                     csz - ret - 1);\r
+                    if (psz && chars)\r
+                        memcpy(psz + ret, info->rgRDN[i].rgRDNAttr[j].pszObjId,\r
+                         chars);\r
+                    ret += chars;\r
+                    csz -= chars;\r
+                    if (csz > 1)\r
+                    {\r
+                        if (psz)\r
+                            *(psz + ret) = '=';\r
+                        ret++;\r
+                        csz--;\r
+                    }\r
+                }\r
+                /* FIXME: handle quoting */\r
+                chars = CertRDNValueToStrA(\r
+                 info->rgRDN[i].rgRDNAttr[j].dwValueType, \r
+                 &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL,\r
+                 csz - ret - 1);\r
+                if (chars)\r
+                    ret += chars - 1;\r
+                if (j < info->rgRDN[i].cRDNAttr - 1)\r
+                {\r
+                    if (psz && ret < csz - rdnSepLen - 1)\r
+                        memcpy(psz + ret, rdnSep, rdnSepLen);\r
+                    ret += rdnSepLen;\r
+                }\r
+            }\r
+            if (i < info->cRDN - 1)\r
+            {\r
+                if (psz && ret < csz - sepLen - 1)\r
+                    memcpy(psz + ret, sep, sepLen);\r
+                ret += sepLen;\r
+            }\r
+        }\r
+        LocalFree(info);\r
+    }\r
+    if (psz && csz)\r
+    {\r
+        *(psz + ret) = '\0';\r
+        csz--;\r
+        ret++;\r
+    }\r
+    else\r
+        ret++;\r
+    return ret;\r
+}\r
+\r
+DWORD WINAPI CertNameToStrW(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName,\r
+ DWORD dwStrType, LPWSTR psz, DWORD csz)\r
+{\r
+    static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG |\r
+     CERT_NAME_STR_REVERSE_FLAG | CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG;\r
+    static const WCHAR commaSep[] = { ',',' ',0 };\r
+    static const WCHAR semiSep[] = { ';',' ',0 };\r
+    static const WCHAR crlfSep[] = { '\r','\n',0 };\r
+    static const WCHAR plusSep[] = { ' ','+',' ',0 };\r
+    static const WCHAR spaceSep[] = { ' ',0 };\r
+    DWORD ret = 0, bytes = 0;\r
+    BOOL bRet;\r
+    CERT_NAME_INFO *info;\r
+\r
+    TRACE("(%ld, %p, %08lx, %p, %ld)\n", dwCertEncodingType, pName, dwStrType,\r
+     psz, csz);\r
+    if (dwStrType & unsupportedFlags)\r
+        FIXME("unsupported flags: %08lx\n", dwStrType & unsupportedFlags);\r
+\r
+    bRet = CryptDecodeObjectEx(dwCertEncodingType, X509_NAME, pName->pbData,\r
+     pName->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &bytes);\r
+    if (bRet)\r
+    {\r
+        DWORD i, j, sepLen, rdnSepLen;\r
+        LPCWSTR sep, rdnSep;\r
+\r
+        if (dwStrType & CERT_NAME_STR_SEMICOLON_FLAG)\r
+            sep = semiSep;\r
+        else if (dwStrType & CERT_NAME_STR_CRLF_FLAG)\r
+            sep = crlfSep;\r
+        else\r
+            sep = commaSep;\r
+        sepLen = lstrlenW(sep);\r
+        if (dwStrType & CERT_NAME_STR_NO_PLUS_FLAG)\r
+            rdnSep = spaceSep;\r
+        else\r
+            rdnSep = plusSep;\r
+        rdnSepLen = lstrlenW(rdnSep);\r
+        for (i = 0; ret < csz && i < info->cRDN; i++)\r
+        {\r
+            for (j = 0; ret < csz && j < info->rgRDN[i].cRDNAttr; j++)\r
+            {\r
+                DWORD chars;\r
+\r
+                if ((dwStrType & 0x000000ff) == CERT_OID_NAME_STR)\r
+                {\r
+                    /* - 1 is needed to account for the NULL terminator. */\r
+                    chars = min(\r
+                     lstrlenA(info->rgRDN[i].rgRDNAttr[j].pszObjId),\r
+                     csz - ret - 1);\r
+                    if (psz && chars)\r
+                    {\r
+                        DWORD k;\r
+\r
+                        for (k = 0; k < chars; k++)\r
+                            *(psz + ret + k) =\r
+                             info->rgRDN[i].rgRDNAttr[j].pszObjId[k];\r
+                    }\r
+                    ret += chars;\r
+                    csz -= chars;\r
+                    if (csz > 1)\r
+                    {\r
+                        if (psz)\r
+                            *(psz + ret) = '=';\r
+                        ret++;\r
+                        csz--;\r
+                    }\r
+                }\r
+                /* FIXME: handle quoting */\r
+                chars = CertRDNValueToStrW(\r
+                 info->rgRDN[i].rgRDNAttr[j].dwValueType, \r
+                 &info->rgRDN[i].rgRDNAttr[j].Value, psz ? psz + ret : NULL,\r
+                 csz - ret - 1);\r
+                if (chars)\r
+                    ret += chars - 1;\r
+                if (j < info->rgRDN[i].cRDNAttr - 1)\r
+                {\r
+                    if (psz && ret < csz - rdnSepLen - 1)\r
+                        memcpy(psz + ret, rdnSep, rdnSepLen * sizeof(WCHAR));\r
+                    ret += rdnSepLen;\r
+                }\r
+            }\r
+            if (i < info->cRDN - 1)\r
+            {\r
+                if (psz && ret < csz - sepLen - 1)\r
+                    memcpy(psz + ret, sep, sepLen * sizeof(WCHAR));\r
+                ret += sepLen;\r
+            }\r
+        }\r
+        LocalFree(info);\r
+    }\r
+    if (psz && csz)\r
+    {\r
+        *(psz + ret) = '\0';\r
+        csz--;\r
+        ret++;\r
+    }\r
+    else\r
+        ret++;\r
+    return ret;\r
+}\r
+\r
+DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType,\r
+ DWORD dwFlags, void *pvTypePara, LPSTR pszNameString, DWORD cchNameString)\r
+{\r
+    DWORD ret;\r
+\r
+    TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", pCertContext, dwType, dwFlags,\r
+     pvTypePara, pszNameString, cchNameString);\r
+\r
+    if (pszNameString)\r
+    {\r
+        LPWSTR wideName;\r
+        DWORD nameLen;\r
+\r
+        nameLen = CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara,\r
+         NULL, 0);\r
+        wideName = CryptMemAlloc(nameLen * sizeof(WCHAR));\r
+        if (wideName)\r
+        {\r
+            CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara,\r
+             wideName, nameLen);\r
+            nameLen = WideCharToMultiByte(CP_ACP, 0, wideName, nameLen,\r
+             pszNameString, cchNameString, NULL, NULL);\r
+            if (nameLen <= cchNameString)\r
+                ret = nameLen;\r
+            else\r
+            {\r
+                pszNameString[cchNameString - 1] = '\0';\r
+                ret = cchNameString;\r
+            }\r
+            CryptMemFree(wideName);\r
+        }\r
+        else\r
+        {\r
+            *pszNameString = '\0';\r
+            ret = 1;\r
+        }\r
+    }\r
+    else\r
+        ret = CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara,\r
+         NULL, 0);\r
+    return ret;\r
+}\r
+\r
+DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType,\r
+ DWORD dwFlags, void *pvTypePara, LPWSTR pszNameString, DWORD cchNameString)\r
+{\r
+    DWORD ret;\r
+    PCERT_NAME_BLOB name;\r
+    LPCSTR altNameOID;\r
+\r
+    TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", pCertContext, dwType,\r
+     dwFlags, pvTypePara, pszNameString, cchNameString);\r
+\r
+    if (dwFlags & CERT_NAME_ISSUER_FLAG)\r
+    {\r
+        name = &pCertContext->pCertInfo->Issuer;\r
+        altNameOID = szOID_ISSUER_ALT_NAME;\r
+    }\r
+    else\r
+    {\r
+        name = &pCertContext->pCertInfo->Subject;\r
+        altNameOID = szOID_SUBJECT_ALT_NAME;\r
+    }\r
+\r
+    switch (dwType)\r
+    {\r
+    case CERT_NAME_SIMPLE_DISPLAY_TYPE:\r
+    {\r
+        static const LPCSTR simpleAttributeOIDs[] = { szOID_COMMON_NAME,\r
+         szOID_ORGANIZATIONAL_UNIT_NAME, szOID_ORGANIZATION_NAME,\r
+         szOID_RSA_emailAddr };\r
+        CERT_NAME_INFO *info = NULL;\r
+        PCERT_RDN_ATTR nameAttr = NULL;\r
+        DWORD bytes = 0, i;\r
+\r
+        if (CryptDecodeObjectEx(pCertContext->dwCertEncodingType, X509_NAME,\r
+         name->pbData, name->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info,\r
+         &bytes))\r
+        {\r
+            for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) /\r
+             sizeof(simpleAttributeOIDs[0]); i++)\r
+                nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], info);\r
+        }\r
+        else\r
+            ret = 0;\r
+        if (!nameAttr)\r
+        {\r
+            PCERT_EXTENSION ext = CertFindExtension(altNameOID,\r
+             pCertContext->pCertInfo->cExtension,\r
+             pCertContext->pCertInfo->rgExtension);\r
+\r
+            if (ext)\r
+            {\r
+                for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) /\r
+                 sizeof(simpleAttributeOIDs[0]); i++)\r
+                    nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], info);\r
+                if (!nameAttr)\r
+                {\r
+                    /* FIXME: gotta then look for a rfc822Name choice in ext.\r
+                     * Failing that, look for the first attribute.\r
+                     */\r
+                    FIXME("CERT_NAME_SIMPLE_DISPLAY_TYPE: stub\n");\r
+                    ret = 0;\r
+                }\r
+            }\r
+        }\r
+        ret = CertRDNValueToStrW(nameAttr->dwValueType, &nameAttr->Value,\r
+         pszNameString, cchNameString);\r
+        if (info)\r
+            LocalFree(info);\r
+        break;\r
+    }\r
+    case CERT_NAME_FRIENDLY_DISPLAY_TYPE:\r
+    {\r
+        DWORD cch = cchNameString;\r
+\r
+        if (CertGetCertificateContextProperty(pCertContext,\r
+         CERT_FRIENDLY_NAME_PROP_ID, pszNameString, &cch))\r
+            ret = cch;\r
+        else\r
+            ret = CertGetNameStringW(pCertContext,\r
+             CERT_NAME_SIMPLE_DISPLAY_TYPE, dwFlags, pvTypePara, pszNameString,\r
+             cchNameString);\r
+        break;\r
+    }\r
+    default:\r
+        FIXME("unimplemented for type %ld\n", dwType);\r
+        ret = 0;\r
+    }\r
+    return ret;\r
+}\r
index cad8c97..15f597a 100644 (file)
@@ -41,7 +41,7 @@ reactos/dll/win32/avifil32        # Synced to Wine-0_9_5
 reactos/dll/win32/cabinet         # Synced to Wine-0_9_10
 reactos/dll/win32/comctl32        # Synced to Wine-20060328
 reactos/dll/win32/comdlg32        # Synced to Wine-0_9_5
-reactos/dll/win32/crypt32         # Synced to Wine-0_9_5
+reactos/dll/win32/crypt32         # Synced to Wine-0_9_10
 reactos/dll/win32/dbghelp         # 
 reactos/dll/win32/icmp           # Synced to Wine-0_9_5
 reactos/dll/win32/imm32           # Synced to Wine-0_9_10