Date: Tue, 24 Mar 2015 00:24:08 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382058 - head/security/nessus-libraries/files Message-ID: <201503240024.t2O0O8NW097818@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Mar 24 00:24:07 2015 New Revision: 382058 URL: https://svnweb.freebsd.org/changeset/ports/382058 QAT: https://qat.redports.org/buildarchive/r382058/ Log: Fix build without SSLv2 support. Added: head/security/nessus-libraries/files/patch-libnessus__network.c (contents, props changed) Added: head/security/nessus-libraries/files/patch-libnessus__network.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nessus-libraries/files/patch-libnessus__network.c Tue Mar 24 00:24:07 2015 (r382058) @@ -0,0 +1,86 @@ +--- libnessus/network.c.orig 2006-05-22 10:14:35.000000000 -0400 ++++ libnessus/network.c 2015-03-23 20:16:26.470964000 -0400 +@@ -532,9 +532,11 @@ + + switch (fp->transport) + { ++#ifndef OPENSSL_NO_SSL2 + case NESSUS_ENCAPS_SSLv2: + fp->ssl_mt = SSLv2_client_method(); + break; ++#endif + case NESSUS_ENCAPS_SSLv3: + fp->ssl_mt = SSLv3_client_method(); + break; +@@ -724,7 +726,9 @@ + { + case NESSUS_ENCAPS_IP: + #ifdef HAVE_SSL ++#ifndef OPENSSL_NO_SSL2 + case NESSUS_ENCAPS_SSLv2: ++#endif + case NESSUS_ENCAPS_SSLv23: + case NESSUS_ENCAPS_SSLv3: + case NESSUS_ENCAPS_TLSv1: +@@ -783,8 +787,10 @@ + } + } + ++#ifndef OPENSSL_NO_SSL2 + case NESSUS_ENCAPS_SSLv2: + /* We do not need a client certificate in this case */ ++#endif + + if (open_SSL_connection(fp, timeout, cert, key, passwd, cert_names) <= 0) + goto failed; +@@ -812,7 +818,9 @@ + struct timeval tv1, tv2; + static int encaps[] = { + #ifdef HAVE_SSL ++#ifndef OPENSSL_NO_SSL2 + NESSUS_ENCAPS_SSLv2, ++#endif + NESSUS_ENCAPS_TLSv1, + NESSUS_ENCAPS_SSLv3, + #endif +@@ -1044,7 +1052,9 @@ + { + /* NESSUS_ENCAPS_IP was treated before with the non-Nessus fd */ + #ifdef HAVE_SSL ++#ifndef OPENSSL_NO_SSL2 + case NESSUS_ENCAPS_SSLv2: ++#endif + case NESSUS_ENCAPS_SSLv23: + case NESSUS_ENCAPS_SSLv3: + case NESSUS_ENCAPS_TLSv1: +@@ -1280,7 +1290,9 @@ + break; + + #ifdef HAVE_SSL ++#ifndef OPENSSL_NO_SSL2 + case NESSUS_ENCAPS_SSLv2: ++#endif + case NESSUS_ENCAPS_SSLv23: + case NESSUS_ENCAPS_SSLv3: + case NESSUS_ENCAPS_TLSv1: +@@ -1504,8 +1516,10 @@ + { + case NESSUS_ENCAPS_IP: + return "IP"; ++#ifndef OPENSSL_NO_SSL2 + case NESSUS_ENCAPS_SSLv2: + return "SSLv2"; ++#endif + case NESSUS_ENCAPS_SSLv23: + return "SSLv23"; + case NESSUS_ENCAPS_SSLv3: +@@ -1527,7 +1541,9 @@ + { + case NESSUS_ENCAPS_IP: + return ""; ++#ifndef OPENSSL_NO_SSL2 + case NESSUS_ENCAPS_SSLv2: ++#endif + case NESSUS_ENCAPS_SSLv23: + case NESSUS_ENCAPS_SSLv3: + case NESSUS_ENCAPS_TLSv1:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503240024.t2O0O8NW097818>