Attachment #154932 for bug #198992

View | Details | Raw Unified | Return to bug 198992
Collapse All | Expand All

Lines 27-34 Link Here

(-)security/nessus-libraries/Makefile (-1 / +5 lines)
27	.endif	27	.endif
28	USES= bison libtool	28	USES= bison libtool
29	USE_LDCONFIG= YES	29	USE_LDCONFIG= YES
		30	USE_OPENSSL= yes
30	WRKSRC= ${WRKDIR}/nessus-libraries	31	WRKSRC= ${WRKDIR}/nessus-libraries
31		32
		33	.include <bsd.port.pre.mk>
		34	CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE}
		35
32	.if ! defined(NESSUS_CLIENT_ONLY)	36	.if ! defined(NESSUS_CLIENT_ONLY)
33	pre-everything::	37	pre-everything::
34	@if [ ! -c /dev/bpf ]; then \	38	@if [ ! -c /dev/bpf ]; then \
Lines 45-48 Link Here
45	fi	49	fi
46	.endif	50	.endif
47		51
48	.include <bsd.port.mk>	52	.include <bsd.port.post.mk>




--- Makefile.orig	2004-01-08 16:55:13 UTC
+++ Makefile
@@ -3,8 +3,8 @@ include nessus.tmpl
 ALLDEPS = nessus.tmpl nessus-config
 
 all: $(ALLDEPS) $(PCAP_MAKE)

 
 nessus-config: nessus-config.pre Makefile nessus.tmpl
 	@echo Creating $@ ...
@@ -19,8 +19,8 @@ nessus.tmpl: nessus.tmpl.in configure VE
 	touch $@
 
 win32:

 	@echo
 	@echo ' --------------------------------------------------------------'
 	@echo ' The header files necessary and some docs have been generated,'
@@ -31,27 +31,26 @@ win32:
 
 
 pcap-make :

 	$(INSTALL) -m 0444 include/libnessus.h $(DESTDIR)${includedir}/nessus
 	$(INSTALL) -m 0444 include/harglists.h $(DESTDIR)${includedir}/nessus
 	$(INSTALL) -m 0444 include/libvers.h   $(DESTDIR)${includedir}/nessus
@@ -64,22 +63,13 @@ install : $(PCAP_INSTALL)
 	test -d $(DESTDIR)${mandir}/man1 || ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1
 	$(INSTALL) -m 0644 nessus-config.1 $(DESTDIR)${mandir}/man1
 




--- libnessus/network.c.orig	2006-05-22 14:14:35 UTC
+++ libnessus/network.c
@@ -532,12 +532,16 @@ open_SSL_connection(fp, timeout, cert, k
 
   switch (fp->transport)
     {
+#ifndef OPENSSL_NO_SSL2
     case NESSUS_ENCAPS_SSLv2:
       fp->ssl_mt = SSLv2_client_method();
       break;
+#endif
+#ifndef OPENSSL_NO_SSL3
     case NESSUS_ENCAPS_SSLv3:
       fp->ssl_mt = SSLv3_client_method();
       break;
+#endif
     case NESSUS_ENCAPS_TLSv1:
       fp->ssl_mt = TLSv1_client_method();
       break;
@@ -724,9 +728,13 @@ open_stream_connection(args, port, trans
  {
   case NESSUS_ENCAPS_IP:
 #ifdef HAVE_SSL
+#ifndef OPENSSL_NO_SSL2
   case NESSUS_ENCAPS_SSLv2:
+#endif
   case NESSUS_ENCAPS_SSLv23:
+#ifndef OPENSSL_NO_SSL3
   case NESSUS_ENCAPS_SSLv3:
+#endif
   case NESSUS_ENCAPS_TLSv1:
 #endif 
    break;
@@ -763,7 +771,9 @@ open_stream_connection(args, port, trans
     break;
 #ifdef HAVE_SSL
   case NESSUS_ENCAPS_SSLv23:
+#ifndef OPENSSL_NO_SSL3
   case NESSUS_ENCAPS_SSLv3:
+#endif
   case NESSUS_ENCAPS_TLSv1:
     renice_myself();
     cert   = kb_item_get_str(plug_get_kb(args), "SSL/cert");
@@ -782,12 +792,13 @@ open_stream_connection(args, port, trans
 	    sslerror(msg);
 	  }
      }
-   
+#ifndef OPENSSL_NO_SSL2   
   case NESSUS_ENCAPS_SSLv2:
     /* We do not need a client certificate in this case */
 
     if (open_SSL_connection(fp, timeout, cert, key, passwd, cert_names) <= 0)
     goto failed;
+#endif
   break;
 #endif
  }
@@ -812,10 +823,14 @@ open_stream_connection_unknown_encaps5(a
   struct timeval	tv1, tv2;
  static int encaps[] = {
 #ifdef HAVE_SSL
+#ifndef OPENSSL_NO_SSL2
    NESSUS_ENCAPS_SSLv2,
+#endif
    NESSUS_ENCAPS_TLSv1,
+#ifndef OPENSSL_NO_SSL3
    NESSUS_ENCAPS_SSLv3,
 #endif
+#endif
     NESSUS_ENCAPS_IP
   };
  
@@ -1044,9 +1059,13 @@ read_stream_connection_unbuffered(fd, bu
     {
       /* 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:
+#ifndef OPENSSL_NO_SSL3
     case NESSUS_ENCAPS_SSLv3:
+#endif
     case NESSUS_ENCAPS_TLSv1:
 # if DEBUG_SSL > 0
       if (getpid() != fp->pid)
@@ -1280,9 +1299,13 @@ write_stream_connection4(fd, buf0, n, i_
     break;
 
 #ifdef HAVE_SSL
+#ifndef OPENSSL_NO_SSL2
   case NESSUS_ENCAPS_SSLv2:
+#endif
   case NESSUS_ENCAPS_SSLv23:
+#ifndef OPENSSL_NO_SSL3
   case NESSUS_ENCAPS_SSLv3:
+#endif
   case NESSUS_ENCAPS_TLSv1:
       FD_ZERO(&fdr); FD_ZERO(&fdw); 
       FD_SET(fp->fd, & fdr); FD_SET(fp->fd, & fdw);
@@ -1504,12 +1527,16 @@ get_encaps_name(code)
  {
   case NESSUS_ENCAPS_IP:
    return "IP";
+#ifndef OPENSSL_NO_SSL2
   case NESSUS_ENCAPS_SSLv2:
     return "SSLv2";
+#endif
   case NESSUS_ENCAPS_SSLv23:
     return "SSLv23";
+#ifndef OPENSSL_NO_SSL3
   case NESSUS_ENCAPS_SSLv3:
     return "SSLv3";
+#endif
   case NESSUS_ENCAPS_TLSv1:
     return "TLSv1";
   default:
@@ -1527,9 +1554,13 @@ get_encaps_through(code)
  {
   case NESSUS_ENCAPS_IP:
    return "";
+#ifndef OPENSSL_NO_SSL2
   case NESSUS_ENCAPS_SSLv2:
+#endif
   case NESSUS_ENCAPS_SSLv23:
+#ifndef OPENSSL_NO_SSL3
   case NESSUS_ENCAPS_SSLv3:
+#endif
   case NESSUS_ENCAPS_TLSv1:
     return " through SSL";
   default:

Lines 1-6 Link Here

(-)security/nessus-libraries/files/patch-libpcap-nessus__configure (-3 / +3 lines)
1	--- libpcap-nessus/configure.orig Mon Jul 31 11:09:51 2000	1	--- libpcap-nessus/configure.orig 2003-02-06 20:28:07 UTC
2	+++ libpcap-nessus/configure Wed May 29 12:07:45 2002	2	+++ libpcap-nessus/configure
3	@@ -391,9 +391,9 @@	3	@@ -391,9 +391,9 @@ EOF
4	if test -n "`echo $ac_option\| sed 's/[-a-z0-9.]//g'`"; then	4	if test -n "`echo $ac_option\| sed 's/[-a-z0-9.]//g'`"; then
5	echo "configure: warning: $ac_option: invalid host type" 1>&2	5	echo "configure: warning: $ac_option: invalid host type" 1>&2
6	fi	6	fi

Return to bug 198992

Lines 1-6 Link Here

(-)security/nessus-libraries/files/patch-Makefile (-6 / +6 lines)
1	--- Makefile.orig 2004-01-09 00:55:13.000000000 +0800	1	--- Makefile.orig 2004-01-08 16:55:13 UTC
2	+++ Makefile 2013-07-28 16:41:08.000000000 +0800	2	+++ Makefile
3	@@ -3,8 +3,8 @@	3	@@ -3,8 +3,8 @@ include nessus.tmpl
4	ALLDEPS = nessus.tmpl nessus-config	4	ALLDEPS = nessus.tmpl nessus-config
5		5
6	all: $(ALLDEPS) $(PCAP_MAKE)	6	all: $(ALLDEPS) $(PCAP_MAKE)
Lines 11-17 Link Here
11		11
12	nessus-config: nessus-config.pre Makefile nessus.tmpl	12	nessus-config: nessus-config.pre Makefile nessus.tmpl
13	@echo Creating $@ ...	13	@echo Creating $@ ...
14	@@ -19,8 +19,8 @@	14	@@ -19,8 +19,8 @@ nessus.tmpl: nessus.tmpl.in configure VE
15	touch $@	15	touch $@
16		16
17	win32:	17	win32:
Lines 22-28 Link Here
22	@echo	22	@echo
23	@echo ' --------------------------------------------------------------'	23	@echo ' --------------------------------------------------------------'
24	@echo ' The header files necessary and some docs have been generated,'	24	@echo ' The header files necessary and some docs have been generated,'
25	@@ -31,27 +31,26 @@	25	@@ -31,27 +31,26 @@ win32:
26		26
27		27
28	pcap-make :	28	pcap-make :
Lines 56-62 Link Here
56	$(INSTALL) -m 0444 include/libnessus.h $(DESTDIR)${includedir}/nessus	56	$(INSTALL) -m 0444 include/libnessus.h $(DESTDIR)${includedir}/nessus
57	$(INSTALL) -m 0444 include/harglists.h $(DESTDIR)${includedir}/nessus	57	$(INSTALL) -m 0444 include/harglists.h $(DESTDIR)${includedir}/nessus
58	$(INSTALL) -m 0444 include/libvers.h $(DESTDIR)${includedir}/nessus	58	$(INSTALL) -m 0444 include/libvers.h $(DESTDIR)${includedir}/nessus
59	@@ -64,22 +63,13 @@	59	@@ -64,22 +63,13 @@ install : $(PCAP_INSTALL)
60	test -d $(DESTDIR)${mandir}/man1 \|\| ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1	60	test -d $(DESTDIR)${mandir}/man1 \|\| ${INSTALL_DIR} -m 755 $(DESTDIR)${mandir}/man1
61	$(INSTALL) -m 0644 nessus-config.1 $(DESTDIR)${mandir}/man1	61	$(INSTALL) -m 0644 nessus-config.1 $(DESTDIR)${mandir}/man1
62		62

Line 0 Link Here

(-)security/nessus-libraries/files/patch-libnessus_network.c (+132 lines)
		1	--- libnessus/network.c.orig 2006-05-22 14:14:35 UTC
		2	+++ libnessus/network.c
		3	@@ -532,12 +532,16 @@ open_SSL_connection(fp, timeout, cert, k
		4
		5	switch (fp->transport)
		6	{
		7	+#ifndef OPENSSL_NO_SSL2
		8	case NESSUS_ENCAPS_SSLv2:
		9	fp->ssl_mt = SSLv2_client_method();
		10	break;
		11	+#endif
		12	+#ifndef OPENSSL_NO_SSL3
		13	case NESSUS_ENCAPS_SSLv3:
		14	fp->ssl_mt = SSLv3_client_method();
		15	break;
		16	+#endif
		17	case NESSUS_ENCAPS_TLSv1:
		18	fp->ssl_mt = TLSv1_client_method();
		19	break;
		20	@@ -724,9 +728,13 @@ open_stream_connection(args, port, trans
		21	{
		22	case NESSUS_ENCAPS_IP:
		23	#ifdef HAVE_SSL
		24	+#ifndef OPENSSL_NO_SSL2
		25	case NESSUS_ENCAPS_SSLv2:
		26	+#endif
		27	case NESSUS_ENCAPS_SSLv23:
		28	+#ifndef OPENSSL_NO_SSL3
		29	case NESSUS_ENCAPS_SSLv3:
		30	+#endif
		31	case NESSUS_ENCAPS_TLSv1:
		32	#endif
		33	break;
		34	@@ -763,7 +771,9 @@ open_stream_connection(args, port, trans
		35	break;
		36	#ifdef HAVE_SSL
		37	case NESSUS_ENCAPS_SSLv23:
		38	+#ifndef OPENSSL_NO_SSL3
		39	case NESSUS_ENCAPS_SSLv3:
		40	+#endif
		41	case NESSUS_ENCAPS_TLSv1:
		42	renice_myself();
		43	cert = kb_item_get_str(plug_get_kb(args), "SSL/cert");
		44	@@ -782,12 +792,13 @@ open_stream_connection(args, port, trans
		45	sslerror(msg);
		46	}
		47	}
		48	-
		49	+#ifndef OPENSSL_NO_SSL2
		50	case NESSUS_ENCAPS_SSLv2:
		51	/* We do not need a client certificate in this case */
		52
		53	if (open_SSL_connection(fp, timeout, cert, key, passwd, cert_names) <= 0)
		54	goto failed;
		55	+#endif
		56	break;
		57	#endif
		58	}
		59	@@ -812,10 +823,14 @@ open_stream_connection_unknown_encaps5(a
		60	struct timeval tv1, tv2;
		61	static int encaps[] = {
		62	#ifdef HAVE_SSL
		63	+#ifndef OPENSSL_NO_SSL2
		64	NESSUS_ENCAPS_SSLv2,
65	+#endif
66	NESSUS_ENCAPS_TLSv1,
67	+#ifndef OPENSSL_NO_SSL3
68	NESSUS_ENCAPS_SSLv3,
69	#endif
70	+#endif
71	NESSUS_ENCAPS_IP
72	};
73
74	@@ -1044,9 +1059,13 @@ read_stream_connection_unbuffered(fd, bu
75	{
76	/* NESSUS_ENCAPS_IP was treated before with the non-Nessus fd */
77	#ifdef HAVE_SSL
78	+#ifndef OPENSSL_NO_SSL2
79	case NESSUS_ENCAPS_SSLv2:
80	+#endif
81	case NESSUS_ENCAPS_SSLv23:
82	+#ifndef OPENSSL_NO_SSL3
83	case NESSUS_ENCAPS_SSLv3:
84	+#endif
85	case NESSUS_ENCAPS_TLSv1:
86	# if DEBUG_SSL > 0
87	if (getpid() != fp->pid)
88	@@ -1280,9 +1299,13 @@ write_stream_connection4(fd, buf0, n, i_
89	break;
90
91	#ifdef HAVE_SSL
92	+#ifndef OPENSSL_NO_SSL2
93	case NESSUS_ENCAPS_SSLv2:
94	+#endif
95	case NESSUS_ENCAPS_SSLv23:
96	+#ifndef OPENSSL_NO_SSL3
97	case NESSUS_ENCAPS_SSLv3:
98	+#endif
99	case NESSUS_ENCAPS_TLSv1:
100	FD_ZERO(&fdr); FD_ZERO(&fdw);
101	FD_SET(fp->fd, & fdr); FD_SET(fp->fd, & fdw);
102	@@ -1504,12 +1527,16 @@ get_encaps_name(code)
103	{
104	case NESSUS_ENCAPS_IP:
105	return "IP";
106	+#ifndef OPENSSL_NO_SSL2
107	case NESSUS_ENCAPS_SSLv2:
108	return "SSLv2";
109	+#endif
110	case NESSUS_ENCAPS_SSLv23:
111	return "SSLv23";
112	+#ifndef OPENSSL_NO_SSL3
113	case NESSUS_ENCAPS_SSLv3:
114	return "SSLv3";
115	+#endif
116	case NESSUS_ENCAPS_TLSv1:
117	return "TLSv1";
118	default:
119	@@ -1527,9 +1554,13 @@ get_encaps_through(code)
120	{
121	case NESSUS_ENCAPS_IP:
122	return "";
123	+#ifndef OPENSSL_NO_SSL2
124	case NESSUS_ENCAPS_SSLv2:
125	+#endif
126	case NESSUS_ENCAPS_SSLv23:
127	+#ifndef OPENSSL_NO_SSL3
128	case NESSUS_ENCAPS_SSLv3:
129	+#endif
130	case NESSUS_ENCAPS_TLSv1:
131	return " through SSL";
132	default: