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

[nla,transport] move public key retrieval to transport IO.

This commit is contained in:
Vic Lee 2024-01-03 00:00:14 +08:00 committed by Martin Fleisz
parent 87557b1e4e
commit 33447dc16e
4 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/freerdp/transport_io.h
View File

@ -41,6 +41,8 @@ extern "C"
typedef BOOL (*pTransportAttach)(rdpTransport* transport, int sockfd);
typedef int (*pTransportRWFkt)(rdpTransport* transport, wStream* s);
typedef SSIZE_T (*pTransportRead)(rdpTransport* transport, BYTE* data, size_t bytes);
typedef BOOL (*pTransportGetPublicKey)(rdpTransport* transport, const BYTE** data,
DWORD* length);
struct rdp_transport_io
{
@ -52,6 +54,7 @@ extern "C"
pTransportRWFkt ReadPdu; /* Reads a whole PDU from the transport */
pTransportRWFkt WritePdu; /* Writes a whole PDU to the transport */
pTransportRead ReadBytes; /* Reads up to a requested amount of bytes from the transport */
pTransportGetPublicKey GetPublicKey;
};
typedef struct rdp_transport_io rdpTransportIo;

21
libfreerdp/core/nla.c
View File

@ -451,15 +451,15 @@ static int nla_client_init(rdpNla* nla)
if (!credssp_auth_setup_client(nla->auth, "TERMSRV", hostname, nla->identity, nla->pkinitArgs))
return -1;
rdpTls* tls = transport_get_tls(nla->transport);
if (!tls)
const BYTE* data = NULL;
DWORD length = 0;
if (!transport_get_public_key(nla->transport, &data, &length))
{
WLog_ERR(TAG, "Unknown NLA transport layer");
WLog_ERR(TAG, "Failed to get public key");
return -1;
}
if (!nla_sec_buffer_alloc_from_data(&nla->PublicKey, tls->PublicKey, 0, tls->PublicKeyLength))
if (!nla_sec_buffer_alloc_from_data(&nla->PublicKey, data, 0, length))
{
WLog_ERR(TAG, "Failed to allocate sspi secBuffer");
return -1;
@ -662,10 +662,15 @@ static int nla_server_init(rdpNla* nla)
{
WINPR_ASSERT(nla);
rdpTls* tls = transport_get_tls(nla->transport);
WINPR_ASSERT(tls);
const BYTE* data = NULL;
DWORD length = 0;
if (!transport_get_public_key(nla->transport, &data, &length))
{
WLog_ERR(TAG, "Failed to get public key");
return -1;
}
if (!nla_sec_buffer_alloc_from_data(&nla->PublicKey, tls->PublicKey, 0, tls->PublicKeyLength))
if (!nla_sec_buffer_alloc_from_data(&nla->PublicKey, data, 0, length))
{
WLog_ERR(TAG, "Failed to allocate SecBuffer for public key");
return -1;

19
libfreerdp/core/transport.c
View File

@ -1218,6 +1218,24 @@ fail:
return status;
}
BOOL transport_get_public_key(rdpTransport* transport, const BYTE** data, DWORD* length)
{
return IFCALLRESULT(FALSE, transport->io.GetPublicKey, transport, data, length);
}
static BOOL transport_default_get_public_key(rdpTransport* transport, const BYTE** data,
DWORD* length)
{
rdpTls* tls = transport_get_tls(transport);
if (!tls)
return FALSE;
*data = tls->PublicKey;
*length = tls->PublicKeyLength;
return TRUE;
}
DWORD transport_get_event_handles(rdpTransport* transport, HANDLE* events, DWORD count)
{
DWORD nCount = 0; /* always the reread Event */
@ -1535,6 +1553,7 @@ rdpTransport* transport_new(rdpContext* context)
transport->io.ReadPdu = transport_default_read_pdu;
transport->io.WritePdu = transport_default_write;
transport->io.ReadBytes = transport_read_layer;
transport->io.GetPublicKey = transport_default_get_public_key;
transport->context = context;
transport->ReceivePool = StreamPool_New(TRUE, BUFFER_SIZE);

3
libfreerdp/core/transport.h
View File

@ -73,6 +73,9 @@ FREERDP_LOCAL BOOL transport_accept_rdstls(rdpTransport* transport);
FREERDP_LOCAL int transport_read_pdu(rdpTransport* transport, wStream* s);
FREERDP_LOCAL int transport_write(rdpTransport* transport, wStream* s);
FREERDP_LOCAL BOOL transport_get_public_key(rdpTransport* transport, const BYTE** data,
DWORD* length);
#if defined(WITH_FREERDP_DEPRECATED)
FREERDP_LOCAL void transport_get_fds(rdpTransport* transport, void** rfds, int* rcount);
#endif