Skip to content

Commit 9713a99

Browse files
authored
Merge pull request FreeRDP#11749 from akallabeth/internal-fix
[crypto,tls] do not use context->settings->instance
2 parents 1d09801 + 66ed6d7 commit 9713a99

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

libfreerdp/crypto/tls.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,10 +1220,10 @@ BOOL freerdp_tls_send_alert(rdpTls* tls)
12201220
if (!tls->ssl)
12211221
return TRUE;
12221222

1223-
/**
1224-
* FIXME: The following code does not work on OpenSSL > 1.1.0 because the
1225-
* SSL struct is opaqe now
1226-
*/
1223+
/**
1224+
* FIXME: The following code does not work on OpenSSL > 1.1.0 because the
1225+
* SSL struct is opaqe now
1226+
*/
12271227
#if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \
12281228
(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL))
12291229

@@ -1631,12 +1631,11 @@ int tls_verify_certificate(rdpTls* tls, const rdpCertificate* cert, const char*
16311631
rdpCertificateData* certificate_data = NULL;
16321632
BYTE* pemCert = NULL;
16331633
DWORD flags = VERIFY_CERT_FLAG_NONE;
1634-
freerdp* instance = NULL;
16351634

16361635
WINPR_ASSERT(tls);
1637-
WINPR_ASSERT(tls->context->settings);
1636+
WINPR_ASSERT(tls->context);
16381637

1639-
instance = (freerdp*)tls->context->settings->instance;
1638+
freerdp* instance = tls->context->instance;
16401639
WINPR_ASSERT(instance);
16411640

16421641
if (freerdp_shall_disconnect_context(instance->context))

0 commit comments

Comments
 (0)