diff --git a/test/afl/fuzzing-wrappers/server-conf.sh b/test/afl/fuzzing-wrappers/server-conf.sh index 8eb23c50..7c11c198 100755 --- a/test/afl/fuzzing-wrappers/server-conf.sh +++ b/test/afl/fuzzing-wrappers/server-conf.sh @@ -9,7 +9,7 @@ FDIR="server-conf.out" OUT_DIR="$TOP_DIR/$FDIR" PREV_OUT_DIR='' -IN_DIR="test-cases/server-conf.cmin" +IN_DIR="test-cases/server-conf" FUZZ_FILE=$OUT_DIR/afl_fwknopd.conf ### build up our afl-fuzz text banner diff --git a/test/afl/test-cases/server-access.cmin/cfb_mode_access.conf b/test/afl/test-cases/server-access.cmin/cfb_mode_access.conf deleted file mode 100644 index 23f3c087..00000000 --- a/test/afl/test-cases/server-access.cmin/cfb_mode_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -ENCRYPTION_MODE CFB diff --git a/test/afl/test-cases/server-access.cmin/cmd_access.conf b/test/afl/test-cases/server-access.cmin/cmd_access.conf deleted file mode 100644 index 232abd46..00000000 --- a/test/afl/test-cases/server-access.cmin/cmd_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -ENABLE_CMD_EXEC Y diff --git a/test/afl/test-cases/server-access.cmin/cmd_giduid_access.conf b/test/afl/test-cases/server-access.cmin/cmd_giduid_access.conf deleted file mode 100644 index 194c43e7..00000000 --- a/test/afl/test-cases/server-access.cmin/cmd_giduid_access.conf +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE ANY -KEY fwknoptest -ENABLE_CMD_EXEC Y -CMD_EXEC_USER nobody -CMD_EXEC_GROUP nobody -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/cmd_setuid_access.conf b/test/afl/test-cases/server-access.cmin/cmd_setuid_access.conf deleted file mode 100644 index a2c2c2bd..00000000 --- a/test/afl/test-cases/server-access.cmin/cmd_setuid_access.conf +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE ANY -KEY fwknoptest -ENABLE_CMD_EXEC Y -CMD_EXEC_USER nobody -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/ctr_mode_access.conf b/test/afl/test-cases/server-access.cmin/ctr_mode_access.conf deleted file mode 100644 index c4f50bd7..00000000 --- a/test/afl/test-cases/server-access.cmin/ctr_mode_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -ENCRYPTION_MODE CTR diff --git a/test/afl/test-cases/server-access.cmin/default_fwknopd.conf b/test/afl/test-cases/server-access.cmin/default_fwknopd.conf deleted file mode 100644 index 76dda95e..00000000 --- a/test/afl/test-cases/server-access.cmin/default_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -# default config - no variables set to allow defaults to be preserved diff --git a/test/afl/test-cases/server-access.cmin/dual_key_legacy_iv_access.conf b/test/afl/test-cases/server-access.cmin/dual_key_legacy_iv_access.conf deleted file mode 100644 index 6d6024eb..00000000 --- a/test/afl/test-cases/server-access.cmin/dual_key_legacy_iv_access.conf +++ /dev/null @@ -1,10 +0,0 @@ -SOURCE ANY -KEY fwknoptest -OPEN_PORTS tcp/22 -FW_ACCESS_TIMEOUT 2 - -SOURCE ANY -KEY fwknoptest -OPEN_PORTS tcp/22 -FW_ACCESS_TIMEOUT 3 -ENCRYPTION_MODE legacy diff --git a/test/afl/test-cases/server-access.cmin/ecb_mode_access.conf b/test/afl/test-cases/server-access.cmin/ecb_mode_access.conf deleted file mode 100644 index 87765dfa..00000000 --- a/test/afl/test-cases/server-access.cmin/ecb_mode_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -ENCRYPTION_MODE ECB diff --git a/test/afl/test-cases/server-access.cmin/expired_epoch_stanza_access.conf b/test/afl/test-cases/server-access.cmin/expired_epoch_stanza_access.conf deleted file mode 100644 index db16ed90..00000000 --- a/test/afl/test-cases/server-access.cmin/expired_epoch_stanza_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -ACCESS_EXPIRE_EPOCH 1111111111; ### very old diff --git a/test/afl/test-cases/server-access.cmin/expired_stanza_access.conf b/test/afl/test-cases/server-access.cmin/expired_stanza_access.conf deleted file mode 100644 index f4ee6713..00000000 --- a/test/afl/test-cases/server-access.cmin/expired_stanza_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -ACCESS_EXPIRE 3/10/01; ### very old diff --git a/test/afl/test-cases/server-access.cmin/force_nat_access.conf b/test/afl/test-cases/server-access.cmin/force_nat_access.conf deleted file mode 100644 index 7a2b8f8d..00000000 --- a/test/afl/test-cases/server-access.cmin/force_nat_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -FORCE_NAT 192.168.1.123 22 diff --git a/test/afl/test-cases/server-access.cmin/fuzzing_open_ports_access.conf b/test/afl/test-cases/server-access.cmin/fuzzing_open_ports_access.conf deleted file mode 100644 index 10e56be3..00000000 --- a/test/afl/test-cases/server-access.cmin/fuzzing_open_ports_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE 4.3.2.0/24, 127.0.0.0/24, 123.123.123.123/24, 23.43.0.0/16, 10.10.10.10 -OPEN_PORTS udp/6001, tcp/22, tcp/80, tcp/123453 -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/fuzzing_restrict_ports_access.conf b/test/afl/test-cases/server-access.cmin/fuzzing_restrict_ports_access.conf deleted file mode 100644 index a73f1219..00000000 --- a/test/afl/test-cases/server-access.cmin/fuzzing_restrict_ports_access.conf +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE 4.3.2.0/24, 127.0.0.0/24, 123.123.123.123/24, 23.43.0.0/16, 10.10.10.10 -OPEN_PORTS udp/6001, tcp/22, tcp/80, tcp/12345 -RESTRICT_PORTS AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/fuzzing_source_access.conf b/test/afl/test-cases/server-access.cmin/fuzzing_source_access.conf deleted file mode 100644 index 46db3f77..00000000 --- a/test/afl/test-cases/server-access.cmin/fuzzing_source_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE 4.3.2.0/24, 127.0.0.0/24, 123.123.123.1234/24, 23.43.0.0/16, A0.10.10.10 -OPEN_PORTS udp/6001, tcp/22, tcp/80, tcp/12345 -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/fwknoprc_with_default_key b/test/afl/test-cases/server-access.cmin/fwknoprc_with_default_key deleted file mode 100644 index ba6f56d2..00000000 --- a/test/afl/test-cases/server-access.cmin/fwknoprc_with_default_key +++ /dev/null @@ -1,2 +0,0 @@ -[default] -KEY fwknoptest diff --git a/test/afl/test-cases/server-access.cmin/gpg_no_sig_no_fpr_access.conf b/test/afl/test-cases/server-access.cmin/gpg_no_sig_no_fpr_access.conf deleted file mode 100644 index 3ce6f6a6..00000000 --- a/test/afl/test-cases/server-access.cmin/gpg_no_sig_no_fpr_access.conf +++ /dev/null @@ -1,8 +0,0 @@ -SOURCE ANY -FW_ACCESS_TIMEOUT 3 -#GPG_HOME_DIR conf/server-gpg-no-pw ### for code coverage -GPG_DECRYPT_ID 361BBAD4 -GPG_DISABLE_SIG Y -GPG_REQUIRE_SIG Y -GPG_ALLOW_NO_PW Y -GPG_FINGERPRINT_ID 00CC95F05BC146B6AC4038C9E36F443C6A3FAD56 diff --git a/test/afl/test-cases/server-access.cmin/hmac_dual_key_usage_access.conf b/test/afl/test-cases/server-access.cmin/hmac_dual_key_usage_access.conf deleted file mode 100644 index 3211ff7b..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_dual_key_usage_access.conf +++ /dev/null @@ -1,12 +0,0 @@ -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -OPEN_PORTS tcp/22 -FW_ACCESS_TIMEOUT 2 - -### test comment -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -OPEN_PORTS tcp/80 -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_equal_keys_access.conf b/test/afl/test-cases/server-access.cmin/hmac_equal_keys_access.conf deleted file mode 100644 index 5118acb7..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_equal_keys_access.conf +++ /dev/null @@ -1,17 +0,0 @@ -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -OPEN_PORTS tcp/22 -FW_ACCESS_TIMEOUT 2 - -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -OPEN_PORTS tcp/80 -FW_ACCESS_TIMEOUT 3 - -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -OPEN_PORTS tcp/80 -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_force_masq_access.conf b/test/afl/test-cases/server-access.cmin/hmac_force_masq_access.conf deleted file mode 100644 index 9db231a6..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_force_masq_access.conf +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -FW_ACCESS_TIMEOUT 3 -FORCE_NAT 123.4.4.4 22 -FORCE_MASQUERADE Y diff --git a/test/afl/test-cases/server-access.cmin/hmac_force_snat_access.conf b/test/afl/test-cases/server-access.cmin/hmac_force_snat_access.conf deleted file mode 100644 index 8e597e88..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_force_snat_access.conf +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -FW_ACCESS_TIMEOUT 3 -FORCE_NAT 123.4.4.4 22 -FORCE_SNAT 33.3.3.3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_fuzzing_access.conf b/test/afl/test-cases/server-access.cmin/hmac_fuzzing_access.conf deleted file mode 100644 index f8dfe29c..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_fuzzing_access.conf +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE ANY -KEY AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -HMAC_KEY BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB -ENABLE_CMD_EXEC Y -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_get_key_access.conf b/test/afl/test-cases/server-access.cmin/hmac_get_key_access.conf deleted file mode 100644 index ca2da35d..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_get_key_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY rijndaelkey -HMAC_KEY hmackey -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_invalid_type_access.conf b/test/afl/test-cases/server-access.cmin/hmac_invalid_type_access.conf deleted file mode 100644 index b7e29a90..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_invalid_type_access.conf +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -HMAC_DIGEST_TYPE invalid -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_md5_short_key_access.conf b/test/afl/test-cases/server-access.cmin/hmac_md5_short_key_access.conf deleted file mode 100644 index 88e32aaa..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_md5_short_key_access.conf +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 QQBwGf0bkZmBUA== -HMAC_DIGEST_TYPE md5 -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_no_b64_cygwin_access.conf b/test/afl/test-cases/server-access.cmin/hmac_no_b64_cygwin_access.conf deleted file mode 100644 index 46329986..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_no_b64_cygwin_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -HMAC_KEY test -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_sha1_short_key_access.conf b/test/afl/test-cases/server-access.cmin/hmac_sha1_short_key_access.conf deleted file mode 100644 index 70da6557..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_sha1_short_key_access.conf +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 QQBwGf0bkZmBUA== -HMAC_DIGEST_TYPE sha1 -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_sha384_access.conf b/test/afl/test-cases/server-access.cmin/hmac_sha384_access.conf deleted file mode 100644 index 23af2450..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_sha384_access.conf +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE ANY -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 4BzQKdhUpy3ijTbjQmrrl4sMX0cOFqUz+Yq/ET3dDuzS1OH7omsFzra649fLuTLEGQy8u9Mt7XKscMIvv6MqmARI892r0U57QYtKWlilbzJhLNKhF6+vpBKC+6ArZD/OzFUHB/oREch8I8QR/nCCpxrzjca5BN/KAdAOi3xvX1Q= -HMAC_DIGEST_TYPE sha384 -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_sha512_short_key2_access.conf b/test/afl/test-cases/server-access.cmin/hmac_sha512_short_key2_access.conf deleted file mode 100644 index 8713132c..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_sha512_short_key2_access.conf +++ /dev/null @@ -1,5 +0,0 @@ -SOURCE ANY -KEY_BASE64 dGVzdGtleTE= -HMAC_KEY_BASE64 dGVzdGtleTI= -HMAC_DIGEST_TYPE sha512 -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/hmac_simple_keys_access.conf b/test/afl/test-cases/server-access.cmin/hmac_simple_keys_access.conf deleted file mode 100644 index 6e887654..00000000 --- a/test/afl/test-cases/server-access.cmin/hmac_simple_keys_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY_BASE64 dGVzdA== -HMAC_KEY_BASE64 dGVzdHRlc3Q= -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/icmp_pcap_filter_fwknopd.conf b/test/afl/test-cases/server-access.cmin/icmp_pcap_filter_fwknopd.conf deleted file mode 100644 index 047cb6cb..00000000 --- a/test/afl/test-cases/server-access.cmin/icmp_pcap_filter_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -PCAP_FILTER icmp; diff --git a/test/afl/test-cases/server-access.cmin/invalid_expire_access.conf b/test/afl/test-cases/server-access.cmin/invalid_expire_access.conf deleted file mode 100644 index 06c4f6bb..00000000 --- a/test/afl/test-cases/server-access.cmin/invalid_expire_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -ACCESS_EXPIRE 3-10-01; ### / separators required diff --git a/test/afl/test-cases/server-access.cmin/invalid_source_access.conf b/test/afl/test-cases/server-access.cmin/invalid_source_access.conf deleted file mode 100644 index 771726fe..00000000 --- a/test/afl/test-cases/server-access.cmin/invalid_source_access.conf +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE :ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -SOURCE ANY -KEY fwknoptest2 -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/ip_source_match_access.conf b/test/afl/test-cases/server-access.cmin/ip_source_match_access.conf deleted file mode 100644 index 5df1ff8e..00000000 --- a/test/afl/test-cases/server-access.cmin/ip_source_match_access.conf +++ /dev/null @@ -1,3 +0,0 @@ -SOURCE 127.0.0.1 -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/ipt_custom_nat_chain_fwknopd.conf b/test/afl/test-cases/server-access.cmin/ipt_custom_nat_chain_fwknopd.conf deleted file mode 100644 index 39b2a3b9..00000000 --- a/test/afl/test-cases/server-access.cmin/ipt_custom_nat_chain_fwknopd.conf +++ /dev/null @@ -1,5 +0,0 @@ -ENABLE_IPT_FORWARDING Y; - -IPT_INPUT_ACCESS ACCEPT, filter, INPUT, 1, FWKNOP_INPUT_TEST, 1; -IPT_FORWARD_ACCESS ACCEPT, filter, FORWARD, 1, FWKNOP_FORWARD_TEST, 1; -IPT_DNAT_ACCESS DNAT, nat, PREROUTING, 1, FWKNOP_PREROUTING_TEST, 1; diff --git a/test/afl/test-cases/server-access.cmin/ipt_no_flush_init_or_exit_fwknopd.conf b/test/afl/test-cases/server-access.cmin/ipt_no_flush_init_or_exit_fwknopd.conf deleted file mode 100644 index 1bf29978..00000000 --- a/test/afl/test-cases/server-access.cmin/ipt_no_flush_init_or_exit_fwknopd.conf +++ /dev/null @@ -1,2 +0,0 @@ -FLUSH_IPT_AT_INIT N; -FLUSH_IPT_AT_EXIT N; diff --git a/test/afl/test-cases/server-access.cmin/ipt_snat_fwknopd.conf b/test/afl/test-cases/server-access.cmin/ipt_snat_fwknopd.conf deleted file mode 100644 index 9da1b34c..00000000 --- a/test/afl/test-cases/server-access.cmin/ipt_snat_fwknopd.conf +++ /dev/null @@ -1,3 +0,0 @@ -ENABLE_IPT_FORWARDING Y; -ENABLE_IPT_SNAT Y; -SNAT_TRANSLATE_IP 10.1.2.3; diff --git a/test/afl/test-cases/server-access.cmin/legacy_iv_long_key2_access.conf b/test/afl/test-cases/server-access.cmin/legacy_iv_long_key2_access.conf deleted file mode 100644 index 6ebfc7e0..00000000 --- a/test/afl/test-cases/server-access.cmin/legacy_iv_long_key2_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY 1234567890123456blah -FW_ACCESS_TIMEOUT 3 -ENCRYPTION_MODE legacy diff --git a/test/afl/test-cases/server-access.cmin/multi_stanzas_access.conf b/test/afl/test-cases/server-access.cmin/multi_stanzas_access.conf deleted file mode 100644 index 5df998f2..00000000 --- a/test/afl/test-cases/server-access.cmin/multi_stanzas_access.conf +++ /dev/null @@ -1,12 +0,0 @@ -SOURCE 4.3.2.0/24, 23.43.0.0/16, 10.10.10.10 -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -SOURCE 23.43.0.0/16, 123.123.123.123/255.255.255.255, 10.10.10.10 -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -SOURCE 4.3.2.0/24, 127.0.0.0/24, 23.43.0.0/16, 10.10.10.10 -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -SOURCE 4.3.2.0/24, 10.10.10.10 -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/multi_stanzas_with_broken_keys.conf b/test/afl/test-cases/server-access.cmin/multi_stanzas_with_broken_keys.conf deleted file mode 100644 index 0591f6f3..00000000 --- a/test/afl/test-cases/server-access.cmin/multi_stanzas_with_broken_keys.conf +++ /dev/null @@ -1,15 +0,0 @@ -SOURCE: 4.3.2.0/24, 23.43.0.0/16, 10.10.10.10; -KEY: fwknoptest; -FW_ACCESS_TIMEOUT: 3; -SOURCE: 23.43.0.0/16, 10.10.10.10; -KEY: fwknoptest; -FW_ACCESS_TIMEOUT: 3; -SOURCE: 4.3.2.0/24, 127.0.0.0/24, 23.43.0.0/16, 10.10.10.10; -KEY: badkey123; -FW_ACCESS_TIMEOUT: 3; -SOURCE: 4.3.2.0/24, 127.0.0.0/24, 23.43.0.0/16, 10.10.10.10; -KEY: fwknoptest; -FW_ACCESS_TIMEOUT: 3; -SOURCE: 4.3.2.0/24, 10.10.10.10; -KEY: fwknoptest; -FW_ACCESS_TIMEOUT: 3; diff --git a/test/afl/test-cases/server-access.cmin/no_multi_source_match_access.conf b/test/afl/test-cases/server-access.cmin/no_multi_source_match_access.conf deleted file mode 100644 index aaacd38f..00000000 --- a/test/afl/test-cases/server-access.cmin/no_multi_source_match_access.conf +++ /dev/null @@ -1,3 +0,0 @@ -SOURCE 4.3.2.0/24, 1.3.4.5, 23.43.0.0/16, 10.10.10.10 -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 diff --git a/test/afl/test-cases/server-access.cmin/ofb_mode_access.conf b/test/afl/test-cases/server-access.cmin/ofb_mode_access.conf deleted file mode 100644 index 61366654..00000000 --- a/test/afl/test-cases/server-access.cmin/ofb_mode_access.conf +++ /dev/null @@ -1,4 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -ENCRYPTION_MODE OFB diff --git a/test/afl/test-cases/server-conf.cmin/default_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/default_fwknopd.conf deleted file mode 100644 index 76dda95e..00000000 --- a/test/afl/test-cases/server-conf.cmin/default_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -# default config - no variables set to allow defaults to be preserved diff --git a/test/afl/test-cases/server-conf.cmin/fwknoprc_gpg_invalid_exe b/test/afl/test-cases/server-conf.cmin/fwknoprc_gpg_invalid_exe deleted file mode 100644 index d1511b5f..00000000 --- a/test/afl/test-cases/server-conf.cmin/fwknoprc_gpg_invalid_exe +++ /dev/null @@ -1,4 +0,0 @@ -[default] -HMAC_DIGEST_TYPE sha256 -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -GPG_EXE /invalid/gpg/path diff --git a/test/afl/test-cases/server-conf.cmin/fwknoprc_hmac_defaults b/test/afl/test-cases/server-conf.cmin/fwknoprc_hmac_defaults deleted file mode 100644 index d35e7bde..00000000 --- a/test/afl/test-cases/server-conf.cmin/fwknoprc_hmac_defaults +++ /dev/null @@ -1,40 +0,0 @@ -[default] -ACCESS tcp/22 -SPA_SERVER 127.0.0.1 -ALLOW_IP 127.0.0.2 -USE_HMAC Y -HMAC_DIGEST_TYPE sha256 -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -DIGEST_TYPE sha256 -SPA_SERVER_PROTO udp -SPA_SERVER_PORT 62201 -SPOOF_USER mbrtest -VERBOSE Y -RESOLVE_IP_HTTP N -TIME_OFFSET -1s -ENCRYPTION_MODE CBC -USE_GPG N -USE_GPG_AGENT N - -#RAND_PORT -#SPA_SOURCE_PORT -#FW_TIMEOUT -#GPG_RECIPIENT -#GPG_SIGNER -#GPG_HOMEDIR -#GPG_EXE -#GPG_SIGNING_PW -#GPG_SIGNING_PW_BASE64 -#GPG_NO_SIGNING_PW -#SPOOF_SOURCE_IP -#KEY -#HMAC_KEY -#KEY_FILE -#HMAC_KEY_FILE -#RESOLVE_URL -#NAT_ACCESS -#HTTP_USER_AGENT -#NAT_LOCAL -#NAT_RAND_PORT -#NAT_PORT diff --git a/test/afl/test-cases/server-conf.cmin/fwknoprc_hmac_time_offset_days b/test/afl/test-cases/server-conf.cmin/fwknoprc_hmac_time_offset_days deleted file mode 100644 index e0917142..00000000 --- a/test/afl/test-cases/server-conf.cmin/fwknoprc_hmac_time_offset_days +++ /dev/null @@ -1,18 +0,0 @@ -[default] -ACCESS tcp/22 -SPA_SERVER 127.0.0.1 -ALLOW_IP 127.0.0.2 -USE_HMAC Y -HMAC_DIGEST_TYPE sha256 -KEY_BASE64 wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg= -HMAC_KEY_BASE64 Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg== -DIGEST_TYPE sha256 -SPA_SERVER_PROTO udp -SPA_SERVER_PORT 62201 -SPOOF_USER mbrtest -VERBOSE 2 -TIME_OFFSET -1D -ENCRYPTION_MODE CBC -USE_GPG N -USE_GPG_AGENT N -RESOLVE_IP_HTTP N diff --git a/test/afl/test-cases/server-conf.cmin/fwknoprc_stanza_list b/test/afl/test-cases/server-conf.cmin/fwknoprc_stanza_list deleted file mode 100644 index 36dcd9f3..00000000 --- a/test/afl/test-cases/server-conf.cmin/fwknoprc_stanza_list +++ /dev/null @@ -1,8 +0,0 @@ -[default] -KEY testkey - -[stanza_1] -KEY testkey_1 - -[stanza_2] -KEY testkey_2 diff --git a/test/afl/test-cases/server-conf.cmin/fwknoprc_with_named_key b/test/afl/test-cases/server-conf.cmin/fwknoprc_with_named_key deleted file mode 100644 index 1f5d710b..00000000 --- a/test/afl/test-cases/server-conf.cmin/fwknoprc_with_named_key +++ /dev/null @@ -1,3 +0,0 @@ -[default] -[testssh] -KEY fwknoptest diff --git a/test/afl/test-cases/server-conf.cmin/gpg_access.conf b/test/afl/test-cases/server-conf.cmin/gpg_access.conf deleted file mode 100644 index b7cfce4c..00000000 --- a/test/afl/test-cases/server-conf.cmin/gpg_access.conf +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE ANY -KEY fwknoptest -FW_ACCESS_TIMEOUT 3 -GPG_HOME_DIR conf/server-gpg -GPG_DECRYPT_ID 361BBAD4 -GPG_DECRYPT_PW fwknoptest -GPG_REMOTE_ID 6A3FAD56 diff --git a/test/afl/test-cases/server-conf.cmin/gpg_dirs_orig.tar.gz b/test/afl/test-cases/server-conf.cmin/gpg_dirs_orig.tar.gz deleted file mode 100644 index c853ff39..00000000 Binary files a/test/afl/test-cases/server-conf.cmin/gpg_dirs_orig.tar.gz and /dev/null differ diff --git a/test/afl/test-cases/server-conf.cmin/icmp_pcap_filter_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/icmp_pcap_filter_fwknopd.conf deleted file mode 100644 index 047cb6cb..00000000 --- a/test/afl/test-cases/server-conf.cmin/icmp_pcap_filter_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -PCAP_FILTER icmp; diff --git a/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_3_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_3_fwknopd.conf deleted file mode 100644 index cdb73492..00000000 --- a/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_3_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -IPT_INPUT_ACCESS ACCEPT, ffilter, INPUT, 1, FWKNOP_INPUT_TEST, 1; diff --git a/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_4_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_4_fwknopd.conf deleted file mode 100644 index 3020fe54..00000000 --- a/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_4_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -IPT_INPUT_ACCESS ACCEPT, filter, IINPUT, 1, FWKNOP_INPUT_TEST, 1; diff --git a/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_5_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_5_fwknopd.conf deleted file mode 100644 index 0ccbd183..00000000 --- a/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_5_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -IPT_INPUT_ACCESS ACCEPT, filter, INPUT, -1, FWKNOP_INPUT_TEST, 1; diff --git a/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_fwknopd.conf deleted file mode 100644 index 6c3b6afa..00000000 --- a/test/afl/test-cases/server-conf.cmin/invalid_ipt_input_chain_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -IPT_INPUT_ACCESS ACCEPT, filter, INPUT, 1 FWKNOP_INPUT_TEST, 1; diff --git a/test/afl/test-cases/server-conf.cmin/ipt_custom_nat_chain_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/ipt_custom_nat_chain_fwknopd.conf deleted file mode 100644 index 39b2a3b9..00000000 --- a/test/afl/test-cases/server-conf.cmin/ipt_custom_nat_chain_fwknopd.conf +++ /dev/null @@ -1,5 +0,0 @@ -ENABLE_IPT_FORWARDING Y; - -IPT_INPUT_ACCESS ACCEPT, filter, INPUT, 1, FWKNOP_INPUT_TEST, 1; -IPT_FORWARD_ACCESS ACCEPT, filter, FORWARD, 1, FWKNOP_FORWARD_TEST, 1; -IPT_DNAT_ACCESS DNAT, nat, PREROUTING, 1, FWKNOP_PREROUTING_TEST, 1; diff --git a/test/afl/test-cases/server-conf.cmin/ipt_no_flush_init_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/ipt_no_flush_init_fwknopd.conf deleted file mode 100644 index a2d97df2..00000000 --- a/test/afl/test-cases/server-conf.cmin/ipt_no_flush_init_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -FLUSH_IPT_AT_INIT N; diff --git a/test/afl/test-cases/server-conf.cmin/ipt_output_chain_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/ipt_output_chain_fwknopd.conf deleted file mode 100644 index f03787e3..00000000 --- a/test/afl/test-cases/server-conf.cmin/ipt_output_chain_fwknopd.conf +++ /dev/null @@ -1,2 +0,0 @@ -ENABLE_IPT_OUTPUT Y; -IPT_OUTPUT_ACCESS ACCEPT, filter, OUTPUT, 1, FWKNOP_OUTPUT, 1; diff --git a/test/afl/test-cases/server-conf.cmin/ipt_snat_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/ipt_snat_fwknopd.conf deleted file mode 100644 index 9da1b34c..00000000 --- a/test/afl/test-cases/server-conf.cmin/ipt_snat_fwknopd.conf +++ /dev/null @@ -1,3 +0,0 @@ -ENABLE_IPT_FORWARDING Y; -ENABLE_IPT_SNAT Y; -SNAT_TRANSLATE_IP 10.1.2.3; diff --git a/test/afl/test-cases/server-conf.cmin/ipt_snat_no_translate_ip_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/ipt_snat_no_translate_ip_fwknopd.conf deleted file mode 100644 index 86df28a8..00000000 --- a/test/afl/test-cases/server-conf.cmin/ipt_snat_no_translate_ip_fwknopd.conf +++ /dev/null @@ -1,2 +0,0 @@ -ENABLE_IPT_FORWARDING Y; -ENABLE_IPT_SNAT Y; diff --git a/test/afl/test-cases/server-conf.cmin/multi_pkts.pcap b/test/afl/test-cases/server-conf.cmin/multi_pkts.pcap deleted file mode 100644 index 69c4f671..00000000 Binary files a/test/afl/test-cases/server-conf.cmin/multi_pkts.pcap and /dev/null differ diff --git a/test/afl/test-cases/server-conf.cmin/override2_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/override2_fwknopd.conf deleted file mode 100644 index 16cce60a..00000000 --- a/test/afl/test-cases/server-conf.cmin/override2_fwknopd.conf +++ /dev/null @@ -1,2 +0,0 @@ -ENABLE_PCAP_PROMISC N -PCAP_FILTER udp port 1234 diff --git a/test/afl/test-cases/server-conf.cmin/override_no_digest_tracking_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/override_no_digest_tracking_fwknopd.conf deleted file mode 100644 index 71e8e1b5..00000000 --- a/test/afl/test-cases/server-conf.cmin/override_no_digest_tracking_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -ENABLE_DIGEST_PERSISTENCE N; diff --git a/test/afl/test-cases/server-conf.cmin/spa_over_http.pcap b/test/afl/test-cases/server-conf.cmin/spa_over_http.pcap deleted file mode 100644 index 7ccf8a7d..00000000 Binary files a/test/afl/test-cases/server-conf.cmin/spa_over_http.pcap and /dev/null differ diff --git a/test/afl/test-cases/server-conf.cmin/spa_over_http_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/spa_over_http_fwknopd.conf deleted file mode 100644 index 7b005a41..00000000 --- a/test/afl/test-cases/server-conf.cmin/spa_over_http_fwknopd.conf +++ /dev/null @@ -1 +0,0 @@ -ENABLE_SPA_OVER_HTTP Y; diff --git a/test/afl/test-cases/server-conf.cmin/spa_replay.pcap b/test/afl/test-cases/server-conf.cmin/spa_replay.pcap deleted file mode 100644 index 4c963e94..00000000 Binary files a/test/afl/test-cases/server-conf.cmin/spa_replay.pcap and /dev/null differ diff --git a/test/afl/test-cases/server-conf.cmin/var_expansion_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/var_expansion_fwknopd.conf deleted file mode 100644 index d69e98d7..00000000 --- a/test/afl/test-cases/server-conf.cmin/var_expansion_fwknopd.conf +++ /dev/null @@ -1,2 +0,0 @@ -FWKNOP_RUN_DIR /var/run -FWKNOP_PID_FILE $FWKNOP_RUN_DIR/test.pid diff --git a/test/afl/test-cases/server-conf.cmin/var_expansion_invalid_fwknopd.conf b/test/afl/test-cases/server-conf.cmin/var_expansion_invalid_fwknopd.conf deleted file mode 100644 index f8f1d320..00000000 --- a/test/afl/test-cases/server-conf.cmin/var_expansion_invalid_fwknopd.conf +++ /dev/null @@ -1,2 +0,0 @@ -FWKNOP_RUN_DIR /var/run -FWKNOP_PID_FILE $FWKNOP_INVALID_VAR/test.pid