bug fix to include multi-gpg ID no password test

This commit is contained in:
Michael Rash 2012-11-03 23:11:24 -04:00
parent df2bb3e3fd
commit 231be81f5b
3 changed files with 10 additions and 1 deletions

View File

@ -137,6 +137,7 @@ EXTRA_DIST = \
test/conf/mismatch_open_ports_access.conf \
test/conf/mismatch_user_access.conf \
test/conf/multi_gpg_access.conf \
test/conf/multi_gpg_no_pw_access.conf \
test/conf/multi_source_match_access.conf \
test/conf/multi_stanzas_access.conf \
test/conf/multi_stanzas_with_broken_keys.conf \

View File

@ -0,0 +1,7 @@
SOURCE: ANY;
KEY: fwknoptest;
FW_ACCESS_TIMEOUT: 3;
GPG_HOME_DIR: conf/server-gpg-no-pw;
GPG_DECRYPT_ID: 12341234, DEADBEEF, 361BBAD4, 43214321;
GPG_DECRYPT_PW: fwknoptest;
GPG_REMOTE_ID: 6A3FAD56;

View File

@ -41,6 +41,7 @@ my %cf = (
'icmp_pcap_filter' => "$conf_dir/icmp_pcap_filter_fwknopd.conf",
'open_ports_access' => "$conf_dir/open_ports_access.conf",
'multi_gpg_access' => "$conf_dir/multi_gpg_access.conf",
'multi_gpg_no_pw_access' => "$conf_dir/multi_gpg_no_pw_access.conf",
'multi_stanza_access' => "$conf_dir/multi_stanzas_access.conf",
'broken_keys_access' => "$conf_dir/multi_stanzas_with_broken_keys.conf",
'open_ports_mismatch' => "$conf_dir/mismatch_open_ports_access.conf",
@ -1890,7 +1891,7 @@ my @tests = (
. "--gpg-home-dir $gpg_client_home_dir_no_pw",
'fwknopd_cmdline' => "LD_LIBRARY_PATH=$lib_dir " .
"$valgrind_str $fwknopdCmd -c $cf{'def'} " .
"-a $cf{'multi_gpg_access'} $intf_str " .
"-a $cf{'multi_gpg_no_pw_access'} $intf_str " .
"-d $default_digest_file -p $default_pid_file",
'fw_rule_created' => $NEW_RULE_REQUIRED,
'fw_rule_removed' => $NEW_RULE_REMOVED,