From owner-svn-ports-head@FreeBSD.ORG Sun Jan 11 13:50:24 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F48DFEA; Sun, 11 Jan 2015 13:50:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 621E939C; Sun, 11 Jan 2015 13:50:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0BDoOvL037118; Sun, 11 Jan 2015 13:50:24 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0BDoN25037116; Sun, 11 Jan 2015 13:50:23 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201501111350.t0BDoN25037116@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 11 Jan 2015 13:50:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376782 - head/security/nessus/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jan 2015 13:50:24 -0000 Author: tijl Date: Sun Jan 11 13:50:23 2015 New Revision: 376782 URL: https://svnweb.freebsd.org/changeset/ports/376782 QAT: https://qat.redports.org/buildarchive/r376782/ Log: Fix build when OpenSSL doesn't support SSL2/SSL3 PR: 195796 Added: head/security/nessus/files/patch-nessus_nessus.c (contents, props changed) head/security/nessus/files/patch-nessusd_nessusd.c (contents, props changed) Added: head/security/nessus/files/patch-nessus_nessus.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nessus/files/patch-nessus_nessus.c Sun Jan 11 13:50:23 2015 (r376782) @@ -0,0 +1,22 @@ +--- nessus/nessus.c.orig 2006-09-22 20:28:30 UTC ++++ nessus/nessus.c +@@ -438,11 +438,17 @@ Please launch nessus-mkrand(1) first !") + } + if (ssl_mt == NULL) + { ++#ifndef OPENSSL_NO_SSL2 + if (strcasecmp(ssl_ver, "SSLv2") == 0) + ssl_mt = SSLv2_client_method(); +- else if (strcasecmp(ssl_ver, "SSLv3") == 0) ++ else ++#endif ++#ifndef OPENSSL_NO_SSL3_METHOD ++ if (strcasecmp(ssl_ver, "SSLv3") == 0) + ssl_mt = SSLv3_client_method(); +- else if (strcasecmp(ssl_ver, "SSLv23") == 0) ++ else ++#endif ++ if (strcasecmp(ssl_ver, "SSLv23") == 0) + ssl_mt = SSLv23_client_method(); + else if (strcasecmp(ssl_ver, "TLSv1") == 0) + ssl_mt = TLSv1_client_method(); Added: head/security/nessus/files/patch-nessusd_nessusd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nessus/files/patch-nessusd_nessusd.c Sun Jan 11 13:50:23 2015 (r376782) @@ -0,0 +1,22 @@ +--- nessusd/nessusd.c.orig 2006-10-16 17:55:54 UTC ++++ nessusd/nessusd.c +@@ -622,11 +622,17 @@ main_loop() + + if (ssl_mt == NULL) + { ++#ifndef OPENSSL_NO_SSL2 + if (strcasecmp(ssl_ver, "SSLv2") == 0) + ssl_mt = SSLv2_server_method(); +- else if (strcasecmp(ssl_ver, "SSLv3") == 0) ++ else ++#endif ++#ifndef OPENSSL_NO_SSL3_METHOD ++ if (strcasecmp(ssl_ver, "SSLv3") == 0) + ssl_mt = SSLv3_server_method(); +- else if (strcasecmp(ssl_ver, "SSLv23") == 0) ++ else ++#endif ++ if (strcasecmp(ssl_ver, "SSLv23") == 0) + ssl_mt = SSLv23_server_method(); + else if (strcasecmp(ssl_ver, "TLSv1") == 0) + ssl_mt = TLSv1_server_method();