[test suite] minor formatting update to access.conf files to mimic fwknoprc vars...

diff --git a/test/conf/android_access.conf b/test/conf/android_access.conf
index 0e98fad..5b720d9 100644 (file)
--- a/test/conf/android_access.conf
+++ b/test/conf/android_access.conf
@@ -1,3 +1,3 @@
-SOURCE: ANY;
-KEY: asdfasdf;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                   ANY
+KEY                      asdfasdf
+FW_ACCESS_TIMEOUT        3

diff --git a/test/conf/android_legacy_iv_access.conf b/test/conf/android_legacy_iv_access.conf
index 2ffb824..28ebda3 100644 (file)
--- a/test/conf/android_legacy_iv_access.conf
+++ b/test/conf/android_legacy_iv_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: asdfasdf;
-FW_ACCESS_TIMEOUT:  3;
-ENCRYPTION_MODE: legacy;
+SOURCE                 ANY
+KEY                    asdfasdf
+FW_ACCESS_TIMEOUT      3
+ENCRYPTION_MODE        legacy

diff --git a/test/conf/base64_key_access.conf b/test/conf/base64_key_access.conf
index 4a52f44..9fd3dc8 100644 (file)
--- a/test/conf/base64_key_access.conf
+++ b/test/conf/base64_key_access.conf
@@ -1,3 +1,3 @@
-SOURCE: ANY;
-KEY_BASE64:           w8KMBQlKf4UCARNQmi25DPxw4xAUaRs21nf8nbRNzUo=;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                ANY
+KEY_BASE64            w8KMBQlKf4UCARNQmi25DPxw4xAUaRs21nf8nbRNzUo=
+FW_ACCESS_TIMEOUT     3

diff --git a/test/conf/cfb_mode_access.conf b/test/conf/cfb_mode_access.conf
index 9230298..23f3c08 100644 (file)
--- a/test/conf/cfb_mode_access.conf
+++ b/test/conf/cfb_mode_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ENCRYPTION_MODE: CFB;
+SOURCE               ANY
+KEY                  fwknoptest
+FW_ACCESS_TIMEOUT    3
+ENCRYPTION_MODE      CFB

diff --git a/test/conf/cmd_access.conf b/test/conf/cmd_access.conf
index 3161d77..232abd4 100644 (file)
--- a/test/conf/cmd_access.conf
+++ b/test/conf/cmd_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ENABLE_CMD_EXEC: Y;
+SOURCE                   ANY
+KEY                      fwknoptest
+FW_ACCESS_TIMEOUT        3
+ENABLE_CMD_EXEC          Y

diff --git a/test/conf/ctr_mode_access.conf b/test/conf/ctr_mode_access.conf
index ba4e393..c4f50bd 100644 (file)
--- a/test/conf/ctr_mode_access.conf
+++ b/test/conf/ctr_mode_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ENCRYPTION_MODE: CTR;
+SOURCE                  ANY
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3
+ENCRYPTION_MODE         CTR

diff --git a/test/conf/default_access.conf b/test/conf/default_access.conf
index 7b1bc93..de427ac 100644 (file)
--- a/test/conf/default_access.conf
+++ b/test/conf/default_access.conf
@@ -1,3 +1,3 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                 ANY
+KEY                    fwknoptest
+FW_ACCESS_TIMEOUT      3

diff --git a/test/conf/dual_key_usage_access.conf b/test/conf/dual_key_usage_access.conf
index 4354562..9564e42 100644 (file)
--- a/test/conf/dual_key_usage_access.conf
+++ b/test/conf/dual_key_usage_access.conf
@@ -1,8 +1,8 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-OPEN_PORTS: tcp/22;
-FW_ACCESS_TIMEOUT:  2;
-SOURCE: ANY;
-KEY: fwknoptest;
-OPEN_PORTS: tcp/80;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY                     fwknoptest
+OPEN_PORTS              tcp/22
+FW_ACCESS_TIMEOUT       2
+SOURCE                  ANY
+KEY                     fwknoptest
+OPEN_PORTS              tcp/80
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/ecb_mode_access.conf b/test/conf/ecb_mode_access.conf
index a7b62ed..87765df 100644 (file)
--- a/test/conf/ecb_mode_access.conf
+++ b/test/conf/ecb_mode_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ENCRYPTION_MODE: ECB;
+SOURCE                  ANY
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3
+ENCRYPTION_MODE         ECB

diff --git a/test/conf/expired_epoch_stanza_access.conf b/test/conf/expired_epoch_stanza_access.conf
index 6f273b8..db16ed9 100644 (file)
--- a/test/conf/expired_epoch_stanza_access.conf
+++ b/test/conf/expired_epoch_stanza_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ACCESS_EXPIRE_EPOCH: 1111111111;   ### very old
+SOURCE                      ANY
+KEY                         fwknoptest
+FW_ACCESS_TIMEOUT           3
+ACCESS_EXPIRE_EPOCH         1111111111;   ### very old

diff --git a/test/conf/expired_stanza_access.conf b/test/conf/expired_stanza_access.conf
index 8678550..f4ee671 100644 (file)
--- a/test/conf/expired_stanza_access.conf
+++ b/test/conf/expired_stanza_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ACCESS_EXPIRE: 3/10/01;   ### very old
+SOURCE                  ANY
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3
+ACCESS_EXPIRE           3/10/01;   ### very old

diff --git a/test/conf/force_nat_access.conf b/test/conf/force_nat_access.conf
index b2f18b0..7a2b8f8 100644 (file)
--- a/test/conf/force_nat_access.conf
+++ b/test/conf/force_nat_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-FORCE_NAT: 192.168.1.123 22;
+SOURCE                  ANY
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3
+FORCE_NAT               192.168.1.123 22

diff --git a/test/conf/future_expired_stanza_access.conf b/test/conf/future_expired_stanza_access.conf
index c39675b..8c207dd 100644 (file)
--- a/test/conf/future_expired_stanza_access.conf
+++ b/test/conf/future_expired_stanza_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ACCESS_EXPIRE: 3/10/2500;   ### way in the future
+SOURCE                  ANY
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3
+ACCESS_EXPIRE           3/10/2500;   ### way in the future

diff --git a/test/conf/fuzzing_open_ports_access.conf b/test/conf/fuzzing_open_ports_access.conf
index d79f1ce..10e56be 100644 (file)
--- a/test/conf/fuzzing_open_ports_access.conf
+++ b/test/conf/fuzzing_open_ports_access.conf
@@ -1,4 +1,4 @@
-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;
+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/conf/fuzzing_restrict_ports_access.conf b/test/conf/fuzzing_restrict_ports_access.conf
index baf6ae0..a73f121 100644 (file)
--- a/test/conf/fuzzing_restrict_ports_access.conf
+++ b/test/conf/fuzzing_restrict_ports_access.conf
@@ -1,5 +1,5 @@
-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;
+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/conf/fuzzing_source_access.conf b/test/conf/fuzzing_source_access.conf
index 78281ba..46db3f7 100644 (file)
--- a/test/conf/fuzzing_source_access.conf
+++ b/test/conf/fuzzing_source_access.conf
@@ -1,4 +1,4 @@
-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;
+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/conf/gpg_access.conf b/test/conf/gpg_access.conf
index cf51944..b7cfce4 100644 (file)
--- a/test/conf/gpg_access.conf
+++ b/test/conf/gpg_access.conf
@@ -1,7 +1,7 @@
-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;
+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/conf/gpg_hmac_access.conf b/test/conf/gpg_hmac_access.conf
index aa16258..8ba9ed7 100644 (file)
--- a/test/conf/gpg_hmac_access.conf
+++ b/test/conf/gpg_hmac_access.conf
@@ -1,8 +1,8 @@
-SOURCE: ANY;
-FW_ACCESS_TIMEOUT:  3;
-HMAC_DIGEST_TYPE:   sha256
-HMAC_KEY_BASE64:    Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
-GPG_HOME_DIR: conf/server-gpg;
-GPG_DECRYPT_ID: 361BBAD4;
-GPG_DECRYPT_PW: fwknoptest;
-GPG_REMOTE_ID: 6A3FAD56;
+SOURCE                      ANY
+FW_ACCESS_TIMEOUT           3
+HMAC_DIGEST_TYPE            sha256
+HMAC_KEY_BASE64             Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
+GPG_HOME_DIR                conf/server-gpg
+GPG_DECRYPT_ID              361BBAD4
+GPG_DECRYPT_PW              fwknoptest
+GPG_REMOTE_ID               6A3FAD56

diff --git a/test/conf/gpg_no_pw_access.conf b/test/conf/gpg_no_pw_access.conf
index aae4eb8..fb68912 100644 (file)
--- a/test/conf/gpg_no_pw_access.conf
+++ b/test/conf/gpg_no_pw_access.conf
@@ -1,6 +1,6 @@
-SOURCE: ANY;
-FW_ACCESS_TIMEOUT:  3;
-GPG_HOME_DIR: conf/server-gpg-no-pw;
-GPG_DECRYPT_ID: 361BBAD4;
-GPG_ALLOW_NO_PW: Y;
-GPG_REMOTE_ID: 6A3FAD56;
+SOURCE                      ANY
+FW_ACCESS_TIMEOUT           3
+GPG_HOME_DIR                conf/server-gpg-no-pw
+GPG_DECRYPT_ID              361BBAD4
+GPG_ALLOW_NO_PW             Y
+GPG_REMOTE_ID               6A3FAD56

diff --git a/test/conf/gpg_no_pw_hmac_access.conf b/test/conf/gpg_no_pw_hmac_access.conf
index 07fd9c5..7458633 100644 (file)
--- a/test/conf/gpg_no_pw_hmac_access.conf
+++ b/test/conf/gpg_no_pw_hmac_access.conf
@@ -1,8 +1,8 @@
-SOURCE: ANY;
-FW_ACCESS_TIMEOUT:  3;
-HMAC_DIGEST_TYPE:   sha256
-HMAC_KEY_BASE64:    Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
-GPG_HOME_DIR: conf/server-gpg-no-pw;
-GPG_DECRYPT_ID: 361BBAD4;
-GPG_ALLOW_NO_PW: Y;
-GPG_REMOTE_ID: 6A3FAD56;
+SOURCE                      ANY
+FW_ACCESS_TIMEOUT           3
+HMAC_DIGEST_TYPE            sha256
+HMAC_KEY_BASE64             Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
+GPG_HOME_DIR                conf/server-gpg-no-pw
+GPG_DECRYPT_ID              361BBAD4
+GPG_ALLOW_NO_PW             Y
+GPG_REMOTE_ID               6A3FAD56

diff --git a/test/conf/hmac_access.conf b/test/conf/hmac_access.conf
index d453dda..6897406 100644 (file)
--- a/test/conf/hmac_access.conf
+++ b/test/conf/hmac_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_dual_key_usage_access.conf b/test/conf/hmac_dual_key_usage_access.conf
index 5b228e9..3211ff7 100644 (file)
--- a/test/conf/hmac_dual_key_usage_access.conf
+++ b/test/conf/hmac_dual_key_usage_access.conf
@@ -1,10 +1,12 @@
-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:    Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
-OPEN_PORTS: tcp/80;
-FW_ACCESS_TIMEOUT:  3;
+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/conf/hmac_equal_keys_access.conf b/test/conf/hmac_equal_keys_access.conf
index e49ebcf..5118acb 100644 (file)
--- a/test/conf/hmac_equal_keys_access.conf
+++ b/test/conf/hmac_equal_keys_access.conf
@@ -1,17 +1,17 @@
-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             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             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;
+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/conf/hmac_force_nat_access.conf b/test/conf/hmac_force_nat_access.conf
index 63a3421..9d139b0 100644 (file)
--- a/test/conf/hmac_force_nat_access.conf
+++ b/test/conf/hmac_force_nat_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64          wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64     Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
-FW_ACCESS_TIMEOUT:  3;
-FORCE_NAT: 192.168.1.123 22;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
+FW_ACCESS_TIMEOUT       3
+FORCE_NAT               192.168.1.123 22

diff --git a/test/conf/hmac_get_key_access.conf b/test/conf/hmac_get_key_access.conf
index 6ef1797..ca2da35 100644 (file)
--- a/test/conf/hmac_get_key_access.conf
+++ b/test/conf/hmac_get_key_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY:         rijndaelkey;
-HMAC_KEY:    hmackey;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY                     rijndaelkey
+HMAC_KEY                hmackey
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_invalid_type_access.conf b/test/conf/hmac_invalid_type_access.conf
index 8e60f5e..b7e29a9 100644 (file)
--- a/test/conf/hmac_invalid_type_access.conf
+++ b/test/conf/hmac_invalid_type_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
-HMAC_DIGEST_TYPE:   invalid;
-FW_ACCESS_TIMEOUT:  3;
+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/conf/hmac_md5_access.conf b/test/conf/hmac_md5_access.conf
index e1df6b1..41dbf4b 100644 (file)
--- a/test/conf/hmac_md5_access.conf
+++ b/test/conf/hmac_md5_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    sVwJFvtWp7/IkTsKfcRbKQ==
-HMAC_DIGEST_TYPE    md5;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         sVwJFvtWp7/IkTsKfcRbKQ==
+HMAC_DIGEST_TYPE        md5
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_md5_long_key_access.conf b/test/conf/hmac_md5_long_key_access.conf
index 59f59ed..6a3da76 100644 (file)
--- a/test/conf/hmac_md5_long_key_access.conf
+++ b/test/conf/hmac_md5_long_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
-HMAC_DIGEST_TYPE:   md5;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
+HMAC_DIGEST_TYPE        md5
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_md5_short_key_access.conf b/test/conf/hmac_md5_short_key_access.conf
index 36d9f5a..88e32aa 100644 (file)
--- a/test/conf/hmac_md5_short_key_access.conf
+++ b/test/conf/hmac_md5_short_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    QQBwGf0bkZmBUA==
-HMAC_DIGEST_TYPE    md5;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE              ANY
+KEY_BASE64          wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64     QQBwGf0bkZmBUA==
+HMAC_DIGEST_TYPE    md5
+FW_ACCESS_TIMEOUT   3

diff --git a/test/conf/hmac_no_b64_access.conf b/test/conf/hmac_no_b64_access.conf
index 9c0484f..5b711e8 100644 (file)
--- a/test/conf/hmac_no_b64_access.conf
+++ b/test/conf/hmac_no_b64_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY:                rijndaeltest;
-HMAC_KEY:           hmactest;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY                     rijndaeltest
+HMAC_KEY                hmactest
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_no_b64_cygwin_access.conf b/test/conf/hmac_no_b64_cygwin_access.conf
index c275ba6..4632998 100644 (file)
--- a/test/conf/hmac_no_b64_cygwin_access.conf
+++ b/test/conf/hmac_no_b64_cygwin_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY:                fwknoptest;
-HMAC_KEY:           test;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY                     fwknoptest
+HMAC_KEY                test
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_sha1_access.conf b/test/conf/hmac_sha1_access.conf
index ca55c61..7e97189 100644 (file)
--- a/test/conf/hmac_sha1_access.conf
+++ b/test/conf/hmac_sha1_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
-HMAC_DIGEST_TYPE:   sha1;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
+HMAC_DIGEST_TYPE        sha1
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_sha1_long_key_access.conf b/test/conf/hmac_sha1_long_key_access.conf
index f2f4c5a..ea0519d 100644 (file)
--- a/test/conf/hmac_sha1_long_key_access.conf
+++ b/test/conf/hmac_sha1_long_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
-HMAC_DIGEST_TYPE:   sha1;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
+HMAC_DIGEST_TYPE        sha1
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_sha1_short_key_access.conf b/test/conf/hmac_sha1_short_key_access.conf
index 76000dd..70da655 100644 (file)
--- a/test/conf/hmac_sha1_short_key_access.conf
+++ b/test/conf/hmac_sha1_short_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    QQBwGf0bkZmBUA==
-HMAC_DIGEST_TYPE:   sha1;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         QQBwGf0bkZmBUA==
+HMAC_DIGEST_TYPE        sha1
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_sha256_access.conf b/test/conf/hmac_sha256_access.conf
index a1d4770..bdd8bfc 100644 (file)
--- a/test/conf/hmac_sha256_access.conf
+++ b/test/conf/hmac_sha256_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
-HMAC_DIGEST_TYPE:   sha256;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                      ANY
+KEY_BASE64                  wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64             d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
+HMAC_DIGEST_TYPE            sha256
+FW_ACCESS_TIMEOUT           3

diff --git a/test/conf/hmac_sha256_long_key_access.conf b/test/conf/hmac_sha256_long_key_access.conf
index a1d4770..9b95c03 100644 (file)
--- a/test/conf/hmac_sha256_long_key_access.conf
+++ b/test/conf/hmac_sha256_long_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
-HMAC_DIGEST_TYPE:   sha256;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
+HMAC_DIGEST_TYPE        sha256
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_sha256_open_ports_access.conf b/test/conf/hmac_sha256_open_ports_access.conf
index 979c04c..9c9ae0c 100644 (file)
--- a/test/conf/hmac_sha256_open_ports_access.conf
+++ b/test/conf/hmac_sha256_open_ports_access.conf
@@ -1,6 +1,6 @@
-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;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
-HMAC_DIGEST_TYPE:   sha256;
-FW_ACCESS_TIMEOUT:  3;
+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
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
+HMAC_DIGEST_TYPE        sha256
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_sha256_short_key_access.conf b/test/conf/hmac_sha256_short_key_access.conf
index a1d4770..9b95c03 100644 (file)
--- a/test/conf/hmac_sha256_short_key_access.conf
+++ b/test/conf/hmac_sha256_short_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
-HMAC_DIGEST_TYPE:   sha256;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
+HMAC_DIGEST_TYPE        sha256
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_sha384_access.conf b/test/conf/hmac_sha384_access.conf
index b491b65..23af245 100644 (file)
--- a/test/conf/hmac_sha384_access.conf
+++ b/test/conf/hmac_sha384_access.conf
@@ -1,5 +1,5 @@
-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;
+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/conf/hmac_sha384_long_key_access.conf b/test/conf/hmac_sha384_long_key_access.conf
index a1f5287..998f14b 100644 (file)
--- a/test/conf/hmac_sha384_long_key_access.conf
+++ b/test/conf/hmac_sha384_long_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    QrsLAq6NWmPKBiDF4dwfAUDz7XsTz7lgVNFyBsRhDzgBc9HCN6j5s1NaLu7D2gG7AcawOwt3GHtwmbcQqY2I5FkgrCg4rfO4kIj9w835WGka5RgXovbcGTO06MWOcijsB6WS9FRlZNENMLKPM2KjKjtYMxrZrAYjOrLmKYd5EPI=
-HMAC_DIGEST_TYPE:   sha384;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         QrsLAq6NWmPKBiDF4dwfAUDz7XsTz7lgVNFyBsRhDzgBc9HCN6j5s1NaLu7D2gG7AcawOwt3GHtwmbcQqY2I5FkgrCg4rfO4kIj9w835WGka5RgXovbcGTO06MWOcijsB6WS9FRlZNENMLKPM2KjKjtYMxrZrAYjOrLmKYd5EPI=
+HMAC_DIGEST_TYPE        sha384
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_sha384_short_key_access.conf b/test/conf/hmac_sha384_short_key_access.conf
index 04e3a21..31b9872 100644 (file)
--- a/test/conf/hmac_sha384_short_key_access.conf
+++ b/test/conf/hmac_sha384_short_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    QQBwGf0bkZmBUA==
-HMAC_DIGEST_TYPE:   sha384;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                      ANY
+KEY_BASE64                  wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64             QQBwGf0bkZmBUA==
+HMAC_DIGEST_TYPE            sha384
+FW_ACCESS_TIMEOUT           3

diff --git a/test/conf/hmac_sha512_access.conf b/test/conf/hmac_sha512_access.conf
index 6a5bf9f..f996e15 100644 (file)
--- a/test/conf/hmac_sha512_access.conf
+++ b/test/conf/hmac_sha512_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
-HMAC_DIGEST_TYPE:   sha512;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                      ANY
+KEY_BASE64                  wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64             d6F/uWTZmjqYorNkEKWl3TnVUiRNTCFijv3RclV+p8K0T5mU3co9Lz/hlDU/RxwFXLdDQGWEzRTk7O+8G59aVOEHUIME95KdrALQf2z4sLjsrNzOZdjfZVYRpcp1rYRsAdJmeT7K0G5B2WKmI8t6srwPVQJty9CDn6pAqqg6Oek=
+HMAC_DIGEST_TYPE            sha512
+FW_ACCESS_TIMEOUT           3

diff --git a/test/conf/hmac_sha512_long_key_access.conf b/test/conf/hmac_sha512_long_key_access.conf
index 5f9cd6b..c8b5ab0 100644 (file)
--- a/test/conf/hmac_sha512_long_key_access.conf
+++ b/test/conf/hmac_sha512_long_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==
-HMAC_DIGEST_TYPE:   sha512;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                      ANY
+KEY_BASE64                  wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64             QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQQ==
+HMAC_DIGEST_TYPE            sha512
+FW_ACCESS_TIMEOUT           3

diff --git a/test/conf/hmac_sha512_short_key2_access.conf b/test/conf/hmac_sha512_short_key2_access.conf
index ef5827d..8713132 100644 (file)
--- a/test/conf/hmac_sha512_short_key2_access.conf
+++ b/test/conf/hmac_sha512_short_key2_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         dGVzdGtleTE=
-HMAC_KEY_BASE64:    dGVzdGtleTI=
-HMAC_DIGEST_TYPE:   sha512;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              dGVzdGtleTE=
+HMAC_KEY_BASE64         dGVzdGtleTI=
+HMAC_DIGEST_TYPE        sha512
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_sha512_short_key_access.conf b/test/conf/hmac_sha512_short_key_access.conf
index 024c4a2..2da8741 100644 (file)
--- a/test/conf/hmac_sha512_short_key_access.conf
+++ b/test/conf/hmac_sha512_short_key_access.conf
@@ -1,5 +1,5 @@
-SOURCE: ANY;
-KEY_BASE64:         wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
-HMAC_KEY_BASE64:    Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
-HMAC_DIGEST_TYPE:   sha512;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              wzNP62oPPgEc+kXDPQLHPOayQBuNbYUTPP+QrErNDmg=
+HMAC_KEY_BASE64         Yh+xizBnl6FotC5ec7FanVGClRMlsOAPh2u6eovnerfBVKwaVKzjGoblFMHMc593TNyi0dWn4opLoTIV9q/ttg==
+HMAC_DIGEST_TYPE        sha512
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/hmac_simple_keys_access.conf b/test/conf/hmac_simple_keys_access.conf
index b9993a1..6e88765 100644 (file)
--- a/test/conf/hmac_simple_keys_access.conf
+++ b/test/conf/hmac_simple_keys_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY_BASE64:         dGVzdA==
-HMAC_KEY_BASE64:    dGVzdHRlc3Q=
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY_BASE64              dGVzdA==
+HMAC_KEY_BASE64         dGVzdHRlc3Q=
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/invalid_expire_access.conf b/test/conf/invalid_expire_access.conf
index 2dd3d24..06c4f6b 100644 (file)
--- a/test/conf/invalid_expire_access.conf
+++ b/test/conf/invalid_expire_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ACCESS_EXPIRE: 3-10-01;  ### / separators required
+SOURCE                  ANY
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3
+ACCESS_EXPIRE           3-10-01;  ### / separators required

diff --git a/test/conf/invalid_source_access.conf b/test/conf/invalid_source_access.conf
index 81fa72f..771726f 100644 (file)
--- a/test/conf/invalid_source_access.conf
+++ b/test/conf/invalid_source_access.conf
@@ -1,6 +1,6 @@
-SOURCE :ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-SOURCE: ANY;
-KEY: fwknoptest2;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  :ANY
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3
+SOURCE                  ANY
+KEY                     fwknoptest2
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/ip_source_match_access.conf b/test/conf/ip_source_match_access.conf
index 39dd421..5df1ff8 100644 (file)
--- a/test/conf/ip_source_match_access.conf
+++ b/test/conf/ip_source_match_access.conf
@@ -1,3 +1,3 @@
-SOURCE: 127.0.0.1;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  127.0.0.1
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/legacy_iv_access.conf b/test/conf/legacy_iv_access.conf
index bbe1f55..075a757 100644 (file)
--- a/test/conf/legacy_iv_access.conf
+++ b/test/conf/legacy_iv_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ENCRYPTION_MODE: legacy;
+SOURCE                  ANY
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3
+ENCRYPTION_MODE         legacy

diff --git a/test/conf/mismatch_open_ports_access.conf b/test/conf/mismatch_open_ports_access.conf
index 7e84a1b..3d4deb1 100644 (file)
--- a/test/conf/mismatch_open_ports_access.conf
+++ b/test/conf/mismatch_open_ports_access.conf
@@ -1,4 +1,4 @@
-SOURCE: 4.3.2.0/24, 127.0.0.0/24, 23.43.0.0/16, 10.10.10.10;
-OPEN_PORTS: tcp/1234, udp/6001, tcp/80;
-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
+OPEN_PORTS                  tcp/1234, udp/6001, tcp/80
+KEY                         fwknoptest
+FW_ACCESS_TIMEOUT           3

diff --git a/test/conf/mismatch_user_access.conf b/test/conf/mismatch_user_access.conf
index fd2ae8a..1326af3 100644 (file)
--- a/test/conf/mismatch_user_access.conf
+++ b/test/conf/mismatch_user_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-REQUIRE_USERNAME: nouser;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY                     fwknoptest
+REQUIRE_USERNAME        nouser
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/multi_gpg_access.conf b/test/conf/multi_gpg_access.conf
index bb67cee..240adf6 100644 (file)
--- a/test/conf/multi_gpg_access.conf
+++ b/test/conf/multi_gpg_access.conf
@@ -1,7 +1,7 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-GPG_HOME_DIR: conf/server-gpg;
-GPG_DECRYPT_ID: 12341234, DEADBEEF, 361BBAD4, 43214321;
-GPG_DECRYPT_PW: fwknoptest;
-GPG_REMOTE_ID: 6A3FAD56;
+SOURCE                      ANY
+KEY                         fwknoptest
+FW_ACCESS_TIMEOUT           3
+GPG_HOME_DIR                conf/server-gpg
+GPG_DECRYPT_ID              12341234, DEADBEEF, 361BBAD4, 43214321
+GPG_DECRYPT_PW              fwknoptest
+GPG_REMOTE_ID               6A3FAD56

diff --git a/test/conf/multi_gpg_no_pw_access.conf b/test/conf/multi_gpg_no_pw_access.conf
index e1bf429..5f70bcf 100644 (file)
--- a/test/conf/multi_gpg_no_pw_access.conf
+++ b/test/conf/multi_gpg_no_pw_access.conf
@@ -1,7 +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;
+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

diff --git a/test/conf/multi_source_match_access.conf b/test/conf/multi_source_match_access.conf
index 6d6e3fc..8864a57 100644 (file)
--- a/test/conf/multi_source_match_access.conf
+++ b/test/conf/multi_source_match_access.conf
@@ -1,3 +1,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, 127.0.0.0/24, 23.43.0.0/16, 10.10.10.10
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/multi_stanzas_access.conf b/test/conf/multi_stanzas_access.conf
index 8087e5d..5df998f 100644 (file)
--- a/test/conf/multi_stanzas_access.conf
+++ b/test/conf/multi_stanzas_access.conf
@@ -1,12 +1,12 @@
-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;
+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/conf/no_multi_source_match_access.conf b/test/conf/no_multi_source_match_access.conf
index c8d9415..aaacd38 100644 (file)
--- a/test/conf/no_multi_source_match_access.conf
+++ b/test/conf/no_multi_source_match_access.conf
@@ -1,3 +1,3 @@
-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;
+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/conf/no_source_match_access.conf b/test/conf/no_source_match_access.conf
index a954ce1..4488bea 100644 (file)
--- a/test/conf/no_source_match_access.conf
+++ b/test/conf/no_source_match_access.conf
@@ -1,3 +1,3 @@
-SOURCE: 4.3.2.1;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  4.3.2.1
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/no_subnet_source_match_access.conf b/test/conf/no_subnet_source_match_access.conf
index f95c732..a3bbe4f 100644 (file)
--- a/test/conf/no_subnet_source_match_access.conf
+++ b/test/conf/no_subnet_source_match_access.conf
@@ -1,3 +1,3 @@
-SOURCE: 4.3.2.0/24;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  4.3.2.0/24
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/ofb_mode_access.conf b/test/conf/ofb_mode_access.conf
index 2ebc238..6136665 100644 (file)
--- a/test/conf/ofb_mode_access.conf
+++ b/test/conf/ofb_mode_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
-ENCRYPTION_MODE: OFB;
+SOURCE                      ANY
+KEY                         fwknoptest
+FW_ACCESS_TIMEOUT           3
+ENCRYPTION_MODE             OFB

diff --git a/test/conf/open_ports_access.conf b/test/conf/open_ports_access.conf
index 52150f7..af224a1 100644 (file)
--- a/test/conf/open_ports_access.conf
+++ b/test/conf/open_ports_access.conf
@@ -1,4 +1,4 @@
-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;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
+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
+KEY                         fwknoptest
+FW_ACCESS_TIMEOUT           3

diff --git a/test/conf/require_src_access.conf b/test/conf/require_src_access.conf
index 384dc1e..ff3b5ff 100644 (file)
--- a/test/conf/require_src_access.conf
+++ b/test/conf/require_src_access.conf
@@ -1,5 +1,5 @@
-SOURCE: 4.3.2.0/24, 127.0.0.0/24, 23.43.0.0/16, 10.10.10.10;
-OPEN_PORTS: udp/6001, tcp/22, tcp/80;
-REQUIRE_SOURCE_ADDRESS: Y;
-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
+OPEN_PORTS                  udp/6001, tcp/22, tcp/80
+REQUIRE_SOURCE_ADDRESS      Y
+KEY                         fwknoptest
+FW_ACCESS_TIMEOUT           3

diff --git a/test/conf/require_user_access.conf b/test/conf/require_user_access.conf
index b0af911..456b4b5 100644 (file)
--- a/test/conf/require_user_access.conf
+++ b/test/conf/require_user_access.conf
@@ -1,4 +1,4 @@
-SOURCE: ANY;
-KEY: fwknoptest;
-REQUIRE_USERNAME: testuser;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  ANY
+KEY                     fwknoptest
+REQUIRE_USERNAME        testuser
+FW_ACCESS_TIMEOUT       3

diff --git a/test/conf/subnet_source_match_access.conf b/test/conf/subnet_source_match_access.conf
index 11809fc..1caf63b 100644 (file)
--- a/test/conf/subnet_source_match_access.conf
+++ b/test/conf/subnet_source_match_access.conf
@@ -1,3 +1,3 @@
-SOURCE: 127.0.0.0/24;
-KEY: fwknoptest;
-FW_ACCESS_TIMEOUT:  3;
+SOURCE                  127.0.0.0/24
+KEY                     fwknoptest
+FW_ACCESS_TIMEOUT       3