Attachment 200976 Details for Bug 234772 – suggested patch

[patch] suggested patch

libvncserver.patch (text/plain), 3.55 KB, created by Dirk Meyer on 2019-01-10 06:30:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Meyer

Created: 2019-01-10 06:30:22 UTC

Size: 3.55 KB

patch

obsolete

>Index: files/patch-configure.ac
>===================================================================
>--- files/patch-configure.ac	(nicht existent)
>+++ files/patch-configure.ac	(Arbeitskopie)
>@@ -0,0 +1,17 @@
>+--- configure.ac.orig	2016-12-30 13:01:28 UTC
>++++ configure.ac
>+@@ -138,12 +138,12 @@ fi
>+ AH_TEMPLATE(HAVE_X509_PRINT_EX_FP, [open ssl X509_print_ex_fp available])
>+ if test "x$with_ssl" != "xno"; then
>+ 	if test "x$HAVE_LIBCRYPTO" = "xtrue"; then
>+-		AC_CHECK_LIB(ssl, SSL_library_init,
>++		AC_CHECK_LIB(ssl, SSL_free,
>+ 			SSL_LIBS="-lssl -lcrypto"
>+ 			[AC_DEFINE(HAVE_LIBSSL) HAVE_LIBSSL="true"], ,
>+ 			-lcrypto)
>+ 	else
>+-		AC_CHECK_LIB(ssl, SSL_library_init,
>++		AC_CHECK_LIB(ssl, SSL_free,
>+ 			SSL_LIBS="-lssl"
>+ 			[AC_DEFINE(HAVE_LIBSSL) HAVE_LIBSSL="true"], ,)
>+ 	fi
>
>Property changes on: files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-rfbssl_openssl.c
>===================================================================
>--- files/patch-rfbssl_openssl.c	(nicht existent)
>+++ files/patch-rfbssl_openssl.c	(Arbeitskopie)
>@@ -0,0 +1,11 @@
>+--- libvncserver/rfbssl_openssl.c.orig	2016-12-30 13:01:28 UTC
>++++ libvncserver/rfbssl_openssl.c
>+@@ -56,7 +56,7 @@ int rfbssl_init(rfbClientPtr cl)
>+ 	rfbErr("OOM\n");
>+     } else if (!cl->screen->sslcertfile || !cl->screen->sslcertfile[0]) {
>+ 	rfbErr("SSL connection but no cert specified\n");
>+-    } else if (NULL == (ctx->ssl_ctx = SSL_CTX_new(TLSv1_server_method()))) {
>++    } else if (NULL == (ctx->ssl_ctx = SSL_CTX_new(TLS_server_method()))) {
>+ 	rfbssl_error();
>+     } else if (SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, keyfile, SSL_FILETYPE_PEM) <= 0) {
>+ 	rfbErr("Unable to load private key file %s\n", keyfile);
>
>Property changes on: files/patch-rfbssl_openssl.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-tls_openssl.c
>===================================================================
>--- files/patch-tls_openssl.c	(nicht existent)
>+++ files/patch-tls_openssl.c	(Arbeitskopie)
>@@ -0,0 +1,21 @@
>+--- libvncclient/tls_openssl.c.orig	2016-12-30 13:01:28 UTC
>++++ libvncclient/tls_openssl.c
>+@@ -189,7 +189,7 @@ ssl_verify (int ok, X509_STORE_CTX *ctx)
>+ 
>+   ssl = X509_STORE_CTX_get_ex_data (ctx, SSL_get_ex_data_X509_STORE_CTX_idx ());
>+ 
>+-  client = SSL_CTX_get_app_data (ssl->ctx);
>++  client = SSL_CTX_get_app_data ( SSL_get_SSL_CTX (ssl) );
>+ 
>+   cert = X509_STORE_CTX_get_current_cert (ctx);
>+   err = X509_STORE_CTX_get_error (ctx);
>+@@ -288,8 +288,7 @@ open_ssl_connection (rfbClient *client, 
>+       if (wait_for_data(ssl, n, 1) != 1) 
>+       {
>+         finished = 1; 
>+-        if (ssl->ctx)
>+-          SSL_CTX_free (ssl->ctx);
>++        /* SSL_free does call SSL_CTX_free */
>+         SSL_free(ssl);
>+         SSL_shutdown (ssl);
>+ 
>
>Property changes on: files/patch-tls_openssl.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 234772: 200976