You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.3 KiB
33 lines
1.3 KiB
15 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../lighttpd/ssl-retval-fix.patch
|
||
|
|
# Copyright (C) 2010 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
Description: Fix handling return value of SSL_CTX_set_options
|
||
|
|
|
||
|
|
http://redmine.lighttpd.net/issues/2157
|
||
|
|
|
||
|
|
diff -purN orig/src/network.c lighttpd-1.4.25/src/network.c
|
||
|
|
--- orig/src/network.c 2010-01-28 10:43:33.829209750 -0500
|
||
|
|
+++ lighttpd-1.4.25/src/network.c 2010-01-28 10:44:22.639208732 -0500
|
||
|
|
@@ -525,7 +525,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))) {
|
||
|
|
log_error_write(srv, __FILE__, __LINE__, "ss", "SSL:",
|
||
|
|
ERR_error_string(ERR_get_error(), NULL));
|
||
|
|
return -1;
|