From fcd7c7920b0754a15d4c6a623f75028dc49565a2 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sat, 12 Mar 2011 15:13:57 -0800 Subject: [PATCH] re-ran tests for pix --- test/pf/pf_cluster_4_rc.conf.local | 2 +- test/pix/cluster1-1_pix1.fw.orig | 8 +--- test/pix/cluster1-1_pix2.fw.orig | 8 +--- test/pix/cluster1_pix1.fw.orig | 8 +--- test/pix/cluster1_pix2.fw.orig | 40 ++++++++---------- test/pix/firewall.fw.orig | 8 +--- test/pix/firewall1.fw.orig | 8 +--- test/pix/firewall10.fw.orig | 8 +--- test/pix/firewall11.fw.orig | 8 +--- test/pix/firewall12.fw.orig | 8 +--- test/pix/firewall13.fw.orig | 8 +--- test/pix/firewall14.fw.orig | 8 +--- test/pix/firewall2.fw.orig | 8 +--- test/pix/firewall20.fw.orig | 8 +--- test/pix/firewall21-1.fw.orig | 8 +--- test/pix/firewall21.fw.orig | 8 +--- test/pix/firewall22.fw.orig | 8 +--- test/pix/firewall23.fw.orig | 8 +--- test/pix/firewall3.fw.orig | 8 +--- test/pix/firewall33.fw.orig | 16 +------- test/pix/firewall34.fw.orig | 65 ++++++++++++++++++++++++++---- test/pix/firewall4.fw.orig | 8 +--- test/pix/firewall50.fw.orig | 8 +--- test/pix/firewall6.fw.orig | 8 +--- test/pix/firewall8.fw.orig | 8 +--- test/pix/firewall80.fw.orig | 8 +--- test/pix/firewall81.fw.orig | 8 +--- test/pix/firewall82.fw.orig | 8 +--- test/pix/firewall83.fw.orig | 8 +--- test/pix/firewall9.fw.orig | 8 +--- test/pix/firewall90.fw.orig | 8 +--- test/pix/firewall91.fw.orig | 8 +--- test/pix/firewall92.fw.orig | 8 +--- test/pix/firewall93.fw.orig | 8 +--- test/pix/firewall94.fw.orig | 8 +--- test/pix/fwsm1.fw.orig | 8 +--- test/pix/fwsm2.fw.orig | 8 +--- test/pix/pix515.fw.orig | 8 +--- test/pix/real.fw.orig | 8 +--- 39 files changed, 111 insertions(+), 292 deletions(-) diff --git a/test/pf/pf_cluster_4_rc.conf.local b/test/pf/pf_cluster_4_rc.conf.local index 0df521df5..85efa6283 100755 --- a/test/pf/pf_cluster_4_rc.conf.local +++ b/test/pf/pf_cluster_4_rc.conf.local @@ -3,7 +3,7 @@ # # Firewall Builder fwb_pf v4.2.0.3499 # -# Generated Fri Mar 11 10:33:03 2011 PST by vadim +# Generated Sat Mar 12 14:53:32 2011 PST by vadim # # files: * pf_cluster_4_rc.conf.local /etc/pf_cluster_4_rc.conf.local # files: pf_cluster_4_pf.conf /etc/pf_cluster_4_pf.conf diff --git a/test/pix/cluster1-1_pix1.fw.orig b/test/pix/cluster1-1_pix1.fw.orig index 899e0d516..a4e86b928 100755 --- a/test/pix/cluster1-1_pix1.fw.orig +++ b/test/pix/cluster1-1_pix1.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:28 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:05 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:50 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/cluster1-1_pix2.fw.orig b/test/pix/cluster1-1_pix2.fw.orig index 8f781b880..acea4d65a 100755 --- a/test/pix/cluster1-1_pix2.fw.orig +++ b/test/pix/cluster1-1_pix2.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:28 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:05 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:50 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/cluster1_pix1.fw.orig b/test/pix/cluster1_pix1.fw.orig index 1dc36bee6..fca56d818 100755 --- a/test/pix/cluster1_pix1.fw.orig +++ b/test/pix/cluster1_pix1.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:27 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:04 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:50 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/cluster1_pix2.fw.orig b/test/pix/cluster1_pix2.fw.orig index 67e73d51a..678b6f9cb 100755 --- a/test/pix/cluster1_pix2.fw.orig +++ b/test/pix/cluster1_pix2.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:28 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:05 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:50 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported @@ -191,44 +185,44 @@ access-list inside_out permit udp object-group id2913X78273.src.net.1 10.3.14.0 access-list inside_out permit udp object-group id2913X78273.src.net.2 10.3.14.0 255.255.255.0 eq 53 log 3 interval 300 ! ! Rule 5 (Ethernet0.101,Ethernet0.102) -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside ! ! Rule 6 (cl1 itf) -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside -ssh 0.0.0.0 0.0.0.0 outside ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 ssh 0.0.0.0 0.0.0.0 dmz20 +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside +ssh 0.0.0.0 0.0.0.0 outside ! ! Rule 7 (Ethernet0.101,Ethernet0.102) -access-list outside_in permit udp any 10.3.14.0 255.255.255.0 eq 53 -access-list outside_out permit udp any 10.3.14.0 255.255.255.0 eq 53 access-list dmz20_in permit udp any 10.3.14.0 255.255.255.0 eq 53 access-list dmz20_out permit udp any 10.3.14.0 255.255.255.0 eq 53 +access-list outside_in permit udp any 10.3.14.0 255.255.255.0 eq 53 +access-list outside_out permit udp any 10.3.14.0 255.255.255.0 eq 53 ! ! Rule 8 (cl1 itf) -access-list outside_in permit udp any 10.3.14.0 255.255.255.0 eq 53 -access-list outside_out permit udp any 10.3.14.0 255.255.255.0 eq 53 access-list dmz20_in permit udp any 10.3.14.0 255.255.255.0 eq 53 access-list dmz20_out permit udp any 10.3.14.0 255.255.255.0 eq 53 +access-list outside_in permit udp any 10.3.14.0 255.255.255.0 eq 53 +access-list outside_out permit udp any 10.3.14.0 255.255.255.0 eq 53 ! ! Rule 9 (global) ! All other attempts to connect to diff --git a/test/pix/firewall.fw.orig b/test/pix/firewall.fw.orig index 931aab6ec..e5c084557 100755 --- a/test/pix/firewall.fw.orig +++ b/test/pix/firewall.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:11 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:46 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:38 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall1.fw.orig b/test/pix/firewall1.fw.orig index 7972b595c..a285d350c 100755 --- a/test/pix/firewall1.fw.orig +++ b/test/pix/firewall1.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:11 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:46 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:37 2011 PST by vadim ! ! Compiled for pix 6.1 ! Outbound ACLs: not supported diff --git a/test/pix/firewall10.fw.orig b/test/pix/firewall10.fw.orig index 41e3e678f..5784f2a1e 100755 --- a/test/pix/firewall10.fw.orig +++ b/test/pix/firewall10.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:12 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:47 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:38 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall11.fw.orig b/test/pix/firewall11.fw.orig index 0460bc713..ea4db80ae 100755 --- a/test/pix/firewall11.fw.orig +++ b/test/pix/firewall11.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:12 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:47 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:38 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall12.fw.orig b/test/pix/firewall12.fw.orig index 44af49302..564062d8c 100755 --- a/test/pix/firewall12.fw.orig +++ b/test/pix/firewall12.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:13 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:48 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:39 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall13.fw.orig b/test/pix/firewall13.fw.orig index 088dc9846..95021a54f 100755 --- a/test/pix/firewall13.fw.orig +++ b/test/pix/firewall13.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:13 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:48 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:39 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall14.fw.orig b/test/pix/firewall14.fw.orig index b2e5db87d..920163f9f 100755 --- a/test/pix/firewall14.fw.orig +++ b/test/pix/firewall14.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:14 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:49 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:39 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall2.fw.orig b/test/pix/firewall2.fw.orig index dbd687a24..832bc1215 100755 --- a/test/pix/firewall2.fw.orig +++ b/test/pix/firewall2.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:14 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:50 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:40 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall20.fw.orig b/test/pix/firewall20.fw.orig index 81fff136a..7e866a15e 100755 --- a/test/pix/firewall20.fw.orig +++ b/test/pix/firewall20.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:15 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:50 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:40 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall21-1.fw.orig b/test/pix/firewall21-1.fw.orig index df58e83d2..9423cd3ea 100755 --- a/test/pix/firewall21-1.fw.orig +++ b/test/pix/firewall21-1.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:15 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:51 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:41 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall21.fw.orig b/test/pix/firewall21.fw.orig index d4a58d52d..1e69edc53 100755 --- a/test/pix/firewall21.fw.orig +++ b/test/pix/firewall21.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:15 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:51 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:40 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/firewall22.fw.orig b/test/pix/firewall22.fw.orig index db8738955..201e82424 100755 --- a/test/pix/firewall22.fw.orig +++ b/test/pix/firewall22.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:16 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:52 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:41 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/firewall23.fw.orig b/test/pix/firewall23.fw.orig index 6ff224d47..a80fd022a 100755 --- a/test/pix/firewall23.fw.orig +++ b/test/pix/firewall23.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:16 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:52 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:41 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall3.fw.orig b/test/pix/firewall3.fw.orig index be2b37220..95c48fea2 100755 --- a/test/pix/firewall3.fw.orig +++ b/test/pix/firewall3.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:17 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:53 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:41 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall33.fw.orig b/test/pix/firewall33.fw.orig index c2741d173..4a8d95d36 100755 --- a/test/pix/firewall33.fw.orig +++ b/test/pix/firewall33.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:18 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:53 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:42 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported @@ -92,19 +86,11 @@ object-group network id43867C2418346.src.net.0 exit object-group network id438728A918346.dst.net.0 -<<<<<<< HEAD - network-object host 74.125.224.16 - network-object host 74.125.224.17 - network-object host 74.125.224.18 - network-object host 74.125.224.19 - network-object host 74.125.224.20 -======= network-object host 74.125.224.48 network-object host 74.125.224.49 network-object host 74.125.224.50 network-object host 74.125.224.51 network-object host 74.125.224.52 ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 network-object host 157.166.224.25 network-object host 157.166.224.26 network-object host 157.166.226.25 diff --git a/test/pix/firewall34.fw.orig b/test/pix/firewall34.fw.orig index 1530817a0..d275cbd18 100755 --- a/test/pix/firewall34.fw.orig +++ b/test/pix/firewall34.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:18 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:54 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:42 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported @@ -80,6 +74,61 @@ object-group network id16988X10208.dst.net.0 exit object-group network id4390C25825682.dst.net.0 + network-object 58.33.181.83 255.255.255.255 + network-object 58.53.82.190 255.255.255.255 + network-object 58.231.13.78 255.255.255.255 + network-object host 61.150.47.112 + network-object 61.184.14.102 255.255.255.255 + network-object 64.106.85.186 255.255.255.255 + network-object 70.228.60.100 255.255.255.255 + network-object 80.51.236.6 255.255.255.255 + network-object 80.243.72.149 255.255.255.255 + network-object 80.249.77.34 255.255.255.255 + network-object 81.2.36.254 255.255.255.255 + network-object 81.196.74.125 255.255.255.255 + network-object 82.77.37.174 255.255.255.255 + network-object 82.117.221.205 255.255.255.255 + network-object 82.143.196.17 255.255.255.255 + network-object 84.90.8.198 255.255.255.255 + network-object 151.8.224.178 255.255.255.255 + network-object 168.156.76.20 255.255.255.255 + network-object 193.207.126.36 255.255.255.255 + network-object 195.136.186.35 255.255.255.255 + network-object 196.15.136.15 255.255.255.255 + network-object 201.10.180.138 255.255.255.255 + network-object 201.17.93.16 255.255.255.255 + network-object 201.36.156.121 255.255.255.255 + network-object 202.96.112.93 255.255.255.255 + network-object 202.103.25.253 255.255.255.255 + network-object 203.162.3.209 255.255.255.255 + network-object 203.209.124.144 255.255.255.255 + network-object 210.106.193.237 255.255.255.255 + network-object 210.222.114.102 255.255.255.255 + network-object 211.144.143.143 255.255.255.255 + network-object 211.172.218.237 255.255.255.255 + network-object 211.250.16.132 255.255.255.255 + network-object 212.21.241.31 255.255.255.255 + network-object 212.100.212.100 255.255.255.255 + network-object 218.18.72.252 255.255.255.255 + network-object 218.39.114.122 255.255.255.255 + network-object 218.55.115.43 255.255.255.255 + network-object 218.104.138.146 255.255.255.255 + network-object 219.132.104.160 255.255.255.255 + network-object 220.71.17.86 255.255.255.255 + network-object 220.81.50.105 255.255.255.255 + network-object 220.91.99.46 255.255.255.255 + network-object 221.14.249.242 255.255.255.255 + network-object 221.166.177.135 255.255.255.255 + network-object 221.198.33.38 255.255.255.255 + network-object 221.202.160.233 255.255.255.255 + network-object 221.205.54.125 255.255.255.255 + network-object 221.217.44.248 255.255.255.255 + network-object 222.100.212.223 255.255.255.255 + network-object 222.121.118.144 255.255.255.255 + network-object 222.174.113.2 255.255.255.255 +exit + +object-group network id4388CFF8674.src.net.0 network-object 58.33.181.83 255.255.255.255 network-object 58.53.82.190 255.255.255.255 network-object 58.231.13.78 255.255.255.255 @@ -165,7 +214,7 @@ access-list outside_acl_in deny tcp any object-group id4390C25825682.dst.net.0 access-list inside_acl_in deny tcp any object-group id4390C25825682.dst.net.0 eq 25 ! ! Rule 5 (global) -access-list outside_acl_in deny ip object-group id4390C25825682.dst.net.0 any log 6 interval 300 +access-list outside_acl_in deny ip object-group id4388CFF8674.src.net.0 any log 6 interval 300 ! ! Rule 6 (global) access-list outside_acl_in deny ip object-group id4390C25825682.dst.net.0 any log 6 interval 300 diff --git a/test/pix/firewall4.fw.orig b/test/pix/firewall4.fw.orig index c18e73fcd..1d14ec18a 100755 --- a/test/pix/firewall4.fw.orig +++ b/test/pix/firewall4.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:19 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:54 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:42 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall50.fw.orig b/test/pix/firewall50.fw.orig index f4f473dd5..69b871ac2 100755 --- a/test/pix/firewall50.fw.orig +++ b/test/pix/firewall50.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:19 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:55 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:43 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/firewall6.fw.orig b/test/pix/firewall6.fw.orig index 40ce9a994..cbbb5945d 100755 --- a/test/pix/firewall6.fw.orig +++ b/test/pix/firewall6.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:19 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:55 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:43 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall8.fw.orig b/test/pix/firewall8.fw.orig index 52ea64889..9cb50fb0c 100755 --- a/test/pix/firewall8.fw.orig +++ b/test/pix/firewall8.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:20 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:56 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:44 2011 PST by vadim ! ! Compiled for pix 6.2 ! Outbound ACLs: not supported diff --git a/test/pix/firewall80.fw.orig b/test/pix/firewall80.fw.orig index 701c63c1a..fc314ed45 100755 --- a/test/pix/firewall80.fw.orig +++ b/test/pix/firewall80.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:20 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:56 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:44 2011 PST by vadim ! ! Compiled for pix 8.2 ! Outbound ACLs: supported diff --git a/test/pix/firewall81.fw.orig b/test/pix/firewall81.fw.orig index 8ad5d3557..ee1176fc5 100755 --- a/test/pix/firewall81.fw.orig +++ b/test/pix/firewall81.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:21 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:57 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:44 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall82.fw.orig b/test/pix/firewall82.fw.orig index 262df6c70..699901ee0 100755 --- a/test/pix/firewall82.fw.orig +++ b/test/pix/firewall82.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:21 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:57 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:45 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall83.fw.orig b/test/pix/firewall83.fw.orig index 2aa793a22..8f095c668 100755 --- a/test/pix/firewall83.fw.orig +++ b/test/pix/firewall83.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:22 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:58 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:45 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall9.fw.orig b/test/pix/firewall9.fw.orig index 90515923b..50b0a94a9 100755 --- a/test/pix/firewall9.fw.orig +++ b/test/pix/firewall9.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:22 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:58 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:45 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall90.fw.orig b/test/pix/firewall90.fw.orig index 8ad4db591..b9f79cc3f 100755 --- a/test/pix/firewall90.fw.orig +++ b/test/pix/firewall90.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:23 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:59 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:46 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall91.fw.orig b/test/pix/firewall91.fw.orig index 509f9358d..ef21e5b30 100755 --- a/test/pix/firewall91.fw.orig +++ b/test/pix/firewall91.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:23 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:16:59 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:46 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall92.fw.orig b/test/pix/firewall92.fw.orig index 3005eed9d..c744b4b0b 100755 --- a/test/pix/firewall92.fw.orig +++ b/test/pix/firewall92.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:24 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:00 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:46 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall93.fw.orig b/test/pix/firewall93.fw.orig index 0f4978398..139158d5d 100755 --- a/test/pix/firewall93.fw.orig +++ b/test/pix/firewall93.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:24 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:00 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:47 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/firewall94.fw.orig b/test/pix/firewall94.fw.orig index e744e0cdd..aac4fb185 100755 --- a/test/pix/firewall94.fw.orig +++ b/test/pix/firewall94.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:24 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:01 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:47 2011 PST by vadim ! ! Compiled for pix 8.3 ! Outbound ACLs: supported diff --git a/test/pix/fwsm1.fw.orig b/test/pix/fwsm1.fw.orig index 729d03c72..35906f799 100755 --- a/test/pix/fwsm1.fw.orig +++ b/test/pix/fwsm1.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:25 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:02 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:47 2011 PST by vadim ! ! Compiled for fwsm 2.3 ! Outbound ACLs: supported diff --git a/test/pix/fwsm2.fw.orig b/test/pix/fwsm2.fw.orig index 8b062ceed..fb9d3b5f1 100755 --- a/test/pix/fwsm2.fw.orig +++ b/test/pix/fwsm2.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:26 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:02 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:48 2011 PST by vadim ! ! Compiled for fwsm 4.x ! Outbound ACLs: supported diff --git a/test/pix/pix515.fw.orig b/test/pix/pix515.fw.orig index 2122e3b27..552516e0a 100755 --- a/test/pix/pix515.fw.orig +++ b/test/pix/pix515.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:26 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:03 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:48 2011 PST by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/real.fw.orig b/test/pix/real.fw.orig index 511807c62..c01c05a76 100755 --- a/test/pix/real.fw.orig +++ b/test/pix/real.fw.orig @@ -1,15 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -<<<<<<< HEAD -! Firewall Builder fwb_pix v4.2.0.3496 -! -! Generated Sat Mar 12 14:44:27 2011 PST by vadim -======= ! Firewall Builder fwb_pix v4.2.0.3499 ! -! Generated Fri Mar 11 12:17:03 2011 PST by vadim ->>>>>>> cb7662fdaed92246c0956ec9ac25bd37d755f271 +! Generated Sat Mar 12 15:05:49 2011 PST by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported