mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4977 from hardening/nego_flags

Browse Source 
nego: add new flags
This commit is contained in:
Bernhard Miklautz 2018-10-31 11:12:05 +00:00 committed by GitHub
commit 62a1967ad6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libfreerdp/core/nego.h
View File

@ -33,6 +33,7 @@
#define PROTOCOL_RDP 0x00000000
#define PROTOCOL_TLS 0x00000001
#define PROTOCOL_NLA 0x00000002
#define PROTOCOL_RDS 0x00000004
#define PROTOCOL_EXT 0x00000008
#define PROTOCOL_FAILED_NEGO 0x80000000 /* only used internally, not on the wire */
@ -44,7 +45,8 @@ enum RDP_NEG_FAILURE_FAILURECODES
SSL_NOT_ALLOWED_BY_SERVER = 0x00000002,
SSL_CERT_NOT_ON_SERVER = 0x00000003,
INCONSISTENT_FLAGS = 0x00000004,
HYBRID_REQUIRED_BY_SERVER = 0x00000005
HYBRID_REQUIRED_BY_SERVER = 0x00000005,
SSL_WITH_USER_AUTH_REQUIRED_BY_SERVER = 0x00000006
};
/* Authorization Result */
@ -85,6 +87,7 @@ enum RDP_NEG_MSG
#define PRECONNECTION_PDU_V2 2
#define RESTRICTED_ADMIN_MODE_REQUIRED 0x01
#define REDIRECTED_AUTHENTICATION_MODE_REQUIRED 0x02
#define CORRELATION_INFO_PRESENT 0x08
struct rdp_nego

3
libfreerdp/core/peer.c
View File

@ -497,8 +497,7 @@ static int peer_recv_callback(rdpTransport* transport, wStream* s, void* extra)
case CONNECTION_STATE_NEGO:
if (!rdp_server_accept_mcs_connect_initial(rdp, s))
{
WLog_ERR(TAG,
"peer_recv_callback: CONNECTION_STATE_NEGO - rdp_server_accept_mcs_connect_initial() fail");
WLog_ERR(TAG, "peer_recv_callback: CONNECTION_STATE_NEGO - rdp_server_accept_mcs_connect_initial() fail");
return -1;
}