diff --git a/VERSION b/VERSION index 975c69384..e572934a6 100644 --- a/VERSION +++ b/VERSION @@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0 # build number is like "nano" version number. I am incrementing build # number during development cycle # -BUILD_NUM="3525" +BUILD_NUM="3526" VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM" diff --git a/VERSION.h b/VERSION.h index c17286308..86f2d27cd 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1,2 @@ -#define VERSION "4.2.0.3525" +#define VERSION "4.2.0.3526" #define GENERATION "4.2" diff --git a/doc/ChangeLog b/doc/ChangeLog index d3c396ff1..b540960cb 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2011-04-14 vadim + + * PolicyCompiler_pix.cpp (printClearCommands): see #2322 If this + is FWSM and if manual commit mode is used, need to commit after + clearing ACLs before we clear object groups. + 2011-04-13 Vadim Kurland * IPTImporter.cpp (pushPolicyRule): see #2338 "Empty Mangle Policy diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec index 143a73daf..8dd777aaf 100644 --- a/packaging/fwbuilder-static-qt.spec +++ b/packaging/fwbuilder-static-qt.spec @@ -3,7 +3,7 @@ %define name fwbuilder -%define version 4.2.0.3525 +%define version 4.2.0.3526 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control index c50c70f64..68ffdf007 100644 --- a/packaging/fwbuilder.control +++ b/packaging/fwbuilder.control @@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu Priority: extra Section: checkinstall Maintainer: vadim@fwbuilder.org -Version: 4.2.0.3525-1 +Version: 4.2.0.3526-1 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15 Description: Firewall Builder GUI and policy compilers diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec index fa2bb29bd..d2ba82a45 100644 --- a/packaging/fwbuilder.spec +++ b/packaging/fwbuilder.spec @@ -1,6 +1,6 @@ %define name fwbuilder -%define version 4.2.0.3525 +%define version 4.2.0.3526 %define release 1 %if "%_vendor" == "MandrakeSoft" diff --git a/src/cisco_lib/PolicyCompiler_pix.cpp b/src/cisco_lib/PolicyCompiler_pix.cpp index b93d2c764..7f0a5d93f 100644 --- a/src/cisco_lib/PolicyCompiler_pix.cpp +++ b/src/cisco_lib/PolicyCompiler_pix.cpp @@ -157,6 +157,13 @@ int PolicyCompiler_pix::prolog() output << endl; output << clearACLcmd << " " << temp_acl << endl; + + if (fw->getStr("platform")=="fwsm" && + fw->getOptionsObject()->getBool("pix_use_manual_commit") ) + { + output << "access-list commit" << endl; + } + output << "access-list " << temp_acl << " permit ip " << addr << " " << netmask @@ -733,15 +740,19 @@ string PolicyCompiler_pix::printClearCommands() string vers = fw->getStr("version"); string platform = fw->getStr("platform"); + string clearACLcmd = Resources::platform_res[platform]->getResourceStr( string("/FWBuilderResources/Target/options/") + "version_" + vers + "/pix_commands/clear_acl"); + // string clearOGcmd = Resources::platform_res[platform]->getResourceStr( // string("/FWBuilderResources/Target/options/") + // "version_" + vers + "/pix_commands/clear_og"); + string clearICMPcmd = Resources::platform_res[platform]->getResourceStr( string("/FWBuilderResources/Target/options/") + "version_" + vers + "/pix_commands/clear_icmp"); + string clearTelnetcmd = Resources::platform_res[platform]->getResourceStr( string("/FWBuilderResources/Target/options/") + "version_" + vers + "/pix_commands/clear_telnet"); @@ -769,6 +780,16 @@ string PolicyCompiler_pix::printClearCommands() output << clearTelnetcmd << endl; } + // see #2322 If this is FWSM and if manual commit mode is used, we + // need to commit after clearing ACLs before we clear object groups + + if (fw->getStr("platform")=="fwsm" && + fw->getOptionsObject()->getBool("pix_use_manual_commit") ) + { + output << "access-list commit" << endl; + } + + return output.str(); } diff --git a/test/pix/cluster1-1_pix1.fw.orig b/test/pix/cluster1-1_pix1.fw.orig index 7b88eacaf..04c6085c6 100755 --- a/test/pix/cluster1-1_pix1.fw.orig +++ b/test/pix/cluster1-1_pix1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:51 2011 PDT by vadim +! Generated Thu Apr 14 11:41:23 2011 PDT 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 29771b2b0..a38073d57 100755 --- a/test/pix/cluster1-1_pix2.fw.orig +++ b/test/pix/cluster1-1_pix2.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:51 2011 PDT by vadim +! Generated Thu Apr 14 11:41:23 2011 PDT 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 2eb54ec2e..2c4c21614 100755 --- a/test/pix/cluster1_pix1.fw.orig +++ b/test/pix/cluster1_pix1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:50 2011 PDT by vadim +! Generated Thu Apr 14 11:41:23 2011 PDT 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 0a3e51403..3e57e55f4 100755 --- a/test/pix/cluster1_pix2.fw.orig +++ b/test/pix/cluster1_pix2.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:50 2011 PDT by vadim +! Generated Thu Apr 14 11:41:23 2011 PDT by vadim ! ! Compiled for pix 7.0 ! Outbound ACLs: supported diff --git a/test/pix/firewall.fw.orig b/test/pix/firewall.fw.orig index 93545ec1f..bc6b2a917 100755 --- a/test/pix/firewall.fw.orig +++ b/test/pix/firewall.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:31 2011 PDT by vadim +! Generated Thu Apr 14 11:41:11 2011 PDT 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 400091182..6865453cd 100755 --- a/test/pix/firewall1.fw.orig +++ b/test/pix/firewall1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:31 2011 PDT by vadim +! Generated Thu Apr 14 11:41:10 2011 PDT 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 485d8bb72..afa5c178c 100755 --- a/test/pix/firewall10.fw.orig +++ b/test/pix/firewall10.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:32 2011 PDT by vadim +! Generated Thu Apr 14 11:41:11 2011 PDT 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 9fc21eb4f..ebf629591 100755 --- a/test/pix/firewall11.fw.orig +++ b/test/pix/firewall11.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:32 2011 PDT by vadim +! Generated Thu Apr 14 11:41:11 2011 PDT 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 aa92c047f..66138fd8b 100755 --- a/test/pix/firewall12.fw.orig +++ b/test/pix/firewall12.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:33 2011 PDT by vadim +! Generated Thu Apr 14 11:41:12 2011 PDT 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 8640fd7ee..85755a794 100755 --- a/test/pix/firewall13.fw.orig +++ b/test/pix/firewall13.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:33 2011 PDT by vadim +! Generated Thu Apr 14 11:41:12 2011 PDT 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 737e818f6..9e688df32 100755 --- a/test/pix/firewall14.fw.orig +++ b/test/pix/firewall14.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:34 2011 PDT by vadim +! Generated Thu Apr 14 11:41:13 2011 PDT 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 25f4a3d3e..661979a82 100755 --- a/test/pix/firewall2.fw.orig +++ b/test/pix/firewall2.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:34 2011 PDT by vadim +! Generated Thu Apr 14 11:41:13 2011 PDT 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 a58ee5a52..c9e87eaa7 100755 --- a/test/pix/firewall20.fw.orig +++ b/test/pix/firewall20.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:35 2011 PDT by vadim +! Generated Thu Apr 14 11:41:13 2011 PDT 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 a8a844b1d..2714ab1f2 100755 --- a/test/pix/firewall21-1.fw.orig +++ b/test/pix/firewall21-1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:36 2011 PDT by vadim +! Generated Thu Apr 14 11:41:14 2011 PDT 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 eac8c16f1..6d7dbe2c5 100755 --- a/test/pix/firewall21.fw.orig +++ b/test/pix/firewall21.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:35 2011 PDT by vadim +! Generated Thu Apr 14 11:41:13 2011 PDT 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 b872de112..f03c25d3a 100755 --- a/test/pix/firewall22.fw.orig +++ b/test/pix/firewall22.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:36 2011 PDT by vadim +! Generated Thu Apr 14 11:41:14 2011 PDT 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 1891a6ac7..3b1c88590 100755 --- a/test/pix/firewall23.fw.orig +++ b/test/pix/firewall23.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:37 2011 PDT by vadim +! Generated Thu Apr 14 11:41:14 2011 PDT 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 c03e1ffbe..a67e4572a 100755 --- a/test/pix/firewall3.fw.orig +++ b/test/pix/firewall3.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:37 2011 PDT by vadim +! Generated Thu Apr 14 11:41:15 2011 PDT 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 446f7d153..c789d5bad 100755 --- a/test/pix/firewall33.fw.orig +++ b/test/pix/firewall33.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:38 2011 PDT by vadim +! Generated Thu Apr 14 11:41:15 2011 PDT by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall34.fw.orig b/test/pix/firewall34.fw.orig index 5ff887430..dd5bbe087 100755 --- a/test/pix/firewall34.fw.orig +++ b/test/pix/firewall34.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:38 2011 PDT by vadim +! Generated Thu Apr 14 11:41:15 2011 PDT by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/firewall4.fw.orig b/test/pix/firewall4.fw.orig index aa4c94ba7..84398d11c 100755 --- a/test/pix/firewall4.fw.orig +++ b/test/pix/firewall4.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:39 2011 PDT by vadim +! Generated Thu Apr 14 11:41:16 2011 PDT 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 d5564376f..c6c806903 100755 --- a/test/pix/firewall50.fw.orig +++ b/test/pix/firewall50.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:40 2011 PDT by vadim +! Generated Thu Apr 14 11:41:16 2011 PDT 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 ddcc7a817..3af1a2c2d 100755 --- a/test/pix/firewall6.fw.orig +++ b/test/pix/firewall6.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:40 2011 PDT by vadim +! Generated Thu Apr 14 11:41:16 2011 PDT 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 952e319f3..c632f29a5 100755 --- a/test/pix/firewall8.fw.orig +++ b/test/pix/firewall8.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:41 2011 PDT by vadim +! Generated Thu Apr 14 11:41:17 2011 PDT 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 9bd538a67..94a9caffd 100755 --- a/test/pix/firewall80.fw.orig +++ b/test/pix/firewall80.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:42 2011 PDT by vadim +! Generated Thu Apr 14 11:41:17 2011 PDT 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 d49067a86..62d12b366 100755 --- a/test/pix/firewall81.fw.orig +++ b/test/pix/firewall81.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:42 2011 PDT by vadim +! Generated Thu Apr 14 11:41:18 2011 PDT 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 86c8826d3..c0e260e83 100755 --- a/test/pix/firewall82.fw.orig +++ b/test/pix/firewall82.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:43 2011 PDT by vadim +! Generated Thu Apr 14 11:41:18 2011 PDT 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 1a9bc911e..0569ec59c 100755 --- a/test/pix/firewall83.fw.orig +++ b/test/pix/firewall83.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:43 2011 PDT by vadim +! Generated Thu Apr 14 11:41:18 2011 PDT 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 af2416b87..53afc13ab 100755 --- a/test/pix/firewall9.fw.orig +++ b/test/pix/firewall9.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:44 2011 PDT by vadim +! Generated Thu Apr 14 11:41:19 2011 PDT 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 1740d12cf..c2709ff11 100755 --- a/test/pix/firewall90.fw.orig +++ b/test/pix/firewall90.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:44 2011 PDT by vadim +! Generated Thu Apr 14 11:41:19 2011 PDT 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 02b6fdb19..4fdc46526 100755 --- a/test/pix/firewall91.fw.orig +++ b/test/pix/firewall91.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:44 2011 PDT by vadim +! Generated Thu Apr 14 11:41:19 2011 PDT 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 df8028268..db0688065 100755 --- a/test/pix/firewall92.fw.orig +++ b/test/pix/firewall92.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:45 2011 PDT by vadim +! Generated Thu Apr 14 11:41:19 2011 PDT 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 6aa148741..fd91184bd 100755 --- a/test/pix/firewall93.fw.orig +++ b/test/pix/firewall93.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:45 2011 PDT by vadim +! Generated Thu Apr 14 11:41:20 2011 PDT 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 1e5cc1b03..cdcf322b2 100755 --- a/test/pix/firewall94.fw.orig +++ b/test/pix/firewall94.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:46 2011 PDT by vadim +! Generated Thu Apr 14 11:41:20 2011 PDT 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 119e72d78..fb0096e42 100755 --- a/test/pix/fwsm1.fw.orig +++ b/test/pix/fwsm1.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:47 2011 PDT by vadim +! Generated Thu Apr 14 11:41:21 2011 PDT 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 d578b4c90..113c7e91b 100755 --- a/test/pix/fwsm2.fw.orig +++ b/test/pix/fwsm2.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:47 2011 PDT by vadim +! Generated Thu Apr 14 11:41:21 2011 PDT by vadim ! ! Compiled for fwsm 4.x ! Outbound ACLs: supported diff --git a/test/pix/fwsm3.fw.orig b/test/pix/fwsm3.fw.orig new file mode 100755 index 000000000..24b58e2a4 --- /dev/null +++ b/test/pix/fwsm3.fw.orig @@ -0,0 +1,183 @@ +! +! This is automatically generated file. DO NOT MODIFY ! +! +! Firewall Builder fwb_pix v4.2.0.3526 +! +! Generated Thu Apr 14 11:46:21 2011 PDT by vadim +! +! Compiled for fwsm 4.x +! Outbound ACLs: supported +! Emulate outbound ACLs: yes +! Generating outbound ACLs: no +! Assume firewall is part of any: yes +! +!# files: * fwsm3.fw +! +! using manual commit mode + + + +! +! Prolog script: +! + +! +! End of prolog script: +! + + + + +hostname fwsm3 + +interface ethernet1 + nameif outside + security-level 0 +exit + +interface ethernet0 + nameif inside + security-level 100 +exit + +interface ethernet2 + nameif dmz + security-level 50 +exit + + + +logging host inside 192.168.1.30 +logging queue 512 +logging facility 16 +logging trap 0 +no logging buffered +no logging console +no logging timestamp +logging on + + +timeout xlate 3:0:0 +timeout conn 1:0:0 +timeout udp 0:2:0 +timeout sunrpc 0:10:0 +timeout h323 0:5:0 +timeout sip 0:30:0 +timeout sip_media 0:0:0 +timeout half-closed 0:0:0 +timeout uauth 2:0:0 absolute + +telnet timeout 5 + +clear config ssh +aaa authentication ssh console LOCAL +ssh timeout 5 + +clear config snmp-server +snmp-server community public +snmp-server enable traps +snmp-server host inside 192.168.1.20 poll +snmp-server host inside 192.168.1.22 trap + + + + +no service resetinbound +sysopt connection tcpmss 1380 +sysopt nodnsalias inbound +sysopt nodnsalias outbound + + +class-map inspection_default + match default-inspection-traffic + +policy-map global_policy + class inspection_default + inspect ftp + inspect h323 h225 + inspect h323 ras + inspect http + inspect ils + inspect rsh + inspect rtsp + inspect sip + inspect skinny + inspect esmtp + inspect sqlnet + +service-policy global_policy global + + + +clear xlate +clear config static +clear config global +clear config nat +clear config access-list dmz_acl_in +clear config access-list inside_acl_in +clear config access-list outside_acl_in +clear config icmp +clear config telnet +access-list commit +clear config object-group + + +object-group network id59803X13930.src.net.0 + network-object 10.0.0.0 255.255.255.0 + network-object 10.1.0.0 255.255.255.0 + network-object 172.16.0.1 255.255.255.255 + network-object 172.16.0.2 255.255.255.255 +exit + +!################ +access-list mode manual + +clear config access-list tmp_acl +access-list commit +access-list tmp_acl permit ip 192.168.1.0 255.255.255.0 any +access-list tmp_acl deny ip any any +access-list commit + +access-group tmp_acl in interface outside +access-group tmp_acl in interface inside + +! +! Rule 1 (ethernet1) +! need this rule to generate at least one object group +icmp permit 10.0.0.0 255.255.255.0 3 outside +access-list outside_acl_in permit icmp 10.0.0.0 255.255.255.0 host 22.22.22.22 3 +icmp permit 10.1.0.0 255.255.255.0 3 outside +access-list outside_acl_in permit icmp 10.1.0.0 255.255.255.0 host 22.22.22.22 3 +icmp permit host 172.16.0.1 3 outside +access-list outside_acl_in permit icmp host 172.16.0.1 host 22.22.22.22 3 +icmp permit host 172.16.0.2 3 outside +access-list outside_acl_in permit icmp host 172.16.0.2 host 22.22.22.22 3 +access-list outside_acl_in permit icmp object-group id59803X13930.src.net.0 any 3 +! +! Rule 2 (global) +access-list outside_acl_in deny ip any any log 0 interval 300 +access-list inside_acl_in deny ip any any log 0 interval 300 +access-list dmz_acl_in deny ip any any log 0 interval 300 + + +access-list commit + +access-group dmz_acl_in in interface dmz +access-group inside_acl_in in interface inside +access-group outside_acl_in in interface outside + +! +! Rule 0 (NAT) +global (outside) 1 interface +nat (inside) 1 192.168.1.0 255.255.255.0 0 0 +global (dmz) 1 interface +! + + + +! +! Epilog script: +! + +! End of epilog script: +! diff --git a/test/pix/objects-for-regression-tests.fwb b/test/pix/objects-for-regression-tests.fwb index 19e37f777..ec2effa36 100644 --- a/test/pix/objects-for-regression-tests.fwb +++ b/test/pix/objects-for-regression-tests.fwb @@ -1,6 +1,6 @@ - + @@ -16227,7 +16227,7 @@ no sysopt nodnsalias outbound - + @@ -22268,6 +22268,346 @@ no sysopt nodnsalias outbound + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/pix/pix515.fw.orig b/test/pix/pix515.fw.orig index 189db3b2c..afd1dd788 100755 --- a/test/pix/pix515.fw.orig +++ b/test/pix/pix515.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:48 2011 PDT by vadim +! Generated Thu Apr 14 11:41:22 2011 PDT 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 406bd0041..5f83e017d 100755 --- a/test/pix/real.fw.orig +++ b/test/pix/real.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:48 2011 PDT by vadim +! Generated Thu Apr 14 11:41:22 2011 PDT by vadim ! ! Compiled for pix 6.3 ! Outbound ACLs: not supported diff --git a/test/pix/test_net_zone_2.fw.orig b/test/pix/test_net_zone_2.fw.orig index aa3e40e9a..dda96c6f9 100755 --- a/test/pix/test_net_zone_2.fw.orig +++ b/test/pix/test_net_zone_2.fw.orig @@ -1,9 +1,9 @@ ! ! This is automatically generated file. DO NOT MODIFY ! ! -! Firewall Builder fwb_pix v4.2.0.3525 +! Firewall Builder fwb_pix v4.2.0.3526 ! -! Generated Wed Apr 13 17:15:49 2011 PDT by vadim +! Generated Thu Apr 14 11:41:23 2011 PDT by vadim ! ! Compiled for pix 6.1 ! Outbound ACLs: not supported