[ros-diffs] [akhaldi] 67869: [PSDK] Update wincrypt.h and schannel.h with the latest Win32 defines of modern crypto. By Ismael Ferreras Morezuelas aka swyter. CORE-9065

Author: akhaldi
Date: Sat May 23 15:46:13 2015
New Revision: 67869

URL: http://svn.reactos.org/svn/reactos?rev=67869&view=rev
Log:
[PSDK] Update wincrypt.h and schannel.h with the latest Win32 defines of modern crypto. By
Ismael Ferreras Morezuelas aka swyter. CORE-9065

Modified:
    trunk/reactos/include/psdk/schannel.h
    trunk/reactos/include/psdk/wincrypt.h

Modified: trunk/reactos/include/psdk/schannel.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/schannel.h?re…
==============================================================================
--- trunk/reactos/include/psdk/schannel.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/schannel.h	[iso-8859-1] Sat May 23 15:46:13 2015
@@ -26,16 +26,20 @@
 #define SCHANNEL_ALERT       2
 #define SCHANNEL_SESSION     3
 
-#define SP_PROT_TLS1_CLIENT 128
+#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_0_CLIENT SP_PROT_TLS1_CLIENT
 #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
 

Modified: trunk/reactos/include/psdk/wincrypt.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincrypt.h?re…
==============================================================================
--- trunk/reactos/include/psdk/wincrypt.h	[iso-8859-1] (original)
+++ trunk/reactos/include/psdk/wincrypt.h	[iso-8859-1] Sat May 23 15:46:13 2015
@@ -1701,6 +1701,7 @@
 #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 @@
 #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 @@
 #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 @@
 #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