mirror of https://github.com/FreeRDP/FreeRDP
libfreerdp-auth: resolve cyclic dependency with libfreerdp-core
This commit is contained in:
parent
0e861b1bcb
commit
a932835f44
|
@ -110,13 +110,6 @@ FREERDP_API boolean freerdp_disconnect(freerdp* instance);
|
|||
FREERDP_API boolean freerdp_get_fds(freerdp* instance, void** rfds, int* rcount, void** wfds, int* wcount);
|
||||
FREERDP_API boolean freerdp_check_fds(freerdp* instance);
|
||||
|
||||
FREERDP_API int freerdp_transport_read(freerdp* instance, STREAM* s);
|
||||
FREERDP_API int freerdp_transport_write(freerdp* instance, STREAM* s);
|
||||
|
||||
FREERDP_API STREAM* freerdp_transport_recv_stream_init(freerdp* instance, int size);
|
||||
FREERDP_API STREAM* freerdp_transport_send_stream_init(freerdp* instance, int size);
|
||||
|
||||
FREERDP_API void freerdp_send_keep_alive(freerdp* instance);
|
||||
FREERDP_API uint32 freerdp_error_info(freerdp* instance);
|
||||
|
||||
FREERDP_API void freerdp_get_version(int* major, int* minor, int* revision);
|
||||
|
|
|
@ -22,7 +22,9 @@
|
|||
#endif
|
||||
|
||||
#include <time.h>
|
||||
#include <freerdp/crypto/tls.h>
|
||||
#include <freerdp/auth/ntlmssp.h>
|
||||
#include <freerdp/utils/stream.h>
|
||||
|
||||
#include <freerdp/auth/credssp.h>
|
||||
|
||||
|
@ -573,7 +575,7 @@ void credssp_send(rdpCredssp* credssp, rdpBlob* negoToken, rdpBlob* authInfo, rd
|
|||
ber_write_octet_string(s, pubKeyAuth->data, length);
|
||||
}
|
||||
|
||||
freerdp_transport_write(credssp->instance, s);
|
||||
tls_write(credssp->tls, s->data, stream_get_length(s));
|
||||
stream_free(s);
|
||||
}
|
||||
|
||||
|
@ -593,8 +595,8 @@ int credssp_recv(rdpCredssp* credssp, rdpBlob* negoToken, rdpBlob* authInfo, rdp
|
|||
int status;
|
||||
uint32 version;
|
||||
|
||||
s = freerdp_transport_recv_stream_init(credssp->instance, 2048);
|
||||
status = freerdp_transport_read(credssp->instance, s);
|
||||
s = stream_new(2048);
|
||||
status = tls_read(credssp->tls, s->data, stream_get_left(s));
|
||||
|
||||
if (status < 0)
|
||||
return -1;
|
||||
|
|
|
@ -127,31 +127,6 @@ boolean freerdp_check_fds(freerdp* instance)
|
|||
return true;
|
||||
}
|
||||
|
||||
int freerdp_transport_read(freerdp* instance, STREAM* s)
|
||||
{
|
||||
return transport_read(instance->context->rdp->transport, s);
|
||||
}
|
||||
|
||||
int freerdp_transport_write(freerdp* instance, STREAM* s)
|
||||
{
|
||||
return transport_write(instance->context->rdp->transport, s);
|
||||
}
|
||||
|
||||
STREAM* freerdp_transport_recv_stream_init(freerdp* instance, int size)
|
||||
{
|
||||
return transport_recv_stream_init(instance->context->rdp->transport, size);
|
||||
}
|
||||
|
||||
STREAM* freerdp_transport_send_stream_init(freerdp* instance, int size)
|
||||
{
|
||||
return transport_send_stream_init(instance->context->rdp->transport, size);
|
||||
}
|
||||
|
||||
void freerdp_send_keep_alive(freerdp* instance)
|
||||
{
|
||||
input_send_synchronize_event(instance->context->rdp->input, 0);
|
||||
}
|
||||
|
||||
static int freerdp_send_channel_data(freerdp* instance, int channel_id, uint8* data, int size)
|
||||
{
|
||||
return rdp_send_channel_data(instance->context->rdp, channel_id, data, size);
|
||||
|
|
Loading…
Reference in New Issue