From 90aaf85ee47f6baeab73760db18bd94a0f9993f5 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 23 May 2015 15:46:13 +0000 Subject: [PATCH] [PSDK] Update wincrypt.h and schannel.h with the latest Win32 defines of modern crypto. By Ismael Ferreras Morezuelas aka swyter. CORE-9065 svn path=/trunk/; revision=67869 --- reactos/include/psdk/schannel.h | 18 +++++++++++------- reactos/include/psdk/wincrypt.h | 7 +++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/reactos/include/psdk/schannel.h b/reactos/include/psdk/schannel.h index 9ce7d5d0ae1..fcdde0d4f00 100644 --- a/reactos/include/psdk/schannel.h +++ b/reactos/include/psdk/schannel.h @@ -26,16 +26,20 @@ extern "C" { #define SCHANNEL_ALERT 2 #define SCHANNEL_SESSION 3 -#define SP_PROT_TLS1_CLIENT 128 -#define SP_PROT_TLS1_1_CLIENT 512 +#define SP_PROT_SSL2_CLIENT 8 +#define SP_PROT_SSL3_CLIENT 32 +#define SP_PROT_TLS1_CLIENT 128 #define SP_PROT_TLS1_0_CLIENT SP_PROT_TLS1_CLIENT +#define SP_PROT_TLS1_1_CLIENT 512 #define SP_PROT_TLS1_2_CLIENT 2048 -#define SP_PROT_TLS1_SERVER 64 -#define SP_PROT_SSL3_CLIENT 32 -#define SP_PROT_SSL3_SERVER 16 -#define SP_PROT_SSL2_CLIENT 8 -#define SP_PROT_SSL2_SERVER 4 +#define SP_PROT_SSL2_SERVER 4 +#define SP_PROT_SSL3_SERVER 16 +#define SP_PROT_TLS1_SERVER 64 +#define SP_PROT_TLS1_0_SERVER SP_PROT_TLS1_SERVER +#define SP_PROT_TLS1_1_SERVER 256 +#define SP_PROT_TLS1_2_SERVER 1024 + #define SP_PROT_PCT1_CLIENT 2 #define SP_PROT_PCT1_SERVER 1 diff --git a/reactos/include/psdk/wincrypt.h b/reactos/include/psdk/wincrypt.h index b4f6f9d720d..47155a1c7ea 100644 --- a/reactos/include/psdk/wincrypt.h +++ b/reactos/include/psdk/wincrypt.h @@ -1701,6 +1701,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define ALG_SID_DSS_ANY 0 #define ALG_SID_DSS_PKCS 1 #define ALG_SID_DSS_DMS 2 +#define ALG_SID_ECDSA 3 /* DES SIDs */ #define ALG_SID_DES 1 @@ -1722,6 +1723,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define ALG_SID_DH_EPHEM 2 #define ALG_SID_AGREED_KEY_ANY 3 #define ALG_SID_KEA 4 +#define ALG_SID_ECDH 5 /* RC2 SIDs */ #define ALG_SID_RC4 1 #define ALG_SID_RC2 2 @@ -1772,6 +1774,8 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define CALG_DH_SF (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_SANDF) #define CALG_DH_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_EPHEM) #define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) +#define CALG_ECDH (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH) +#define CALG_ECMQV (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_ECMQV) #define CALG_DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DES) #define CALG_RC2 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC2) #define CALG_3DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_3DES) @@ -1790,8 +1794,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define CALG_PCT1_MASTER (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_PCT1_MASTER) #define CALG_SSL2_MASTER (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_SSL2_MASTER) #define CALG_TLS1_MASTER (ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL | ALG_SID_TLS1_MASTER) - - +#define CALG_ECDSA (ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_ECDSA) /* Protocol Flags */ #define CRYPT_FLAG_PCT1 0x0001 #define CRYPT_FLAG_SSL2 0x0002 -- 2.17.1