Date: Sun, 11 Jan 2015 13:50:23 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376782 - head/security/nessus/files Message-ID: <201501111350.t0BDoN25037116@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501111350.t0BDoN25037116>