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

Merge pull request #10576 from llyzs/fix_ssl_cb 

[core,transport] fix ssl info callback function signature and some wa…
This commit is contained in:
Martin Fleisz 2024-09-09 12:33:58 +02:00 committed by GitHub
parent 9738fc40f3 929e4bdf8d
commit a92a13d74c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libfreerdp/core/transport.c
View File

@ -97,10 +97,8 @@ struct rdp_transport
BOOL earlyUserAuth;
};
static int transport_ssl_cb(BIO* bio, int where, int ret)
static void transport_ssl_cb(const SSL* ssl, int where, int ret)
{
SSL* ssl = (SSL*)bio;
if (where & SSL_CB_ALERT)
{
rdpTransport* transport = (rdpTransport*)SSL_get_app_data(ssl);
@ -147,7 +145,6 @@ static int transport_ssl_cb(BIO* bio, int where, int ret)
}
}
}
return 0;
}
wStream* transport_send_stream_init(rdpTransport* transport, size_t size)
@ -329,7 +326,7 @@ static BOOL transport_default_connect_tls(rdpTransport* transport)
}
transport->frontBio = tls->bio;
BIO_callback_ctrl(tls->bio, BIO_CTRL_SET_CALLBACK, transport_ssl_cb);
BIO_callback_ctrl(tls->bio, BIO_CTRL_SET_CALLBACK, (BIO_info_cb*)transport_ssl_cb);
SSL_set_app_data(tls->ssl, transport);
if (!transport->frontBio)
@ -1488,8 +1485,9 @@ rdpTransportLayer* transport_connect_layer(rdpTransport* transport, const char*
return IFCALLRESULT(NULL, transport->io.ConnectLayer, transport, hostname, port, timeout);
}
rdpTransportLayer* transport_default_connect_layer(rdpTransport* transport, const char* hostname,
int port, DWORD timeout)
static rdpTransportLayer* transport_default_connect_layer(rdpTransport* transport,
const char* hostname, int port,
DWORD timeout)
{
rdpContext* context = transport_get_context(transport);
WINPR_ASSERT(context);
@ -1505,7 +1503,7 @@ BOOL transport_attach_layer(rdpTransport* transport, rdpTransportLayer* layer)
return IFCALLRESULT(FALSE, transport->io.AttachLayer, transport, layer);
}
BOOL transport_default_attach_layer(rdpTransport* transport, rdpTransportLayer* layer)
static BOOL transport_default_attach_layer(rdpTransport* transport, rdpTransportLayer* layer)
{
BIO* layerBio = BIO_new(BIO_s_transport_layer());
if (!layerBio)