Fix #5170: Disable custom TLS alert for libressl > 2.8.3

This commit is contained in:
Armin Novak 2019-01-07 14:18:14 +01:00
parent 6cc13303bb
commit 0c83efa753
1 changed files with 2 additions and 2 deletions

View File

@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls)
* FIXME: The following code does not work on OpenSSL > 1.1.0 because the * FIXME: The following code does not work on OpenSSL > 1.1.0 because the
* SSL struct is opaqe now * SSL struct is opaqe now
*/ */
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \
(defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL))
if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY) if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY)
{ {
@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls)
if (tls->ssl->s3->wbuf.left == 0) if (tls->ssl->s3->wbuf.left == 0)
tls->ssl->method->ssl_dispatch_alert(tls->ssl); tls->ssl->method->ssl_dispatch_alert(tls->ssl);
} }
#endif #endif
return TRUE; return TRUE;
} }