1 |
commit: 6b4e5c994bbd5233a937240df9a3ff6c522703ac |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 29 20:48:11 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 29 20:48:11 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b4e5c99 |
7 |
|
8 |
net-misc/freerdp: another libressl fix |
9 |
|
10 |
Closes: https://bugs.gentoo.org/684294 |
11 |
Package-Manager: Portage-2.3.75_p7, Repoman-2.3.17_p49 |
12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
13 |
|
14 |
net-misc/freerdp/files/2.0.0-rc4-libressl.patch | 31 +++++++++++++++++++++++++ |
15 |
1 file changed, 31 insertions(+) |
16 |
|
17 |
diff --git a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch |
18 |
index f666e0d4d67..fd6e6148607 100644 |
19 |
--- a/net-misc/freerdp/files/2.0.0-rc4-libressl.patch |
20 |
+++ b/net-misc/freerdp/files/2.0.0-rc4-libressl.patch |
21 |
@@ -45,3 +45,34 @@ index 76f51701fe..ded41f127e 100644 |
22 |
SSL_CTX_set_security_level(tls->ctx, settings->TlsSecLevel); |
23 |
#endif |
24 |
|
25 |
+From 0c83efa753d0457eb319624f87b491badf75105f Mon Sep 17 00:00:00 2001 |
26 |
+From: Armin Novak <armin.novak@××××××××.com> |
27 |
+Date: Mon, 7 Jan 2019 14:18:14 +0100 |
28 |
+Subject: [PATCH] Fix #5170: Disable custom TLS alert for libressl > 2.8.3 |
29 |
+ |
30 |
+--- |
31 |
+ libfreerdp/crypto/tls.c | 4 ++-- |
32 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
33 |
+ |
34 |
+diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c |
35 |
+index b2cf5416c8..56e16bacb4 100644 |
36 |
+--- a/libfreerdp/crypto/tls.c |
37 |
++++ b/libfreerdp/crypto/tls.c |
38 |
+@@ -1030,7 +1030,8 @@ BOOL tls_send_alert(rdpTls* tls) |
39 |
+ * FIXME: The following code does not work on OpenSSL > 1.1.0 because the |
40 |
+ * SSL struct is opaqe now |
41 |
+ */ |
42 |
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
43 |
++#if (!defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)) || \ |
44 |
++ (defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x2080300fL)) |
45 |
+ |
46 |
+ if (tls->alertDescription != TLS_ALERT_DESCRIPTION_CLOSE_NOTIFY) |
47 |
+ { |
48 |
+@@ -1057,7 +1058,6 @@ BOOL tls_send_alert(rdpTls* tls) |
49 |
+ if (tls->ssl->s3->wbuf.left == 0) |
50 |
+ tls->ssl->method->ssl_dispatch_alert(tls->ssl); |
51 |
+ } |
52 |
+- |
53 |
+ #endif |
54 |
+ return TRUE; |
55 |
+ } |