Jacek Caban : schannel.h: Add TLS 1.3 defines.

Alexandre Julliard julliard at winehq.org
Tue Nov 20 15:39:51 CST 2018


Module: wine
Branch: master
Commit: 40c847d8074770681d1c6434fdaf7c015bca99f4
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=40c847d8074770681d1c6434fdaf7c015bca99f4

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Nov 20 19:13:06 2018 +0100

schannel.h: Add TLS 1.3 defines.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/secur32/tests/schannel.c |  1 +
 include/schannel.h            | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
index 2bd0e01..ebdfcb6 100644
--- a/dlls/secur32/tests/schannel.c
+++ b/dlls/secur32/tests/schannel.c
@@ -202,6 +202,7 @@ static void test_supported_protocols(CredHandle *handle, unsigned exprots)
     X(SP_PROT_TLS1_0_CLIENT, "TLS 1.0 client");
     X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client");
     X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client");
+    X(SP_PROT_TLS1_3_CLIENT, "TLS 1.3 client");
 #undef X
 
     if(protocols.grbitProtocol)
diff --git a/include/schannel.h b/include/schannel.h
index 2e1a9f6..6dac2e9 100644
--- a/include/schannel.h
+++ b/include/schannel.h
@@ -107,6 +107,8 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 };
 #define SP_PROT_ALL           0xffffffff
 #define SP_PROT_UNI_CLIENT    0x80000000
 #define SP_PROT_UNI_SERVER    0x40000000
+#define SP_PROT_TLS1_3_SERVER 0x00001000
+#define SP_PROT_TLS1_3_CLIENT 0x00002000
 #define SP_PROT_TLS1_2_CLIENT 0x00000800
 #define SP_PROT_TLS1_2_SERVER 0x00000400
 #define SP_PROT_TLS1_1_CLIENT 0x00000200
@@ -124,6 +126,7 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 };
 #define SP_PROT_NONE          0x00000000
 
 #define SP_PROT_UNI                (SP_PROT_UNI_CLIENT | SP_PROT_UNI_SERVER)
+#define SP_PROT_TLS1_3             (SP_PROT_TLS1_3_CLIENT | SP_PROT_TLS1_3_SERVER)
 #define SP_PROT_TLS1_2             (SP_PROT_TLS1_2_CLIENT | SP_PROT_TLS1_2_SERVER)
 #define SP_PROT_TLS1_1             (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_1_SERVER)
 #define SP_PROT_TLS1_0             (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_0_SERVER)
@@ -136,10 +139,20 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 };
 #define SP_PROT_SSL3TLS1_SERVERS   (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_SERVER)
 #define SP_PROT_SSL3TLS1_X_CLIENTS (SP_PROT_SSL3_CLIENT | SP_PROT_TLS1_X_CLIENT)
 #define SP_PROT_SSL3TLS1_X_SERVERS (SP_PROT_SSL3_SERVER | SP_PROT_TLS1_X_SERVER)
-#define SP_PROT_TLS1_X_CLIENT      (SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT)
-#define SP_PROT_TLS1_X_SERVER      (SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER)
-#define SP_PROT_TLS1_1PLUS_CLIENT  (SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT)
-#define SP_PROT_TLS1_1PLUS_SERVER  (SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER)
+#define SP_PROT_TLS1_X_CLIENT      ( SP_PROT_TLS1_0_CLIENT \
+                                   | SP_PROT_TLS1_1_CLIENT \
+                                   | SP_PROT_TLS1_2_CLIENT \
+                                   | SP_PROT_TLS1_3_CLIENT )
+#define SP_PROT_TLS1_X_SERVER      ( SP_PROT_TLS1_0_SERVER \
+                                   | SP_PROT_TLS1_1_SERVER \
+                                   | SP_PROT_TLS1_2_SERVER \
+                                   | SP_PROT_TLS1_3_SERVER )
+#define SP_PROT_TLS1_1PLUS_CLIENT  ( SP_PROT_TLS1_1_CLIENT \
+                                   | SP_PROT_TLS1_2_CLIENT \
+                                   | SP_PROT_TLS1_3_CLIENT)
+#define SP_PROT_TLS1_1PLUS_SERVER  ( SP_PROT_TLS1_1_SERVER \
+                                   | SP_PROT_TLS1_2_SERVER \
+                                   | SP_PROT_TLS1_3_SERVER )
 #define SP_PROT_CLIENTS            (SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT | SP_PROT_SSL3_CLIENT \
                                   | SP_PROT_TLS1_CLIENT | SP_PROT_UNI_CLIENT)
 #define SP_PROT_SERVERS            (SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER | SP_PROT_SSL3_SERVER \




More information about the wine-cvs mailing list