commit: 8f8397278392054a78ad0d75c86577a12e6204f5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue May 21 18:34:33 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue May 21 18:40:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f839727
x11-misc/x11vnc: Fix anonymous SSL w/ OpenSSL-1.1 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch | 26 ++++++++++++++++++++++ x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch new file mode 100644 index 00000000000..3dafb9aa6b0 --- /dev/null +++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-anonymous-ssl.patch @@ -0,0 +1,26 @@ +From b9cf79fd3d61a7586fe6b24b3141e406cdf334eb Mon Sep 17 00:00:00 2001 +From: Jim Broadus <[email protected]> +Date: Wed, 2 Jan 2019 17:37:40 -0800 +Subject: [PATCH] Fix anonymous SSL. In version 1.1.0, openssl introduced a + security level concept. Only level 0 allows the use of unauthenticated cipher + suites such as ADH. + +--- + src/sslhelper.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/sslhelper.c b/src/sslhelper.c +index 1a3e7474..04c2e273 100644 +--- a/src/sslhelper.c ++++ b/src/sslhelper.c +@@ -1596,6 +1596,10 @@ static int switch_to_anon_dh(void) { + if (ssl_client_mode) { + return 1; + } ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ /* Security level must be set to 0 for unauthenticated suites. */ ++ SSL_CTX_set_security_level(ctx, 0); ++#endif + if (!SSL_CTX_set_cipher_list(ctx, "ADH:@STRENGTH")) { + return 0; + } diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild index 55edb78e789..f78d4c9f6ab 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild @@ -41,8 +41,8 @@ RDEPEND="${COMMON_DEPEND} " PATCHES=( - # https://github.com/LibVNC/x11vnc/issues/86 - "${FILESDIR}"/${P}-crypto.patch + "${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 + "${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 ) src_prepare() {
