Date: Wed, 11 May 2016 14:33:34 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r414996 - head/www/lighttpd/files Message-ID: <201605111433.u4BEXYQl092277@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Wed May 11 14:33:34 2016 New Revision: 414996 URL: https://svnweb.freebsd.org/changeset/ports/414996 Log: www/lighttpd: Fix run-time issue with LibreSSL 2.3 - Add upstream fix for SSL_OP_NO_SSLv2/v3 [1] [1] https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/1ca52fdce3b87f7748dd5db6f59d738ed7a9efe1/diff PR: 209266 Submitted by: Christian Heckendorf <heckendorfc@gmail.com> Approved by: Piotr Kubaj <pkubaj@anongoth.pl> (maintaner) Added: head/www/lighttpd/files/patch-src_network.c (contents, props changed) Added: head/www/lighttpd/files/patch-src_network.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/lighttpd/files/patch-src_network.c Wed May 11 14:33:34 2016 (r414996) @@ -0,0 +1,23 @@ +Cherry-picked from upstream +https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/1ca52fdce3b87f7748dd5db6f59d738ed7a9efe1/diff + +--- src/network.c.orig 2015-12-04 21:13:47 UTC ++++ src/network.c +@@ -769,7 +769,7 @@ int network_init(server *srv) { + + if (!s->ssl_use_sslv2) { + /* disable SSLv2 */ +- if (!(SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2))) { ++ if ((SSL_OP_NO_SSLv2 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv2)) != SSL_OP_NO_SSLv2) { + log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", + ERR_error_string(ERR_get_error(), NULL)); + return -1; +@@ -778,7 +778,7 @@ int network_init(server *srv) { + + if (!s->ssl_use_sslv3) { + /* disable SSLv3 */ +- if (!(SSL_OP_NO_SSLv3 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv3))) { ++ if ((SSL_OP_NO_SSLv3 & SSL_CTX_set_options(s->ssl_ctx, SSL_OP_NO_SSLv3)) != SSL_OP_NO_SSLv3) { + log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:", + ERR_error_string(ERR_get_error(), NULL)); + return -1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605111433.u4BEXYQl092277>