| schannel.h (6.3.9600.17415-Windows 8.1) | | schannel.h (10.0.10586.306-Windows 10 1511 10586.494) |
|---|
| | |
| skipping to change at line 24 | | skipping to change at line 24 |
|---|
| //---------------------------------------------------------------------------- | | //---------------------------------------------------------------------------- |
| | |
| #ifndef __SCHANNEL_H__ | | #ifndef __SCHANNEL_H__ |
| #define __SCHANNEL_H__ | | #define __SCHANNEL_H__ |
| | |
| #if _MSC_VER > 1000 | | #if _MSC_VER > 1000 |
| #pragma once | | #pragma once |
| #endif | | #endif |
| #include <winapifamily.h> | | #include <winapifamily.h> |
| | |
|
| #pragma region Desktop Family | | #pragma region Desktop Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) |
| | |
| #include <minschannel.h> | | #include <minschannel.h> |
| #include <wincrypt.h> | | #include <wincrypt.h> |
| | |
| // | | // |
| // Security package names. | | // Security package names. |
| // | | // |
| | |
| #define UNISP_NAME_A "Microsoft Unified Security Protocol Provider" | | #define UNISP_NAME_A "Microsoft Unified Security Protocol Provider" |
| #define UNISP_NAME_W L"Microsoft Unified Security Protocol Provider" | | #define UNISP_NAME_W L"Microsoft Unified Security Protocol Provider" |
| | |
| skipping to change at line 288 | | skipping to change at line 288 |
|---|
| } SecPkgContext_UiInfo, *PSecPkgContext_UiInfo; | | } SecPkgContext_UiInfo, *PSecPkgContext_UiInfo; |
| | |
| typedef struct _SecPkgContext_EarlyStart | | typedef struct _SecPkgContext_EarlyStart |
| { | | { |
| DWORD dwEarlyStartFlags; | | DWORD dwEarlyStartFlags; |
| } SecPkgContext_EarlyStart, *PSecPkgContext_EarlyStart; | | } SecPkgContext_EarlyStart, *PSecPkgContext_EarlyStart; |
| | |
| // Flag values for SecPkgContext_EarlyStart | | // Flag values for SecPkgContext_EarlyStart |
| #define ENABLE_TLS_CLIENT_EARLY_START 0x00000001 | | #define ENABLE_TLS_CLIENT_EARLY_START 0x00000001 |
| | |
|
| | typedef struct _SecPkgContext_KeyingMaterialInfo |
| | { |
| | WORD cbLabel; // Disambiguating ASCII label length, in bytes, grea |
| | ter than 0. |
| | LPSTR pszLabel; // Disambiguating ASCII label, NUL terminator will b |
| | e removed by schannel. |
| | WORD cbContextValue; // Application context value length, in bytes, can b |
| | e 0. |
| | PBYTE pbContextValue; // Application context value, NULL if cbContextValue |
| | == 0. |
| | DWORD cbKeyingMaterial; // Requested keying material length, in bytes, great |
| | er than 0. |
| | } SecPkgContext_KeyingMaterialInfo, * PSecPkgContext_KeyingMaterialInfo; |
| | |
| | typedef struct _SecPkgContext_KeyingMaterial |
| | { |
| | DWORD cbKeyingMaterial; // Exported keying material length, in bytes. |
| | PBYTE pbKeyingMaterial; // Exported keying material. |
| | } SecPkgContext_KeyingMaterial, * PSecPkgContext_KeyingMaterial; |
| | |
| | typedef struct _SecPkgContext_SrtpParameters |
| | { |
| | WORD ProtectionProfile; // Negotiated SRTP protection profile (0x000 |
| | 0 means no profile negotiated). |
| | BYTE MasterKeyIdentifierSize; // Size in bytes of the SRTP master key iden |
| | tifier. |
| | _Field_size_bytes_(MasterKeyIdentifierSize) PBYTE MasterKeyIdentifier;// Neg |
| | otiated SRTP master key identifier. |
| | } SecPkgContext_SrtpParameters, * PSecPkgContext_SrtpParameters; |
| | |
| | typedef struct _SecPkgContext_TokenBinding |
| | { |
| | BYTE MajorVersion; // Negotiated major version of the Token Binding pro |
| | tocol. |
| | BYTE MinorVersion; // Negotiated minor version of the Token Binding pro |
| | tocol. |
| | WORD KeyParametersSize; // Size in bytes of the KeyParameters array. |
| | _Field_size_bytes_(KeyParametersSize) PBYTE KeyParameters; // IDs of the neg |
| | otiated Token Binding key parameters. |
| | } SecPkgContext_TokenBinding, * PSecPkgContext_TokenBinding; |
| | |
| // | | // |
| // Schannel credentials data structure. | | // Schannel credentials data structure. |
| // | | // |
| | |
| #define SCH_CRED_V1 0x00000001 | | #define SCH_CRED_V1 0x00000001 |
| #define SCH_CRED_V2 0x00000002 // for legacy code | | #define SCH_CRED_V2 0x00000002 // for legacy code |
| #define SCH_CRED_VERSION 0x00000002 // for legacy code | | #define SCH_CRED_VERSION 0x00000002 // for legacy code |
| #define SCH_CRED_V3 0x00000003 // for legacy code | | #define SCH_CRED_V3 0x00000003 // for legacy code |
| #define SCHANNEL_CRED_VERSION 0x00000004 | | #define SCHANNEL_CRED_VERSION 0x00000004 |
| | |
| | |
| skipping to change at line 843 | | skipping to change at line 873 |
|---|
| EXTERN_C | | EXTERN_C |
| SECURITY_STATUS | | SECURITY_STATUS |
| WINAPI | | WINAPI |
| SslGetServerIdentity( | | SslGetServerIdentity( |
| _In_reads_bytes_(ClientHelloSize) PBYTE ClientHello, | | _In_reads_bytes_(ClientHelloSize) PBYTE ClientHello, |
| _In_ DWORD ClientHelloSize, | | _In_ DWORD ClientHelloSize, |
| _Outptr_result_bytebuffer_(*ServerIdentitySize) PBYTE* ServerIdentity, | | _Outptr_result_bytebuffer_(*ServerIdentitySize) PBYTE* ServerIdentity, |
| _Out_ PDWORD ServerIdentitySize, | | _Out_ PDWORD ServerIdentitySize, |
| _In_ DWORD Flags); | | _In_ DWORD Flags); |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY
STEM) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif //__SCHANNEL_H__ | | #endif //__SCHANNEL_H__ |
| | |
| End of changes. 3 change blocks. |
|---|
| 3 lines changed or deleted | | 44 lines changed or added |
|---|
|