[cwittich] 41550: sync crypt32 with wine 1.1.24

Author: cwittich
Date: Mon Jun 22 23:27:02 2009
New Revision: 41550

URL: http://svn.reactos.org/svn/reactos?rev=41550&view=rev
Log:
sync crypt32 with wine 1.1.24

Modified:
    trunk/reactos/dll/win32/crypt32/cert.c
    trunk/reactos/dll/win32/crypt32/chain.c
    trunk/reactos/dll/win32/crypt32/context.c
    trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc
    trunk/reactos/dll/win32/crypt32/crypt32_private.h
    trunk/reactos/dll/win32/crypt32/encode.c
    trunk/reactos/dll/win32/crypt32/msg.c
    trunk/reactos/dll/win32/crypt32/object.c
    trunk/reactos/dll/win32/crypt32/str.c

Modified: trunk/reactos/dll/win32/crypt32/cert.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/cert.c?re...
==============================================================================
--- trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/cert.c [iso-8859-1] Mon Jun 22 23:27:02 2009
@@ -2419,7 +2419,7 @@
         field->indexes[indexIndex] |= 1 << (bit % BITS_PER_DWORD);
 }

-static BOOL CRYPT_IsBitInFieldSet(struct BitField *field, DWORD bit)
+static BOOL CRYPT_IsBitInFieldSet(const struct BitField *field, DWORD bit)
 {
     BOOL set = FALSE;
     DWORD indexIndex = bit / BITS_PER_DWORD;

Modified: trunk/reactos/dll/win32/crypt32/chain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?r...
==============================================================================
--- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Mon Jun 22 23:27:02 2009
@@ -262,7 +262,7 @@
 }

/* Checks whether the chain is cyclic by examining the last element's status */
-static inline BOOL CRYPT_IsSimpleChainCyclic(PCERT_SIMPLE_CHAIN chain)
+static inline BOOL CRYPT_IsSimpleChainCyclic(const CERT_SIMPLE_CHAIN *chain)
 {
     if (chain->cElement)
         return chain->rgpElement[chain->cElement - 1]->TrustStatus.dwErrorStatus
@@ -272,7 +272,7 @@
 }

static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus,
- CERT_TRUST_STATUS *elementStatus)
+ const CERT_TRUST_STATUS *elementStatus)
 {
     /* Any error that applies to an element also applies to a chain.. */
     chainStatus->dwErrorStatus |= elementStatus->dwErrorStatus;
@@ -282,7 +282,7 @@
     chainStatus->dwInfoStatus |= (elementStatus->dwInfoStatus & 0xfffffff0);
 }

-static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine,
+static BOOL CRYPT_AddCertToSimpleChain(const CertificateChainEngine *engine,
  PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert, DWORD subjectInfoStatus)
 {
     BOOL ret = FALSE;
@@ -720,7 +720,7 @@
     }
 }

-static void dump_basic_constraints(PCERT_EXTENSION ext)
+static void dump_basic_constraints(const CERT_EXTENSION *ext)
 {
     CERT_BASIC_CONSTRAINTS_INFO *info;
     DWORD size = 0;
@@ -737,7 +737,7 @@
     }
 }

-static void dump_basic_constraints2(PCERT_EXTENSION ext)
+static void dump_basic_constraints2(const CERT_EXTENSION *ext)
 {
     CERT_BASIC_CONSTRAINTS2_INFO constraints;
     DWORD size = sizeof(CERT_BASIC_CONSTRAINTS2_INFO);
@@ -754,7 +754,7 @@
     }
 }

-static void dump_extension(PCERT_EXTENSION ext)
+static void dump_extension(const CERT_EXTENSION *ext)
 {
     TRACE_(chain)("%s (%scritical)\n", debugstr_a(ext->pszObjId),
      ext->fCritical ? "" : "not ");
@@ -1008,7 +1008,7 @@
 /* Builds a simple chain by finding an issuer for the last cert in the chain,
  * until reaching a self-signed cert, or until no issuer can be found.
  */
-static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine,
+static BOOL CRYPT_BuildSimpleChain(const CertificateChainEngine *engine,
  HCERTSTORE world, PCERT_SIMPLE_CHAIN chain)
 {
     BOOL ret = TRUE;
@@ -1116,7 +1116,7 @@

/* Makes and returns a copy of chain, up to and including element iElement. */
 static PCERT_SIMPLE_CHAIN CRYPT_CopySimpleChainToElement(
- PCERT_SIMPLE_CHAIN chain, DWORD iElement)
+ const CERT_SIMPLE_CHAIN *chain, DWORD iElement)
 {
     PCERT_SIMPLE_CHAIN copy = CryptMemAlloc(sizeof(CERT_SIMPLE_CHAIN));

@@ -1345,7 +1345,7 @@
 #define IS_TRUST_ERROR_SET(TrustStatus, bits) \
  (TrustStatus)->dwErrorStatus & (bits)

-static DWORD CRYPT_ChainQuality(PCertificateChain chain)
+static DWORD CRYPT_ChainQuality(const CertificateChain *chain)
 {
     DWORD quality = CHAIN_QUALITY_HIGHEST;

@@ -1402,7 +1402,7 @@
 }

static BOOL CRYPT_AddAlternateChainToChain(PCertificateChain chain,
- PCertificateChain alternate)
+ const CertificateChain *alternate)
 {
     BOOL ret;

@@ -1427,7 +1427,7 @@
 }

static PCERT_CHAIN_ELEMENT CRYPT_FindIthElementInChain(
- PCERT_CHAIN_CONTEXT chain, DWORD i)
+ const CERT_CHAIN_CONTEXT *chain, DWORD i)
 {
     DWORD j, iElement;
     PCERT_CHAIN_ELEMENT element = NULL;
@@ -1448,7 +1448,7 @@
 } CERT_CHAIN_PARA_NO_EXTRA_FIELDS, *PCERT_CHAIN_PARA_NO_EXTRA_FIELDS;

static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain,
- LPFILETIME pTime, PCERT_CHAIN_PARA pChainPara, DWORD chainFlags)
+ LPFILETIME pTime, const CERT_CHAIN_PARA *pChainPara, DWORD chainFlags)
 {
     DWORD cContext;

Modified: trunk/reactos/dll/win32/crypt32/context.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/context.c...
==============================================================================
--- trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/context.c [iso-8859-1] Mon Jun 22 23:27:02 2009
@@ -201,7 +201,7 @@
     return list;
 }

-static inline struct list *ContextList_ContextToEntry(struct ContextList *list,
+static inline struct list *ContextList_ContextToEntry(const struct ContextList *list,
  const void *context)
 {
     struct list *ret;
@@ -213,7 +213,7 @@
     return ret;
 }

-static inline void *ContextList_EntryToContext(struct ContextList *list,
+static inline void *ContextList_EntryToContext(const struct ContextList *list,
  struct list *entry)
 {
     return (LPBYTE)entry - sizeof(LINK_CONTEXT) - list->contextSize;

Modified: trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_F...
==============================================================================
--- trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/crypt32_Fr.rc [iso-8859-1] Mon Jun 22 23:27:02 2009
@@ -1,7 +1,7 @@
 /*
  * crypt32 dll French resources
  *
- * Copyright 2006-2008 Jonathan Ernst
+ * Copyright 2006-2009 Jonathan Ernst
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -171,6 +171,7 @@
     IDS_LOCALIZEDNAME_MY "Personnel"
     IDS_LOCALIZEDNAME_CA "Autorités intermédiaires"
     IDS_LOCALIZEDNAME_ADDRESSBOOK "Autres personnes"
+    IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Éditeurs de confiance"
 }

STRINGTABLE DISCARDABLE

Modified: trunk/reactos/dll/win32/crypt32/crypt32_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32_p...
==============================================================================
--- trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/crypt32_private.h [iso-8859-1] Mon Jun 22 23:27:02 2009
@@ -79,7 +79,7 @@
     CRYPT_HASH_BLOB            hash;
 } CRYPT_DIGESTED_DATA;

-BOOL CRYPT_AsnEncodePKCSDigestedData(CRYPT_DIGESTED_DATA *digestedData,
+BOOL CRYPT_AsnEncodePKCSDigestedData(const CRYPT_DIGESTED_DATA *digestedData,
  void *pvData, DWORD *pcbData);

typedef struct _CRYPT_SIGNED_INFO

Modified: trunk/reactos/dll/win32/crypt32/encode.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c?...
==============================================================================
--- trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] Mon Jun 22 23:27:02 2009
@@ -1078,7 +1078,7 @@
 }

static BOOL CRYPT_AsnEncodeRdnAttr(DWORD dwCertEncodingType,
- CERT_RDN_ATTR *attr, CryptEncodeObjectExFunc nameValueEncodeFunc,
+ const CERT_RDN_ATTR *attr, CryptEncodeObjectExFunc nameValueEncodeFunc,
  BYTE *pbEncoded, DWORD *pcbEncoded)
 {
     DWORD bytesNeeded = 0, lenBytes, size;
@@ -1268,7 +1268,7 @@
     return ret;
 }

-static BOOL CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, CERT_RDN *rdn,
+static BOOL CRYPT_AsnEncodeRdn(DWORD dwCertEncodingType, const CERT_RDN *rdn,
  CryptEncodeObjectExFunc nameValueEncodeFunc, BYTE *pbEncoded,
  DWORD *pcbEncoded)
 {
@@ -1881,7 +1881,7 @@
      cItem, dwFlags, pEncodePara, pbEncoded, pcbEncoded);
 }

-BOOL CRYPT_AsnEncodePKCSDigestedData(CRYPT_DIGESTED_DATA *digestedData,
+BOOL CRYPT_AsnEncodePKCSDigestedData(const CRYPT_DIGESTED_DATA *digestedData,
  void *pvData, DWORD *pcbData)
 {
     struct AsnEncodeSequenceItem items[] = {

Modified: trunk/reactos/dll/win32/crypt32/msg.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/msg.c?rev...
==============================================================================
--- trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/msg.c [iso-8859-1] Mon Jun 22 23:27:02 2009
@@ -1340,7 +1340,7 @@
 }

static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags,
- const void *pvMsgEncodeInfo, LPSTR pszInnerContentObjID,
+ const void *pvMsgEncodeInfo, LPCSTR pszInnerContentObjID,
  PCMSG_STREAM_INFO pStreamInfo)
 {
     const CMSG_SIGNED_ENCODE_INFO_WITH_CMS *info = pvMsgEncodeInfo;
@@ -1553,7 +1553,7 @@
     return ret;
 }

-static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, CRYPT_DER_BLOB *blob)
+static BOOL CDecodeMsg_DecodeDataContent(CDecodeMsg *msg, const CRYPT_DER_BLOB *blob)
 {
     BOOL ret;
     CRYPT_DATA_BLOB *data;
@@ -1613,7 +1613,7 @@
 }

static BOOL CDecodeMsg_DecodeHashedContent(CDecodeMsg *msg,
- CRYPT_DER_BLOB *blob)
+ const CRYPT_DER_BLOB *blob)
 {
     BOOL ret;
     CRYPT_DIGESTED_DATA *digestedData;

Modified: trunk/reactos/dll/win32/crypt32/object.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/object.c?...
==============================================================================
--- trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/object.c [iso-8859-1] Mon Jun 22 23:27:02 2009
@@ -1080,7 +1080,7 @@
     return ret;
 }

-static BOOL CRYPT_FormatHexStringWithPrefix(CRYPT_DATA_BLOB *blob, int id,
+static BOOL CRYPT_FormatHexStringWithPrefix(const CRYPT_DATA_BLOB *blob, int id,
  LPWSTR str, DWORD *pcbStr)
 {
     WCHAR buf[MAX_STRING_RESOURCE_LEN];
@@ -1114,13 +1114,13 @@
     return ret;
 }

-static BOOL CRYPT_FormatKeyId(CRYPT_DATA_BLOB *keyId, LPWSTR str,
+static BOOL CRYPT_FormatKeyId(const CRYPT_DATA_BLOB *keyId, LPWSTR str,
  DWORD *pcbStr)
 {
     return CRYPT_FormatHexStringWithPrefix(keyId, IDS_KEY_ID, str, pcbStr);
 }

-static BOOL CRYPT_FormatCertSerialNumber(CRYPT_DATA_BLOB *serialNum, LPWSTR str,
+static BOOL CRYPT_FormatCertSerialNumber(const CRYPT_DATA_BLOB *serialNum, LPWSTR str,
  DWORD *pcbStr)
 {
     return CRYPT_FormatHexStringWithPrefix(serialNum, IDS_CERT_SERIAL_NUMBER,

Modified: trunk/reactos/dll/win32/crypt32/str.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/str.c?rev...
==============================================================================
--- trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/str.c [iso-8859-1] Mon Jun 22 23:27:02 2009
@@ -341,7 +341,7 @@
 static const WCHAR indent[] = { ' ',' ',' ',' ',' ',0 };

DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel,
- PCERT_NAME_BLOB pName, DWORD dwStrType, LPWSTR psz, DWORD csz)
+ const CERT_NAME_BLOB *pName, DWORD dwStrType, LPWSTR psz, DWORD csz)
 {
     static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG |
      CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG;