diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2019-09-29 16:48:11 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2019-09-29 16:48:11 -0400 |
| commit | 6b4e5c994bbd5233a937240df9a3ff6c522703ac (patch) | |
| tree | f3f707cade477be174b89f5f9b37bbcca6466e80 /net-misc | |
| parent | net-libs/kimap2: Drop 0.2.0-r1 (diff) | |
| download | gentoo-6b4e5c994bbd5233a937240df9a3ff6c522703ac.tar.gz gentoo-6b4e5c994bbd5233a937240df9a3ff6c522703ac.tar.bz2 gentoo-6b4e5c994bbd5233a937240df9a3ff6c522703ac.zip | |
net-misc/freerdp: another libressl fix
Closes: https://bugs.gentoo.org/684294
Package-Manager: Portage-2.3.75_p7, Repoman-2.3.17_p49
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/freerdp/files/2.0.0-rc4-libressl.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch index f666e0d4d671..fd6e6148607a 100644 --- a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch +++ b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch @@ -45,3 +45,34 @@ index 76f51701fe..ded41f127e 100644 SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel); #endif +From 0c83efa753d0457eb319624f87b491badf75105f Mon Sep 17 00:00:00 2001 +From: Armin Novak <armin.novak@thincast.com> +Date: Mon, 7 Jan 2019 14:18:14 +0100 +Subject: [PATCH] Fix #5170: Disable custom TLS alert for libressl > 2.8.3 + +--- + libfreerdp/crypto/tls.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c +index b2cf5416c8..56e16bacb4 100644 +--- a/libfreerdp/crypto/tls.c ++++ b/libfreerdp/crypto/tls.c +@@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls) + * FIXME: The following code does not work on OpenSSL > 1.1.0 because the + * 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) + { +@@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls) + if (tls->ssl->s3->wbuf.left == 0) + tls->ssl->method->ssl_dispatch_alert(tls->ssl); + } +- + #endif + return TRUE; + } |