mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[winpr,sspi] enable negotiate by default

This commit is contained in:
Armin Novak 2022-12-07 18:08:34 +01:00 committed by David Fort
parent 2bc13d50a3
commit 074f28073a
4 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfreerdp/core/gateway/rdg.c
View File

@ -43,11 +43,7 @@
#define TAG FREERDP_TAG("core.gateway.rdg")
#if defined(_WIN32) || defined(WITH_SPNEGO)
#define AUTH_PKG NEGO_SSP_NAME
#else
#define AUTH_PKG NTLM_SSP_NAME
#endif
/* HTTP channel response fields present flags. */
#define HTTP_CHANNEL_RESPONSE_FIELD_CHANNELID 0x1

1
winpr/CMakeLists.txt
View File

@ -83,7 +83,6 @@ elseif(WITH_GSSAPI)
message(WARNING "Kerberos version not detected")
endif()
endif()
option(WITH_SPNEGO "Use SPNEGO negotiation" OFF)
# This option MUST be off to avoid symbol conflicts when loading an external SSPI module library
option(SSPI_DLL "Define and export SSPI API symbols for usage as a Windows SSPI DLL replacement" OFF)

1
winpr/include/config/config.h.in
View File

@ -27,7 +27,6 @@
#cmakedefine WITH_EVENTFD_READ_WRITE
#cmakedefine WITH_NATIVE_SSPI
#cmakedefine WITH_SPNEGO
#cmakedefine WITH_INTERNAL_MD4
#cmakedefine WITH_INTERNAL_MD5

8
winpr/libwinpr/sspi/Negotiate/negotiate.c
View File

@ -680,9 +680,6 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW(
}
init_context.mech = cred->mech;
#ifndef WITH_SPNEGO
break;
#endif
}
if (!WinPrAsn1EncOID(enc, cred->mech->oid))
@ -694,7 +691,6 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW(
if (!init_context.mech)
goto cleanup;
#ifdef WITH_SPNEGO
/* If the only available mech is NTLM use it directly otherwise use spnego */
if (init_context.mech->oid == &ntlm_OID)
{
@ -708,10 +704,6 @@ static SECURITY_STATUS SEC_ENTRY negotiate_InitializeSecurityContextW(
init_context.mechTypes.BufferType = SECBUFFER_DATA;
init_context.mechTypes.cbBuffer = WinPrAsn1EncEndContainer(enc);
}
#else
init_context.spnego = FALSE;
output_buffer->cbBuffer = output_token.mechToken.cbBuffer;
#endif
/* Allocate memory for the new context */
context = negotiate_ContextNew(&init_context);