sync wincrypt.h with wine 1.1.24

svn path=/trunk/; revision=41685
This commit is contained in:
Christoph von Wittich 2009-06-29 16:26:46 +00:00
parent 06f4d32679
commit 35b378556e

View file

@ -92,7 +92,7 @@ typedef struct _HMAC_INFO {
BYTE* pbOuterString; BYTE* pbOuterString;
DWORD cbOuterString; DWORD cbOuterString;
} HMAC_INFO, *PHMAC_INFO; } HMAC_INFO, *PHMAC_INFO;
typedef struct _CRYPTOAPI_BLOB { typedef struct _CRYPTOAPI_BLOB {
DWORD cbData; DWORD cbData;
BYTE* pbData; BYTE* pbData;
@ -1046,6 +1046,7 @@ typedef struct _CERT_CHAIN_PARA {
DWORD dwUrlRetrievalTimeout; DWORD dwUrlRetrievalTimeout;
BOOL fCheckRevocationFreshnessTime; BOOL fCheckRevocationFreshnessTime;
DWORD dwRevocationFreshnessTime; DWORD dwRevocationFreshnessTime;
LPFILETIME pftCacheResync;
#endif #endif
} CERT_CHAIN_PARA, *PCERT_CHAIN_PARA; } CERT_CHAIN_PARA, *PCERT_CHAIN_PARA;
@ -1956,7 +1957,7 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s'
#define CRYPT_MODE_OFB 3 #define CRYPT_MODE_OFB 3
#define CRYPT_MODE_CFB 4 #define CRYPT_MODE_CFB 4
#define CRYPT_ENCRYPT 0x0001 #define CRYPT_ENCRYPT 0x0001
#define CRYPT_DECRYPT 0x0002 #define CRYPT_DECRYPT 0x0002
#define CRYPT_EXPORT 0x0004 #define CRYPT_EXPORT 0x0004
#define CRYPT_READ 0x0008 #define CRYPT_READ 0x0008
@ -2111,10 +2112,10 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s'
#define CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH \ #define CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH \
L"Software\\Policies\\Microsoft\\SystemCertificates" L"Software\\Policies\\Microsoft\\SystemCertificates"
#else #else
static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] = static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] =
{'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',
'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0 }; 'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0 };
static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] = static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] =
{'S','o','f','t','w','a','r','e','\\','P','o','l','i','c','i','e','s','\\', {'S','o','f','t','w','a','r','e','\\','P','o','l','i','c','i','e','s','\\',
'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r', 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r',
't','i','f','i','c','a','t','e','s',0 }; 't','i','f','i','c','a','t','e','s',0 };
@ -2371,7 +2372,7 @@ static const WCHAR CRYPT_OID_REG_FLAGS_VALUE_NAME[] =
# define CERT_PHYSICAL_STORE_AUTH_ROOT_NAME \ # define CERT_PHYSICAL_STORE_AUTH_ROOT_NAME \
L".AuthRoot" L".AuthRoot"
#else #else
static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] = static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] =
{'.','D','e','f','a','u','l','t','0'}; {'.','D','e','f','a','u','l','t','0'};
static const WCHAR CERT_PHYSICAL_STORE_GROUP_POLICY_NAME[] = static const WCHAR CERT_PHYSICAL_STORE_GROUP_POLICY_NAME[] =
{'.','G','r','o','u','p','P','o','l','i','c','y',0}; {'.','G','r','o','u','p','P','o','l','i','c','y',0};
@ -3821,7 +3822,7 @@ WINADVAPI BOOL WINAPI CryptGetUserKey (HCRYPTPROV, DWORD, HCRYPTKEY *);
WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD);
WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD);
WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *);
WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR);
WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD);
WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD);
WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD);