diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2016-05-11 14:33:34 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2016-05-11 14:33:34 +0000 |
| commit | 66f276d2b11d44995a48d6fbfd2405fc873b1996 (patch) | |
| tree | 72897938e60360839dce02017d172c4296e80895 /www/lighttpd | |
| parent | 50d46c147334e9228a29cf9dbe46c6c973efcf64 (diff) | |
| download | ports-66f276d2b11d44995a48d6fbfd2405fc873b1996.tar.gz ports-66f276d2b11d44995a48d6fbfd2405fc873b1996.zip | |
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)
Notes
Notes:
svn path=/head/; revision=414996
Diffstat (limited to 'www/lighttpd')
| -rw-r--r-- | www/lighttpd/files/patch-src_network.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/www/lighttpd/files/patch-src_network.c b/www/lighttpd/files/patch-src_network.c new file mode 100644 index 000000000000..8f8815d92ede --- /dev/null +++ b/www/lighttpd/files/patch-src_network.c @@ -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; |