tls: organize tls tests into folders

diff --git a/tests/tls/test.yaml b/tests/tls/tls-cert-issuer/test.yaml
similarity index 100%
rename from tests/tls/test.yaml
rename to tests/tls/tls-cert-issuer/test.yaml

diff --git a/tests/tls/tls.pcap b/tests/tls/tls-cert-issuer/tls.pcap
similarity index 100%
rename from tests/tls/tls.pcap
rename to tests/tls/tls-cert-issuer/tls.pcap

diff --git a/tests/tls/tls.rules b/tests/tls/tls-cert-issuer/tls.rules
similarity index 100%
rename from tests/tls/tls.rules
rename to tests/tls/tls-cert-issuer/tls.rules

diff --git a/tests/tls-certs-alert/input.pcap b/tests/tls/tls-certs-alert/input.pcap
similarity index 100%
rename from tests/tls-certs-alert/input.pcap
rename to tests/tls/tls-certs-alert/input.pcap

diff --git a/tests/tls-certs-alert/suricata.yaml b/tests/tls/tls-certs-alert/suricata.yaml
similarity index 100%
rename from tests/tls-certs-alert/suricata.yaml
rename to tests/tls/tls-certs-alert/suricata.yaml

diff --git a/tests/tls-certs-alert/test.rules b/tests/tls/tls-certs-alert/test.rules
similarity index 100%
rename from tests/tls-certs-alert/test.rules
rename to tests/tls/tls-certs-alert/test.rules

diff --git a/tests/tls-certs-alert/test.yaml b/tests/tls/tls-certs-alert/test.yaml
similarity index 100%
rename from tests/tls-certs-alert/test.yaml
rename to tests/tls/tls-certs-alert/test.yaml

diff --git a/tests/tls-client-hello-frag-01/dump_mtu300.pcap b/tests/tls/tls-client-hello-frag-01/dump_mtu300.pcap
similarity index 100%
rename from tests/tls-client-hello-frag-01/dump_mtu300.pcap
rename to tests/tls/tls-client-hello-frag-01/dump_mtu300.pcap

diff --git a/tests/tls-client-hello-frag-01/test.rules b/tests/tls/tls-client-hello-frag-01/test.rules
similarity index 100%
rename from tests/tls-client-hello-frag-01/test.rules
rename to tests/tls/tls-client-hello-frag-01/test.rules

diff --git a/tests/tls-client-hello-frag-01/test.yaml b/tests/tls/tls-client-hello-frag-01/test.yaml
similarity index 100%
rename from tests/tls-client-hello-frag-01/test.yaml
rename to tests/tls/tls-client-hello-frag-01/test.yaml

diff --git a/tests/tls-fingerprint-alert/input.pcap b/tests/tls/tls-fingerprint-alert/input.pcap
similarity index 100%
rename from tests/tls-fingerprint-alert/input.pcap
rename to tests/tls/tls-fingerprint-alert/input.pcap

diff --git a/tests/tls-fingerprint-alert/suricata.yaml b/tests/tls/tls-fingerprint-alert/suricata.yaml
similarity index 89%
rename from tests/tls-fingerprint-alert/suricata.yaml
rename to tests/tls/tls-fingerprint-alert/suricata.yaml
index 25009ca311d6612a7c01b7940c49f91edde84ca1..a2693fcfd5a321c7c53022b236ec99f039af1f55 100644 (file)
--- a/tests/tls-fingerprint-alert/suricata.yaml
+++ b/tests/tls/tls-fingerprint-alert/suricata.yaml
@@ -1,8 +1,6 @@
 %YAML 1.1
 ---
 
-include: ../../etc/suricata-3.1.2.yaml
-
 outputs:
   - eve-log:
       enabled: yes

diff --git a/tests/tls-fingerprint-alert/test.rules b/tests/tls/tls-fingerprint-alert/test.rules
similarity index 100%
rename from tests/tls-fingerprint-alert/test.rules
rename to tests/tls/tls-fingerprint-alert/test.rules

diff --git a/tests/tls-fingerprint-alert/test.yaml b/tests/tls/tls-fingerprint-alert/test.yaml
similarity index 100%
rename from tests/tls-fingerprint-alert/test.yaml
rename to tests/tls/tls-fingerprint-alert/test.yaml

diff --git a/tests/tls-ja3s/input.pcap b/tests/tls/tls-ja3s/input.pcap
similarity index 100%
rename from tests/tls-ja3s/input.pcap
rename to tests/tls/tls-ja3s/input.pcap

diff --git a/tests/tls-ja3s/suricata.yaml b/tests/tls/tls-ja3s/suricata.yaml
similarity index 100%
rename from tests/tls-ja3s/suricata.yaml
rename to tests/tls/tls-ja3s/suricata.yaml

diff --git a/tests/tls-ja3s/test-ja3s-hash.lua b/tests/tls/tls-ja3s/test-ja3s-hash.lua
similarity index 100%
rename from tests/tls-ja3s/test-ja3s-hash.lua
rename to tests/tls/tls-ja3s/test-ja3s-hash.lua

diff --git a/tests/tls-ja3s/test-ja3s-string.lua b/tests/tls/tls-ja3s/test-ja3s-string.lua
similarity index 100%
rename from tests/tls-ja3s/test-ja3s-string.lua
rename to tests/tls/tls-ja3s/test-ja3s-string.lua

diff --git a/tests/tls-ja3s/test.rules b/tests/tls/tls-ja3s/test.rules
similarity index 100%
rename from tests/tls-ja3s/test.rules
rename to tests/tls/tls-ja3s/test.rules

diff --git a/tests/tls-ja3s/test.yaml b/tests/tls/tls-ja3s/test.yaml
similarity index 100%
rename from tests/tls-ja3s/test.yaml
rename to tests/tls/tls-ja3s/test.yaml

diff --git a/tests/tls-json-output-ids/input.pcap b/tests/tls/tls-json-output-ids/input.pcap
similarity index 100%
rename from tests/tls-json-output-ids/input.pcap
rename to tests/tls/tls-json-output-ids/input.pcap

diff --git a/tests/tls-json-output-ids/suricata.yaml b/tests/tls/tls-json-output-ids/suricata.yaml
similarity index 86%
rename from tests/tls-json-output-ids/suricata.yaml
rename to tests/tls/tls-json-output-ids/suricata.yaml
index 9ea9c3f36a8d0921c8ca4ee60fa9cc6f1e6ece4d..a393d89e3be7d4e52408c65b7b9586acbc448248 100644 (file)
--- a/tests/tls-json-output-ids/suricata.yaml
+++ b/tests/tls/tls-json-output-ids/suricata.yaml
@@ -1,7 +1,6 @@
 %YAML 1.1
 ---
 
-include: ../../etc/suricata-3.1.2.yaml
 
 outputs:
   - eve-log:

diff --git a/tests/tls-json-output-ids/test.yaml b/tests/tls/tls-json-output-ids/test.yaml
similarity index 100%
rename from tests/tls-json-output-ids/test.yaml
rename to tests/tls/tls-json-output-ids/test.yaml

diff --git a/tests/tls-json-output-ips/input.pcap b/tests/tls/tls-json-output-ips/input.pcap
similarity index 100%
rename from tests/tls-json-output-ips/input.pcap
rename to tests/tls/tls-json-output-ips/input.pcap

diff --git a/tests/tls-json-output-ips/suricata.yaml b/tests/tls/tls-json-output-ips/suricata.yaml
similarity index 86%
rename from tests/tls-json-output-ips/suricata.yaml
rename to tests/tls/tls-json-output-ips/suricata.yaml
index 9ea9c3f36a8d0921c8ca4ee60fa9cc6f1e6ece4d..a039d98fcb7a33f182f1b0ce9a013fd074dd3f73 100644 (file)
--- a/tests/tls-json-output-ips/suricata.yaml
+++ b/tests/tls/tls-json-output-ips/suricata.yaml
@@ -1,8 +1,6 @@
 %YAML 1.1
 ---
 
-include: ../../etc/suricata-3.1.2.yaml
-
 outputs:
   - eve-log:
       enabled: yes

diff --git a/tests/tls-json-output-ips/test.yaml b/tests/tls/tls-json-output-ips/test.yaml
similarity index 100%
rename from tests/tls-json-output-ips/test.yaml
rename to tests/tls/tls-json-output-ips/test.yaml

diff --git a/tests/tls-pre-1970/README.md b/tests/tls/tls-pre-1970/README.md
similarity index 100%
rename from tests/tls-pre-1970/README.md
rename to tests/tls/tls-pre-1970/README.md

diff --git a/tests/tls-pre-1970/input.pcap b/tests/tls/tls-pre-1970/input.pcap
similarity index 100%
rename from tests/tls-pre-1970/input.pcap
rename to tests/tls/tls-pre-1970/input.pcap

diff --git a/tests/tls-pre-1970/test.yaml b/tests/tls/tls-pre-1970/test.yaml
similarity index 100%
rename from tests/tls-pre-1970/test.yaml
rename to tests/tls/tls-pre-1970/test.yaml

diff --git a/tests/tls-random/README b/tests/tls/tls-random/README
similarity index 89%
rename from tests/tls-random/README
rename to tests/tls/tls-random/README
index c85986c636606f86b04624da783ac0376c7717d8..52cdf8eef91dff15e26685e4cba234ad00736ff7 100644 (file)
--- a/tests/tls-random/README
+++ b/tests/tls/tls-random/README
@@ -9,7 +9,7 @@ the TLS `random` field.
 
 PCAP
 ====
-PCAP comes from an [existing TLS test](https://github.com/OISF/suricata-verify/blob/master/tests/tls/tls.pcap)
+PCAP comes from an [existing TLS test](https://github.com/OISF/suricata-verify/blob/master/tests/tls/tls-cert-issuer/tls.pcap)
 
 Redmine ticket
 ==============

diff --git a/tests/tls-random/input.pcap b/tests/tls/tls-random/input.pcap
similarity index 100%
rename from tests/tls-random/input.pcap
rename to tests/tls/tls-random/input.pcap

diff --git a/tests/tls-random/test.rules b/tests/tls/tls-random/test.rules
similarity index 100%
rename from tests/tls-random/test.rules
rename to tests/tls/tls-random/test.rules

diff --git a/tests/tls-random/test.yaml b/tests/tls/tls-random/test.yaml
similarity index 100%
rename from tests/tls-random/test.yaml
rename to tests/tls/tls-random/test.yaml

diff --git a/tests/tls13-draft14/README.md b/tests/tls/tls13-draft14/README.md
similarity index 100%
rename from tests/tls13-draft14/README.md
rename to tests/tls/tls13-draft14/README.md

diff --git a/tests/tls13-draft14/suricata.yaml b/tests/tls/tls13-draft14/suricata.yaml
similarity index 100%
rename from tests/tls13-draft14/suricata.yaml
rename to tests/tls/tls13-draft14/suricata.yaml

diff --git a/tests/tls13-draft14/test.yaml b/tests/tls/tls13-draft14/test.yaml
similarity index 100%
rename from tests/tls13-draft14/test.yaml
rename to tests/tls/tls13-draft14/test.yaml

diff --git a/tests/tls13-draft14/tls13_draft14.pcap b/tests/tls/tls13-draft14/tls13_draft14.pcap
similarity index 100%
rename from tests/tls13-draft14/tls13_draft14.pcap
rename to tests/tls/tls13-draft14/tls13_draft14.pcap

diff --git a/tests/tls13-draft18/README.md b/tests/tls/tls13-draft18/README.md
similarity index 100%
rename from tests/tls13-draft18/README.md
rename to tests/tls/tls13-draft18/README.md

diff --git a/tests/tls13-draft18/suricata.yaml b/tests/tls/tls13-draft18/suricata.yaml
similarity index 100%
rename from tests/tls13-draft18/suricata.yaml
rename to tests/tls/tls13-draft18/suricata.yaml

diff --git a/tests/tls13-draft18/test.yaml b/tests/tls/tls13-draft18/test.yaml
similarity index 100%
rename from tests/tls13-draft18/test.yaml
rename to tests/tls/tls13-draft18/test.yaml

diff --git a/tests/tls13-draft18/tls13_draft18.pcap b/tests/tls/tls13-draft18/tls13_draft18.pcap
similarity index 100%
rename from tests/tls13-draft18/tls13_draft18.pcap
rename to tests/tls/tls13-draft18/tls13_draft18.pcap

diff --git a/tests/tls13-draft19/README.md b/tests/tls/tls13-draft19/README.md
similarity index 100%
rename from tests/tls13-draft19/README.md
rename to tests/tls/tls13-draft19/README.md

diff --git a/tests/tls13-draft19/suricata.yaml b/tests/tls/tls13-draft19/suricata.yaml
similarity index 100%
rename from tests/tls13-draft19/suricata.yaml
rename to tests/tls/tls13-draft19/suricata.yaml

diff --git a/tests/tls13-draft19/test.yaml b/tests/tls/tls13-draft19/test.yaml
similarity index 100%
rename from tests/tls13-draft19/test.yaml
rename to tests/tls/tls13-draft19/test.yaml

diff --git a/tests/tls13-draft19/tls13_draft19.pcap b/tests/tls/tls13-draft19/tls13_draft19.pcap
similarity index 100%
rename from tests/tls13-draft19/tls13_draft19.pcap
rename to tests/tls/tls13-draft19/tls13_draft19.pcap

diff --git a/tests/tls13-draft22/README.md b/tests/tls/tls13-draft22/README.md
similarity index 100%
rename from tests/tls13-draft22/README.md
rename to tests/tls/tls13-draft22/README.md

diff --git a/tests/tls13-draft22/suricata.yaml b/tests/tls/tls13-draft22/suricata.yaml
similarity index 100%
rename from tests/tls13-draft22/suricata.yaml
rename to tests/tls/tls13-draft22/suricata.yaml

diff --git a/tests/tls13-draft22/test.yaml b/tests/tls/tls13-draft22/test.yaml
similarity index 100%
rename from tests/tls13-draft22/test.yaml
rename to tests/tls/tls13-draft22/test.yaml

diff --git a/tests/tls13-draft22/tls13_draft22.pcap b/tests/tls/tls13-draft22/tls13_draft22.pcap
similarity index 100%
rename from tests/tls13-draft22/tls13_draft22.pcap
rename to tests/tls/tls13-draft22/tls13_draft22.pcap

diff --git a/tests/tls13-draft23/README.md b/tests/tls/tls13-draft23/README.md
similarity index 100%
rename from tests/tls13-draft23/README.md
rename to tests/tls/tls13-draft23/README.md

diff --git a/tests/tls13-draft23/suricata.yaml b/tests/tls/tls13-draft23/suricata.yaml
similarity index 100%
rename from tests/tls13-draft23/suricata.yaml
rename to tests/tls/tls13-draft23/suricata.yaml

diff --git a/tests/tls13-draft23/test.yaml b/tests/tls/tls13-draft23/test.yaml
similarity index 100%
rename from tests/tls13-draft23/test.yaml
rename to tests/tls/tls13-draft23/test.yaml

diff --git a/tests/tls13-draft23/tls13_draft23.pcap b/tests/tls/tls13-draft23/tls13_draft23.pcap
similarity index 100%
rename from tests/tls13-draft23/tls13_draft23.pcap
rename to tests/tls/tls13-draft23/tls13_draft23.pcap

diff --git a/tests/tls13-draft28-frames/README.md b/tests/tls/tls13-draft28-frames/README.md
similarity index 100%
rename from tests/tls13-draft28-frames/README.md
rename to tests/tls/tls13-draft28-frames/README.md

diff --git a/tests/tls13-draft28-frames/suricata.yaml b/tests/tls/tls13-draft28-frames/suricata.yaml
similarity index 100%
rename from tests/tls13-draft28-frames/suricata.yaml
rename to tests/tls/tls13-draft28-frames/suricata.yaml

diff --git a/tests/tls13-draft28-frames/test.rules b/tests/tls/tls13-draft28-frames/test.rules
similarity index 100%
rename from tests/tls13-draft28-frames/test.rules
rename to tests/tls/tls13-draft28-frames/test.rules

diff --git a/tests/tls13-draft28-frames/test.yaml b/tests/tls/tls13-draft28-frames/test.yaml
similarity index 100%
rename from tests/tls13-draft28-frames/test.yaml
rename to tests/tls/tls13-draft28-frames/test.yaml

diff --git a/tests/tls13-draft28-frames/tls13_draft28.pcap b/tests/tls/tls13-draft28-frames/tls13_draft28.pcap
similarity index 100%
rename from tests/tls13-draft28-frames/tls13_draft28.pcap
rename to tests/tls/tls13-draft28-frames/tls13_draft28.pcap

diff --git a/tests/tls13-draft28/README.md b/tests/tls/tls13-draft28/README.md
similarity index 100%
rename from tests/tls13-draft28/README.md
rename to tests/tls/tls13-draft28/README.md

diff --git a/tests/tls13-draft28/suricata.yaml b/tests/tls/tls13-draft28/suricata.yaml
similarity index 100%
rename from tests/tls13-draft28/suricata.yaml
rename to tests/tls/tls13-draft28/suricata.yaml

diff --git a/tests/tls13-draft28/test.yaml b/tests/tls/tls13-draft28/test.yaml
similarity index 100%
rename from tests/tls13-draft28/test.yaml
rename to tests/tls/tls13-draft28/test.yaml

diff --git a/tests/tls13-draft28/tls13_draft28.pcap b/tests/tls/tls13-draft28/tls13_draft28.pcap
similarity index 100%
rename from tests/tls13-draft28/tls13_draft28.pcap
rename to tests/tls/tls13-draft28/tls13_draft28.pcap