Hans Leidekker : include: Move SECPKG_ATTR defines to a new header and add missing definitions.

[Alexandre Julliard]

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

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Mon Jun 20 19:59:06 2022 +0200

include: Move SECPKG_ATTR defines to a new header and add missing definitions.

---

 include/minschannel.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
 include/schannel.h    | 39 +++++++++++++++++++++++----------------
 2 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/include/minschannel.h b/include/minschannel.h
new file mode 100644
index 00000000000..c30ae85922b
--- /dev/null
+++ b/include/minschannel.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2022 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef __WINE_MINSCHANNEL_H__
+#define __WINE_MINSCHANNEL_H__
+
+#define SECPKG_ATTR_ISSUER_LIST             0x50
+#define SECPKG_ATTR_REMOTE_CRED             0x51
+#define SECPKG_ATTR_LOCAL_CRED              0x52
+#define SECPKG_ATTR_REMOTE_CERT_CONTEXT     0x53
+#define SECPKG_ATTR_LOCAL_CERT_CONTEXT      0x54
+#define SECPKG_ATTR_ROOT_STORE              0x55
+#define SECPKG_ATTR_SUPPORTED_ALGS          0x56
+#define SECPKG_ATTR_CIPHER_STRENGTHS        0x57
+#define SECPKG_ATTR_SUPPORTED_PROTOCOLS     0x58
+#define SECPKG_ATTR_ISSUER_LIST_EX          0x59
+#define SECPKG_ATTR_CONNECTION_INFO         0x5a
+#define SECPKG_ATTR_EAP_KEY_BLOCK           0x5b
+#define SECPKG_ATTR_MAPPED_CRED_ATTR        0x5c
+#define SECPKG_ATTR_SESSION_INFO            0x5d
+#define SECPKG_ATTR_APP_DATA                0x5e
+#define SECPKG_ATTR_REMOTE_CERTIFICATES     0x5f
+#define SECPKG_ATTR_CLIENT_CERT_POLICY      0x60
+#define SECPKG_ATTR_CC_POLICY_RESULT        0x61
+#define SECPKG_ATTR_USE_NCRYPT              0x62
+#define SECPKG_ATTR_LOCAL_CERT_INFO         0x63
+#define SECPKG_ATTR_CIPHER_INFO             0x64
+
+#endif /* __WINE_MINSCHANNEL_H__ */
diff --git a/include/schannel.h b/include/schannel.h
index 556ec1882c9..3aa85832fd3 100644
--- a/include/schannel.h
+++ b/include/schannel.h
@@ -18,6 +18,7 @@
 #ifndef __WINE_SCHANNEL_H__
 #define __WINE_SCHANNEL_H__
 
+#include <minschannel.h>
 #include <wincrypt.h>
 
 /* Package names */
@@ -179,22 +180,6 @@ static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 };
 #define SCH_CRED_IGNORE_NO_REVOCATION_CHECK          2048
 #define SCH_CRED_IGNORE_REVOCATION_OFFLINE           4096
 
-#define SECPKG_ATTR_ISSUER_LIST         0x50
-#define SECPKG_ATTR_REMOTE_CRED         0x51
-#define SECPKG_ATTR_LOCAL_CRED          0x52
-#define SECPKG_ATTR_REMOTE_CERT_CONTEXT 0x53
-#define SECPKG_ATTR_LOCAL_CERT_CONTEXT  0x54
-#define SECPKG_ATTR_ROOT_STORE          0x55
-#define SECPKG_ATTR_SUPPORTED_ALGS      0x56
-#define SECPKG_ATTR_CIPHER_STRENGTHS    0x57
-#define SECPKG_ATTR_SUPPORTED_PROTOCOLS 0x58
-#define SECPKG_ATTR_ISSUER_LIST_EX      0x59
-#define SECPKG_ATTR_CONNECTION_INFO     0x5a
-#define SECPKG_ATTR_EAP_KEY_BLOCK       0x5b
-#define SECPKG_ATTR_MAPPED_CRED_ATTR    0x5c
-#define SECPKG_ATTR_SESSION_INFO        0x5d
-#define SECPKG_ATTR_APP_DATA            0x5e
-
 #define UNISP_RPC_ID 14
 
 struct _HMAPPER;
@@ -299,4 +284,26 @@ typedef struct _SecPkgContext_ConnectionInfo
     DWORD dwExchStrength;
 } SecPkgContext_ConnectionInfo, *PSecPkgContext_ConnectionInfo;
 
+#define SECPKGCONTEXT_CIPHERINFO_V1 1
+#define SZ_ALG_MAX_SIZE 64
+
+typedef struct _SecPkgContext_CipherInfo
+{
+    DWORD dwVersion;
+    DWORD dwProtocol;
+    DWORD dwCipherSuite;
+    DWORD dwBaseCipherSuite;
+    WCHAR szCipherSuite[SZ_ALG_MAX_SIZE];
+    WCHAR szCipher[SZ_ALG_MAX_SIZE];
+    DWORD dwCipherLen;
+    DWORD dwCipherBlockLen;
+    WCHAR szHash[SZ_ALG_MAX_SIZE];
+    DWORD dwHashLen;
+    WCHAR szExchange[SZ_ALG_MAX_SIZE];
+    DWORD dwMinExchangeLen;
+    DWORD dwMaxExchangeLen;
+    WCHAR szCertificate[SZ_ALG_MAX_SIZE];
+    DWORD dwKeyType;
+} SecPkgContext_CipherInfo, *PSecPkgContext_CipherInfo;
+
 #endif /* __WINE_SCHANNEL_H__ */