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

libfreerdp-core: fix gateway connectivity on Windows

Browse Source
This commit is contained in:
Marc-André Moreau 2015-09-17 14:32:40 -04:00
parent 8a5c55788b
commit 9c35b73fb6
2 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfreerdp/core/gateway/ntlm.c
View File

@ -234,21 +234,25 @@ BOOL ntlm_authenticate(rdpNtlm* ntlm)
WLog_VRB(TAG, "InitializeSecurityContext status %s [%08X]", WLog_VRB(TAG, "InitializeSecurityContext status %s [%08X]",
GetSecurityStatusString(status), status); GetSecurityStatusString(status), status);
if ((status == SEC_I_COMPLETE_AND_CONTINUE) || (status == SEC_I_COMPLETE_NEEDED) || (status == SEC_E_OK)) if ((status == SEC_I_COMPLETE_AND_CONTINUE) || (status == SEC_I_COMPLETE_NEEDED) || (status == SEC_E_OK))
{ {
if (ntlm->table->CompleteAuthToken) if ((status != SEC_E_OK) && ntlm->table->CompleteAuthToken)
{ {
SECURITY_STATUS cStatus; SECURITY_STATUS cStatus;
cStatus = ntlm->table->CompleteAuthToken(&ntlm->context, &ntlm->outputBufferDesc); cStatus = ntlm->table->CompleteAuthToken(&ntlm->context, &ntlm->outputBufferDesc);
if (cStatus != SEC_E_OK) if (cStatus != SEC_E_OK)
{ {
WLog_WARN(TAG, "CompleteAuthToken status %s [%08X]", WLog_WARN(TAG, "CompleteAuthToken status %s [%08X]",
GetSecurityStatusString(cStatus), cStatus); GetSecurityStatusString(cStatus), cStatus);
return FALSE; return FALSE;
} }
} }
status = ntlm->table->QueryContextAttributes(&ntlm->context, SECPKG_ATTR_SIZES, &ntlm->ContextSizes); status = ntlm->table->QueryContextAttributes(&ntlm->context, SECPKG_ATTR_SIZES, &ntlm->ContextSizes);
if (status != SEC_E_OK) if (status != SEC_E_OK)
{ {
WLog_ERR(TAG, "QueryContextAttributes SECPKG_ATTR_SIZES failure %s [%08X]", WLog_ERR(TAG, "QueryContextAttributes SECPKG_ATTR_SIZES failure %s [%08X]",

48
libfreerdp/crypto/tls.c
View File

@ -637,17 +637,23 @@ BOOL tls_prepare(rdpTls* tls, BIO* underlying, const SSL_METHOD* method, int opt
int tls_do_handshake(rdpTls* tls, BOOL clientMode) int tls_do_handshake(rdpTls* tls, BOOL clientMode)
{ {
CryptoCert cert; CryptoCert cert;
int verify_status, status; int verify_status;
do do
{ {
#ifdef HAVE_POLL_H #ifdef HAVE_POLL_H
struct pollfd pollfds;
#else
struct timeval tv;
fd_set rset;
#endif
int fd; int fd;
int status;
struct pollfd pollfds;
#elif !defined(_WIN32)
int fd;
int status;
fd_set rset;
struct timeval tv;
#else
HANDLE event;
DWORD status;
#endif
status = BIO_do_handshake(tls->bio); status = BIO_do_handshake(tls->bio);
@ -657,6 +663,7 @@ int tls_do_handshake(rdpTls* tls, BOOL clientMode)
if (!BIO_should_retry(tls->bio)) if (!BIO_should_retry(tls->bio))
return -1; return -1;
#ifndef _WIN32
/* we select() only for read even if we should test both read and write /* we select() only for read even if we should test both read and write
* depending of what have blocked */ * depending of what have blocked */
fd = BIO_get_fd(tls->bio, NULL); fd = BIO_get_fd(tls->bio, NULL);
@ -666,6 +673,15 @@ int tls_do_handshake(rdpTls* tls, BOOL clientMode)
WLog_ERR(TAG, "unable to retrieve BIO fd"); WLog_ERR(TAG, "unable to retrieve BIO fd");
return -1; return -1;
} }
#else
BIO_get_event(tls->bio, &event);
if (!event)
{
WLog_ERR(TAG, "unable to retrieve BIO event");
return -1;
}
#endif
#ifdef HAVE_POLL_H #ifdef HAVE_POLL_H
pollfds.fd = fd; pollfds.fd = fd;
@ -677,23 +693,35 @@ int tls_do_handshake(rdpTls* tls, BOOL clientMode)
status = poll(&pollfds, 1, 10 * 1000); status = poll(&pollfds, 1, 10 * 1000);
} }
while ((status < 0) && (errno == EINTR)); while ((status < 0) && (errno == EINTR));
#else #elif !defined(_WIN32)
FD_ZERO(&rset); FD_ZERO(&rset);
FD_SET(fd, &rset); FD_SET(fd, &rset);
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 10 * 1000; /* 10ms */ tv.tv_usec = 10 * 1000; /* 10ms */
status = _select(fd + 1, &rset, NULL, NULL, &tv); status = _select(fd + 1, &rset, NULL, NULL, &tv);
#else
status = WaitForSingleObject(event, 10);
#endif #endif
#ifndef _WIN32
if (status < 0) if (status < 0)
{ {
WLog_ERR(TAG, "error during select()"); WLog_ERR(TAG, "error during select()");
return -1; return -1;
} }
#else
if ((status != WAIT_OBJECT_0) && (status != WAIT_TIMEOUT))
{
WLog_ERR(TAG, "error during WaitForSingleObject(): 0x%04X", status);
return -1;
}
#endif
} }
while (TRUE); while (TRUE);
cert = tls_get_certificate(tls, clientMode); cert = tls_get_certificate(tls, clientMode);
if (!cert) if (!cert)
{ {
WLog_ERR(TAG, "tls_get_certificate failed to return the server certificate."); WLog_ERR(TAG, "tls_get_certificate failed to return the server certificate.");
@ -701,6 +729,7 @@ int tls_do_handshake(rdpTls* tls, BOOL clientMode)
} }
tls->Bindings = tls_get_channel_bindings(cert->px509); tls->Bindings = tls_get_channel_bindings(cert->px509);
if (!tls->Bindings) if (!tls->Bindings)
{ {
WLog_ERR(TAG, "unable to retrieve bindings"); WLog_ERR(TAG, "unable to retrieve bindings");
@ -715,10 +744,9 @@ int tls_do_handshake(rdpTls* tls, BOOL clientMode)
goto out; goto out;
} }
/* Note: server-side NLA needs public keys (keys from us, the server) but no /* server-side NLA needs public keys (keys from us, the server) but no certificate verify */
* certificate verify
*/
verify_status = 1; verify_status = 1;
if (clientMode) if (clientMode)
{ {
verify_status = tls_verify_certificate(tls, cert, tls->hostname, tls->port); verify_status = tls_verify_certificate(tls, cert, tls->hostname, tls->port);