From 51495be80d3c0ba8906615eaf3baccd3cfff607e Mon Sep 17 00:00:00 2001 From: Cas Cremers Date: Thu, 15 Nov 2012 16:47:08 +0100 Subject: [PATCH] Cleanup and restructuring of testing directory setup. --- README.md | 2 +- {testing/protocols => gui/Protocols}/Demo/ns3.spdl | 0 {testing/protocols => gui/Protocols}/Demo/nsl3-broken.spdl | 0 .../protocols => gui/Protocols}/Demo/nsl3-updated-both.spdl | 0 {testing/protocols => gui/Protocols}/Demo/nsl3.spdl | 0 .../Protocols/multi-NSL}/heuristics-results.txt | 0 .../multiparty => gui/Protocols/multi-NSL}/mnsl-results.txt | 0 .../Protocols/multi-NSL}/multinsl-generator.py | 0 .../multiparty => gui/Protocols/multi-NSL}/test-heuristics.py | 0 .../multiparty => gui/Protocols/multi-NSL}/test-variants.py | 0 testing/{protocols/misc => }/2r890-ex3-a.spdl | 0 testing/{protocols/misc => }/2r890-ex3-b.spdl | 0 testing/{protocols/misc => }/README.txt | 0 testing/{protocols/misc => }/andrew-ban.spdl | 0 testing/{protocols/misc => }/andrew-lowe-ban.spdl | 0 testing/{protocols/misc => }/athena-breaker.spdl | 0 testing/{protocols/misc => }/bke-broken.spdl | 0 testing/{protocols/misc => }/bke-one.spdl | 0 testing/{protocols/misc => }/bke-variation.spdl | 0 testing/{protocols/misc => }/bke.spdl | 0 testing/{protocols/misc => }/bkepk-ce.spdl | 0 testing/{protocols/misc => }/bkepk-ce2.spdl | 0 testing/{protocols/misc => }/boyd-nsl-fix.spdl | 0 testing/{protocols/misc => }/boyd.spdl | 0 testing/{protocols/misc => }/broken1.spdl | 0 testing/{protocols/misc => }/bunava-1-3.spdl | 0 testing/{protocols/misc => }/bunava-1-4.spdl | 0 testing/{protocols/misc => }/bunava-2-3.spdl | 0 testing/{protocols/misc => }/bunava-2-4.spdl | 0 testing/{protocols/misc => }/carkey-broken-limited.spdl | 0 testing/{protocols/misc => }/carkey-broken.spdl | 0 testing/{protocols/misc => }/carkey-ni.spdl | 0 testing/{protocols/misc => }/carkey-ni2.spdl | 0 testing/{protocols/misc => }/ccitt509-ban.spdl | 0 .../{protocols/misc => }/compositionality-examples/th-1.spdl | 0 .../misc => }/compositionality-examples/th-1par2.spdl | 0 .../misc => }/compositionality-examples/th-1seq2-rename-ni.spdl | 0 .../misc => }/compositionality-examples/th-1seq2-rename-nr.spdl | 0 .../misc => }/compositionality-examples/th-1seq2.spdl | 0 .../{protocols/misc => }/compositionality-examples/th-2.spdl | 0 testing/{protocols/misc => }/denning-sacco-shared.spdl | 0 testing/{protocols/misc => }/f4.spdl | 0 testing/{protocols/misc => }/f5.spdl | 0 testing/{protocols/misc => }/ffgg_n/ffgg_n.py | 0 testing/{protocols/misc => }/five-run-bound.spdl | 0 testing/{protocols/misc => }/fourway-HSDDM05.cpp | 0 testing/{protocols/misc => }/fourway-HSDDM05.spdl | 0 testing/{protocols/misc => }/gong-nonce-b.spdl | 0 testing/{protocols/misc => }/gong-nonce.spdl | 0 testing/{protocols/misc => }/helloworld.spdl | 0 testing/{protocols/misc => }/ibe-ns.spdl | 0 testing/{protocols/misc => }/ibe.spdl | 0 testing/{protocols/misc => }/isoiec11770-2-13.spdl | 0 testing/{protocols/misc => }/kaochow-palm.spdl | 0 testing/{protocols/misc => }/kaochow-v2.spdl | 0 testing/{protocols/misc => }/kaochow-v3.spdl | 0 testing/{protocols/misc => }/kaochow.spdl | 0 testing/{protocols/misc => }/kerberos-rddm.spdl | 0 testing/{protocols/misc => }/ksl.spdl | 0 testing/{protocols/misc => }/localclaims-breaker.spdl | 0 testing/{protocols/misc => }/localclaims-seq1.spdl | 0 testing/{protocols/misc => }/localclaims.spdl | 0 testing/{protocols/misc => }/ns-symmetric-amended.spdl | 0 testing/{protocols/misc => }/ns-symmetric.spdl | 0 testing/{protocols/misc => }/ns3-brutus.spdl | 0 testing/{protocols/misc => }/ns3.spdl | 0 testing/{protocols/misc => }/nsl3-nisynch-rep.spdl | 0 testing/{protocols/misc => }/nsl3.spdl | 0 testing/{protocols/misc => }/nst1.spdl | 0 testing/{protocols/misc => }/nst2.spdl | 0 testing/{protocols/misc => }/onetrace.spdl | 0 testing/{protocols/misc => }/otwayrees.spdl | 0 testing/{protocols/misc => }/protocol-list.txt | 0 testing/{protocols/misc => }/samasc-broken.spdl | 0 testing/{protocols/misc => }/simplest.spdl | 0 testing/{protocols/misc => }/soph-keyexch.spdl | 0 testing/{protocols/misc => }/soph.spdl | 0 testing/{protocols/misc => }/spdl-defaults.inc | 0 testing/{protocols/misc => }/spdl-intruder.inc | 0 testing/{protocols/misc => }/speedtest.spdl | 0 testing/{protocols/misc => }/splice-as-hc-cj.spdl | 0 testing/{protocols/misc => }/splice-as-hc.spdl | 0 testing/{protocols/misc => }/splice-as.spdl | 0 testing/{protocols/misc => }/tls/tls-BM-1.m4 | 0 testing/{protocols/misc => }/tls/tls-BM-1.spdl | 0 testing/{protocols/misc => }/tls/tls-HSDDM05-2.cpp | 0 testing/{protocols/misc => }/tls/tls-HSDDM05-2.spdl | 0 testing/{protocols/misc => }/tls/tls-HSDDM05-fix.cpp | 0 testing/{protocols/misc => }/tls/tls-HSDDM05-fix.m4 | 0 testing/{protocols/misc => }/tls/tls-HSDDM05-fix.spdl | 0 testing/{protocols/misc => }/tls/tls-HSDDM05.cpp | 0 testing/{protocols/misc => }/tls/tls-HSDDM05.spdl | 0 testing/{protocols/misc => }/tls/tls-paulson-avispa.cpp | 0 testing/{protocols/misc => }/tls/tls-paulson-avispa.spdl | 0 testing/{protocols/misc => }/tls/tls-paulson.cpp | 0 testing/{protocols/misc => }/tls/tls-paulson.spdl | 0 testing/{protocols/misc => }/tmn-Gijs.spdl | 0 testing/{protocols/misc => }/tmn.spdl | 0 testing/{protocols/misc => }/unknown2.spdl | 0 testing/{protocols/misc => }/wmf-brutus.spdl | 0 testing/{protocols/misc => }/woolam-cmv.spdl | 0 testing/{protocols/misc => }/woolam-pi-f.spdl | 0 testing/{protocols/misc => }/yahalom-ban.spdl | 0 testing/{protocols/misc => }/yahalom-lowe.spdl | 0 testing/{protocols/misc => }/yahalom-paulson.spdl | 0 105 files changed, 1 insertion(+), 1 deletion(-) rename {testing/protocols => gui/Protocols}/Demo/ns3.spdl (100%) rename {testing/protocols => gui/Protocols}/Demo/nsl3-broken.spdl (100%) rename {testing/protocols => gui/Protocols}/Demo/nsl3-updated-both.spdl (100%) rename {testing/protocols => gui/Protocols}/Demo/nsl3.spdl (100%) rename {testing/protocols/multiparty => gui/Protocols/multi-NSL}/heuristics-results.txt (100%) rename {testing/protocols/multiparty => gui/Protocols/multi-NSL}/mnsl-results.txt (100%) rename {testing/protocols/multiparty => gui/Protocols/multi-NSL}/multinsl-generator.py (100%) rename {testing/protocols/multiparty => gui/Protocols/multi-NSL}/test-heuristics.py (100%) rename {testing/protocols/multiparty => gui/Protocols/multi-NSL}/test-variants.py (100%) rename testing/{protocols/misc => }/2r890-ex3-a.spdl (100%) rename testing/{protocols/misc => }/2r890-ex3-b.spdl (100%) rename testing/{protocols/misc => }/README.txt (100%) rename testing/{protocols/misc => }/andrew-ban.spdl (100%) rename testing/{protocols/misc => }/andrew-lowe-ban.spdl (100%) rename testing/{protocols/misc => }/athena-breaker.spdl (100%) rename testing/{protocols/misc => }/bke-broken.spdl (100%) rename testing/{protocols/misc => }/bke-one.spdl (100%) rename testing/{protocols/misc => }/bke-variation.spdl (100%) rename testing/{protocols/misc => }/bke.spdl (100%) rename testing/{protocols/misc => }/bkepk-ce.spdl (100%) rename testing/{protocols/misc => }/bkepk-ce2.spdl (100%) rename testing/{protocols/misc => }/boyd-nsl-fix.spdl (100%) rename testing/{protocols/misc => }/boyd.spdl (100%) rename testing/{protocols/misc => }/broken1.spdl (100%) rename testing/{protocols/misc => }/bunava-1-3.spdl (100%) rename testing/{protocols/misc => }/bunava-1-4.spdl (100%) rename testing/{protocols/misc => }/bunava-2-3.spdl (100%) rename testing/{protocols/misc => }/bunava-2-4.spdl (100%) rename testing/{protocols/misc => }/carkey-broken-limited.spdl (100%) rename testing/{protocols/misc => }/carkey-broken.spdl (100%) rename testing/{protocols/misc => }/carkey-ni.spdl (100%) rename testing/{protocols/misc => }/carkey-ni2.spdl (100%) rename testing/{protocols/misc => }/ccitt509-ban.spdl (100%) rename testing/{protocols/misc => }/compositionality-examples/th-1.spdl (100%) rename testing/{protocols/misc => }/compositionality-examples/th-1par2.spdl (100%) rename testing/{protocols/misc => }/compositionality-examples/th-1seq2-rename-ni.spdl (100%) rename testing/{protocols/misc => }/compositionality-examples/th-1seq2-rename-nr.spdl (100%) rename testing/{protocols/misc => }/compositionality-examples/th-1seq2.spdl (100%) rename testing/{protocols/misc => }/compositionality-examples/th-2.spdl (100%) rename testing/{protocols/misc => }/denning-sacco-shared.spdl (100%) rename testing/{protocols/misc => }/f4.spdl (100%) rename testing/{protocols/misc => }/f5.spdl (100%) rename testing/{protocols/misc => }/ffgg_n/ffgg_n.py (100%) rename testing/{protocols/misc => }/five-run-bound.spdl (100%) rename testing/{protocols/misc => }/fourway-HSDDM05.cpp (100%) rename testing/{protocols/misc => }/fourway-HSDDM05.spdl (100%) rename testing/{protocols/misc => }/gong-nonce-b.spdl (100%) rename testing/{protocols/misc => }/gong-nonce.spdl (100%) rename testing/{protocols/misc => }/helloworld.spdl (100%) rename testing/{protocols/misc => }/ibe-ns.spdl (100%) rename testing/{protocols/misc => }/ibe.spdl (100%) rename testing/{protocols/misc => }/isoiec11770-2-13.spdl (100%) rename testing/{protocols/misc => }/kaochow-palm.spdl (100%) rename testing/{protocols/misc => }/kaochow-v2.spdl (100%) rename testing/{protocols/misc => }/kaochow-v3.spdl (100%) rename testing/{protocols/misc => }/kaochow.spdl (100%) rename testing/{protocols/misc => }/kerberos-rddm.spdl (100%) rename testing/{protocols/misc => }/ksl.spdl (100%) rename testing/{protocols/misc => }/localclaims-breaker.spdl (100%) rename testing/{protocols/misc => }/localclaims-seq1.spdl (100%) rename testing/{protocols/misc => }/localclaims.spdl (100%) rename testing/{protocols/misc => }/ns-symmetric-amended.spdl (100%) rename testing/{protocols/misc => }/ns-symmetric.spdl (100%) rename testing/{protocols/misc => }/ns3-brutus.spdl (100%) rename testing/{protocols/misc => }/ns3.spdl (100%) rename testing/{protocols/misc => }/nsl3-nisynch-rep.spdl (100%) rename testing/{protocols/misc => }/nsl3.spdl (100%) rename testing/{protocols/misc => }/nst1.spdl (100%) rename testing/{protocols/misc => }/nst2.spdl (100%) rename testing/{protocols/misc => }/onetrace.spdl (100%) rename testing/{protocols/misc => }/otwayrees.spdl (100%) rename testing/{protocols/misc => }/protocol-list.txt (100%) rename testing/{protocols/misc => }/samasc-broken.spdl (100%) rename testing/{protocols/misc => }/simplest.spdl (100%) rename testing/{protocols/misc => }/soph-keyexch.spdl (100%) rename testing/{protocols/misc => }/soph.spdl (100%) rename testing/{protocols/misc => }/spdl-defaults.inc (100%) rename testing/{protocols/misc => }/spdl-intruder.inc (100%) rename testing/{protocols/misc => }/speedtest.spdl (100%) rename testing/{protocols/misc => }/splice-as-hc-cj.spdl (100%) rename testing/{protocols/misc => }/splice-as-hc.spdl (100%) rename testing/{protocols/misc => }/splice-as.spdl (100%) rename testing/{protocols/misc => }/tls/tls-BM-1.m4 (100%) rename testing/{protocols/misc => }/tls/tls-BM-1.spdl (100%) rename testing/{protocols/misc => }/tls/tls-HSDDM05-2.cpp (100%) rename testing/{protocols/misc => }/tls/tls-HSDDM05-2.spdl (100%) rename testing/{protocols/misc => }/tls/tls-HSDDM05-fix.cpp (100%) rename testing/{protocols/misc => }/tls/tls-HSDDM05-fix.m4 (100%) rename testing/{protocols/misc => }/tls/tls-HSDDM05-fix.spdl (100%) rename testing/{protocols/misc => }/tls/tls-HSDDM05.cpp (100%) rename testing/{protocols/misc => }/tls/tls-HSDDM05.spdl (100%) rename testing/{protocols/misc => }/tls/tls-paulson-avispa.cpp (100%) rename testing/{protocols/misc => }/tls/tls-paulson-avispa.spdl (100%) rename testing/{protocols/misc => }/tls/tls-paulson.cpp (100%) rename testing/{protocols/misc => }/tls/tls-paulson.spdl (100%) rename testing/{protocols/misc => }/tmn-Gijs.spdl (100%) rename testing/{protocols/misc => }/tmn.spdl (100%) rename testing/{protocols/misc => }/unknown2.spdl (100%) rename testing/{protocols/misc => }/wmf-brutus.spdl (100%) rename testing/{protocols/misc => }/woolam-cmv.spdl (100%) rename testing/{protocols/misc => }/woolam-pi-f.spdl (100%) rename testing/{protocols/misc => }/yahalom-ban.spdl (100%) rename testing/{protocols/misc => }/yahalom-lowe.spdl (100%) rename testing/{protocols/misc => }/yahalom-paulson.spdl (100%) diff --git a/README.md b/README.md index d2ae735..a5b5666 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Protocol Models The protocol models have the extension `.spdl` and can be found in the following directories: * `./gui/Protocols`, containing the officially released models, and - * `./testing/protocols`, containing models currently under development. + * `./testing`, containing models currently under development. License ------- diff --git a/testing/protocols/Demo/ns3.spdl b/gui/Protocols/Demo/ns3.spdl similarity index 100% rename from testing/protocols/Demo/ns3.spdl rename to gui/Protocols/Demo/ns3.spdl diff --git a/testing/protocols/Demo/nsl3-broken.spdl b/gui/Protocols/Demo/nsl3-broken.spdl similarity index 100% rename from testing/protocols/Demo/nsl3-broken.spdl rename to gui/Protocols/Demo/nsl3-broken.spdl diff --git a/testing/protocols/Demo/nsl3-updated-both.spdl b/gui/Protocols/Demo/nsl3-updated-both.spdl similarity index 100% rename from testing/protocols/Demo/nsl3-updated-both.spdl rename to gui/Protocols/Demo/nsl3-updated-both.spdl diff --git a/testing/protocols/Demo/nsl3.spdl b/gui/Protocols/Demo/nsl3.spdl similarity index 100% rename from testing/protocols/Demo/nsl3.spdl rename to gui/Protocols/Demo/nsl3.spdl diff --git a/testing/protocols/multiparty/heuristics-results.txt b/gui/Protocols/multi-NSL/heuristics-results.txt similarity index 100% rename from testing/protocols/multiparty/heuristics-results.txt rename to gui/Protocols/multi-NSL/heuristics-results.txt diff --git a/testing/protocols/multiparty/mnsl-results.txt b/gui/Protocols/multi-NSL/mnsl-results.txt similarity index 100% rename from testing/protocols/multiparty/mnsl-results.txt rename to gui/Protocols/multi-NSL/mnsl-results.txt diff --git a/testing/protocols/multiparty/multinsl-generator.py b/gui/Protocols/multi-NSL/multinsl-generator.py similarity index 100% rename from testing/protocols/multiparty/multinsl-generator.py rename to gui/Protocols/multi-NSL/multinsl-generator.py diff --git a/testing/protocols/multiparty/test-heuristics.py b/gui/Protocols/multi-NSL/test-heuristics.py similarity index 100% rename from testing/protocols/multiparty/test-heuristics.py rename to gui/Protocols/multi-NSL/test-heuristics.py diff --git a/testing/protocols/multiparty/test-variants.py b/gui/Protocols/multi-NSL/test-variants.py similarity index 100% rename from testing/protocols/multiparty/test-variants.py rename to gui/Protocols/multi-NSL/test-variants.py diff --git a/testing/protocols/misc/2r890-ex3-a.spdl b/testing/2r890-ex3-a.spdl similarity index 100% rename from testing/protocols/misc/2r890-ex3-a.spdl rename to testing/2r890-ex3-a.spdl diff --git a/testing/protocols/misc/2r890-ex3-b.spdl b/testing/2r890-ex3-b.spdl similarity index 100% rename from testing/protocols/misc/2r890-ex3-b.spdl rename to testing/2r890-ex3-b.spdl diff --git a/testing/protocols/misc/README.txt b/testing/README.txt similarity index 100% rename from testing/protocols/misc/README.txt rename to testing/README.txt diff --git a/testing/protocols/misc/andrew-ban.spdl b/testing/andrew-ban.spdl similarity index 100% rename from testing/protocols/misc/andrew-ban.spdl rename to testing/andrew-ban.spdl diff --git a/testing/protocols/misc/andrew-lowe-ban.spdl b/testing/andrew-lowe-ban.spdl similarity index 100% rename from testing/protocols/misc/andrew-lowe-ban.spdl rename to testing/andrew-lowe-ban.spdl diff --git a/testing/protocols/misc/athena-breaker.spdl b/testing/athena-breaker.spdl similarity index 100% rename from testing/protocols/misc/athena-breaker.spdl rename to testing/athena-breaker.spdl diff --git a/testing/protocols/misc/bke-broken.spdl b/testing/bke-broken.spdl similarity index 100% rename from testing/protocols/misc/bke-broken.spdl rename to testing/bke-broken.spdl diff --git a/testing/protocols/misc/bke-one.spdl b/testing/bke-one.spdl similarity index 100% rename from testing/protocols/misc/bke-one.spdl rename to testing/bke-one.spdl diff --git a/testing/protocols/misc/bke-variation.spdl b/testing/bke-variation.spdl similarity index 100% rename from testing/protocols/misc/bke-variation.spdl rename to testing/bke-variation.spdl diff --git a/testing/protocols/misc/bke.spdl b/testing/bke.spdl similarity index 100% rename from testing/protocols/misc/bke.spdl rename to testing/bke.spdl diff --git a/testing/protocols/misc/bkepk-ce.spdl b/testing/bkepk-ce.spdl similarity index 100% rename from testing/protocols/misc/bkepk-ce.spdl rename to testing/bkepk-ce.spdl diff --git a/testing/protocols/misc/bkepk-ce2.spdl b/testing/bkepk-ce2.spdl similarity index 100% rename from testing/protocols/misc/bkepk-ce2.spdl rename to testing/bkepk-ce2.spdl diff --git a/testing/protocols/misc/boyd-nsl-fix.spdl b/testing/boyd-nsl-fix.spdl similarity index 100% rename from testing/protocols/misc/boyd-nsl-fix.spdl rename to testing/boyd-nsl-fix.spdl diff --git a/testing/protocols/misc/boyd.spdl b/testing/boyd.spdl similarity index 100% rename from testing/protocols/misc/boyd.spdl rename to testing/boyd.spdl diff --git a/testing/protocols/misc/broken1.spdl b/testing/broken1.spdl similarity index 100% rename from testing/protocols/misc/broken1.spdl rename to testing/broken1.spdl diff --git a/testing/protocols/misc/bunava-1-3.spdl b/testing/bunava-1-3.spdl similarity index 100% rename from testing/protocols/misc/bunava-1-3.spdl rename to testing/bunava-1-3.spdl diff --git a/testing/protocols/misc/bunava-1-4.spdl b/testing/bunava-1-4.spdl similarity index 100% rename from testing/protocols/misc/bunava-1-4.spdl rename to testing/bunava-1-4.spdl diff --git a/testing/protocols/misc/bunava-2-3.spdl b/testing/bunava-2-3.spdl similarity index 100% rename from testing/protocols/misc/bunava-2-3.spdl rename to testing/bunava-2-3.spdl diff --git a/testing/protocols/misc/bunava-2-4.spdl b/testing/bunava-2-4.spdl similarity index 100% rename from testing/protocols/misc/bunava-2-4.spdl rename to testing/bunava-2-4.spdl diff --git a/testing/protocols/misc/carkey-broken-limited.spdl b/testing/carkey-broken-limited.spdl similarity index 100% rename from testing/protocols/misc/carkey-broken-limited.spdl rename to testing/carkey-broken-limited.spdl diff --git a/testing/protocols/misc/carkey-broken.spdl b/testing/carkey-broken.spdl similarity index 100% rename from testing/protocols/misc/carkey-broken.spdl rename to testing/carkey-broken.spdl diff --git a/testing/protocols/misc/carkey-ni.spdl b/testing/carkey-ni.spdl similarity index 100% rename from testing/protocols/misc/carkey-ni.spdl rename to testing/carkey-ni.spdl diff --git a/testing/protocols/misc/carkey-ni2.spdl b/testing/carkey-ni2.spdl similarity index 100% rename from testing/protocols/misc/carkey-ni2.spdl rename to testing/carkey-ni2.spdl diff --git a/testing/protocols/misc/ccitt509-ban.spdl b/testing/ccitt509-ban.spdl similarity index 100% rename from testing/protocols/misc/ccitt509-ban.spdl rename to testing/ccitt509-ban.spdl diff --git a/testing/protocols/misc/compositionality-examples/th-1.spdl b/testing/compositionality-examples/th-1.spdl similarity index 100% rename from testing/protocols/misc/compositionality-examples/th-1.spdl rename to testing/compositionality-examples/th-1.spdl diff --git a/testing/protocols/misc/compositionality-examples/th-1par2.spdl b/testing/compositionality-examples/th-1par2.spdl similarity index 100% rename from testing/protocols/misc/compositionality-examples/th-1par2.spdl rename to testing/compositionality-examples/th-1par2.spdl diff --git a/testing/protocols/misc/compositionality-examples/th-1seq2-rename-ni.spdl b/testing/compositionality-examples/th-1seq2-rename-ni.spdl similarity index 100% rename from testing/protocols/misc/compositionality-examples/th-1seq2-rename-ni.spdl rename to testing/compositionality-examples/th-1seq2-rename-ni.spdl diff --git a/testing/protocols/misc/compositionality-examples/th-1seq2-rename-nr.spdl b/testing/compositionality-examples/th-1seq2-rename-nr.spdl similarity index 100% rename from testing/protocols/misc/compositionality-examples/th-1seq2-rename-nr.spdl rename to testing/compositionality-examples/th-1seq2-rename-nr.spdl diff --git a/testing/protocols/misc/compositionality-examples/th-1seq2.spdl b/testing/compositionality-examples/th-1seq2.spdl similarity index 100% rename from testing/protocols/misc/compositionality-examples/th-1seq2.spdl rename to testing/compositionality-examples/th-1seq2.spdl diff --git a/testing/protocols/misc/compositionality-examples/th-2.spdl b/testing/compositionality-examples/th-2.spdl similarity index 100% rename from testing/protocols/misc/compositionality-examples/th-2.spdl rename to testing/compositionality-examples/th-2.spdl diff --git a/testing/protocols/misc/denning-sacco-shared.spdl b/testing/denning-sacco-shared.spdl similarity index 100% rename from testing/protocols/misc/denning-sacco-shared.spdl rename to testing/denning-sacco-shared.spdl diff --git a/testing/protocols/misc/f4.spdl b/testing/f4.spdl similarity index 100% rename from testing/protocols/misc/f4.spdl rename to testing/f4.spdl diff --git a/testing/protocols/misc/f5.spdl b/testing/f5.spdl similarity index 100% rename from testing/protocols/misc/f5.spdl rename to testing/f5.spdl diff --git a/testing/protocols/misc/ffgg_n/ffgg_n.py b/testing/ffgg_n/ffgg_n.py similarity index 100% rename from testing/protocols/misc/ffgg_n/ffgg_n.py rename to testing/ffgg_n/ffgg_n.py diff --git a/testing/protocols/misc/five-run-bound.spdl b/testing/five-run-bound.spdl similarity index 100% rename from testing/protocols/misc/five-run-bound.spdl rename to testing/five-run-bound.spdl diff --git a/testing/protocols/misc/fourway-HSDDM05.cpp b/testing/fourway-HSDDM05.cpp similarity index 100% rename from testing/protocols/misc/fourway-HSDDM05.cpp rename to testing/fourway-HSDDM05.cpp diff --git a/testing/protocols/misc/fourway-HSDDM05.spdl b/testing/fourway-HSDDM05.spdl similarity index 100% rename from testing/protocols/misc/fourway-HSDDM05.spdl rename to testing/fourway-HSDDM05.spdl diff --git a/testing/protocols/misc/gong-nonce-b.spdl b/testing/gong-nonce-b.spdl similarity index 100% rename from testing/protocols/misc/gong-nonce-b.spdl rename to testing/gong-nonce-b.spdl diff --git a/testing/protocols/misc/gong-nonce.spdl b/testing/gong-nonce.spdl similarity index 100% rename from testing/protocols/misc/gong-nonce.spdl rename to testing/gong-nonce.spdl diff --git a/testing/protocols/misc/helloworld.spdl b/testing/helloworld.spdl similarity index 100% rename from testing/protocols/misc/helloworld.spdl rename to testing/helloworld.spdl diff --git a/testing/protocols/misc/ibe-ns.spdl b/testing/ibe-ns.spdl similarity index 100% rename from testing/protocols/misc/ibe-ns.spdl rename to testing/ibe-ns.spdl diff --git a/testing/protocols/misc/ibe.spdl b/testing/ibe.spdl similarity index 100% rename from testing/protocols/misc/ibe.spdl rename to testing/ibe.spdl diff --git a/testing/protocols/misc/isoiec11770-2-13.spdl b/testing/isoiec11770-2-13.spdl similarity index 100% rename from testing/protocols/misc/isoiec11770-2-13.spdl rename to testing/isoiec11770-2-13.spdl diff --git a/testing/protocols/misc/kaochow-palm.spdl b/testing/kaochow-palm.spdl similarity index 100% rename from testing/protocols/misc/kaochow-palm.spdl rename to testing/kaochow-palm.spdl diff --git a/testing/protocols/misc/kaochow-v2.spdl b/testing/kaochow-v2.spdl similarity index 100% rename from testing/protocols/misc/kaochow-v2.spdl rename to testing/kaochow-v2.spdl diff --git a/testing/protocols/misc/kaochow-v3.spdl b/testing/kaochow-v3.spdl similarity index 100% rename from testing/protocols/misc/kaochow-v3.spdl rename to testing/kaochow-v3.spdl diff --git a/testing/protocols/misc/kaochow.spdl b/testing/kaochow.spdl similarity index 100% rename from testing/protocols/misc/kaochow.spdl rename to testing/kaochow.spdl diff --git a/testing/protocols/misc/kerberos-rddm.spdl b/testing/kerberos-rddm.spdl similarity index 100% rename from testing/protocols/misc/kerberos-rddm.spdl rename to testing/kerberos-rddm.spdl diff --git a/testing/protocols/misc/ksl.spdl b/testing/ksl.spdl similarity index 100% rename from testing/protocols/misc/ksl.spdl rename to testing/ksl.spdl diff --git a/testing/protocols/misc/localclaims-breaker.spdl b/testing/localclaims-breaker.spdl similarity index 100% rename from testing/protocols/misc/localclaims-breaker.spdl rename to testing/localclaims-breaker.spdl diff --git a/testing/protocols/misc/localclaims-seq1.spdl b/testing/localclaims-seq1.spdl similarity index 100% rename from testing/protocols/misc/localclaims-seq1.spdl rename to testing/localclaims-seq1.spdl diff --git a/testing/protocols/misc/localclaims.spdl b/testing/localclaims.spdl similarity index 100% rename from testing/protocols/misc/localclaims.spdl rename to testing/localclaims.spdl diff --git a/testing/protocols/misc/ns-symmetric-amended.spdl b/testing/ns-symmetric-amended.spdl similarity index 100% rename from testing/protocols/misc/ns-symmetric-amended.spdl rename to testing/ns-symmetric-amended.spdl diff --git a/testing/protocols/misc/ns-symmetric.spdl b/testing/ns-symmetric.spdl similarity index 100% rename from testing/protocols/misc/ns-symmetric.spdl rename to testing/ns-symmetric.spdl diff --git a/testing/protocols/misc/ns3-brutus.spdl b/testing/ns3-brutus.spdl similarity index 100% rename from testing/protocols/misc/ns3-brutus.spdl rename to testing/ns3-brutus.spdl diff --git a/testing/protocols/misc/ns3.spdl b/testing/ns3.spdl similarity index 100% rename from testing/protocols/misc/ns3.spdl rename to testing/ns3.spdl diff --git a/testing/protocols/misc/nsl3-nisynch-rep.spdl b/testing/nsl3-nisynch-rep.spdl similarity index 100% rename from testing/protocols/misc/nsl3-nisynch-rep.spdl rename to testing/nsl3-nisynch-rep.spdl diff --git a/testing/protocols/misc/nsl3.spdl b/testing/nsl3.spdl similarity index 100% rename from testing/protocols/misc/nsl3.spdl rename to testing/nsl3.spdl diff --git a/testing/protocols/misc/nst1.spdl b/testing/nst1.spdl similarity index 100% rename from testing/protocols/misc/nst1.spdl rename to testing/nst1.spdl diff --git a/testing/protocols/misc/nst2.spdl b/testing/nst2.spdl similarity index 100% rename from testing/protocols/misc/nst2.spdl rename to testing/nst2.spdl diff --git a/testing/protocols/misc/onetrace.spdl b/testing/onetrace.spdl similarity index 100% rename from testing/protocols/misc/onetrace.spdl rename to testing/onetrace.spdl diff --git a/testing/protocols/misc/otwayrees.spdl b/testing/otwayrees.spdl similarity index 100% rename from testing/protocols/misc/otwayrees.spdl rename to testing/otwayrees.spdl diff --git a/testing/protocols/misc/protocol-list.txt b/testing/protocol-list.txt similarity index 100% rename from testing/protocols/misc/protocol-list.txt rename to testing/protocol-list.txt diff --git a/testing/protocols/misc/samasc-broken.spdl b/testing/samasc-broken.spdl similarity index 100% rename from testing/protocols/misc/samasc-broken.spdl rename to testing/samasc-broken.spdl diff --git a/testing/protocols/misc/simplest.spdl b/testing/simplest.spdl similarity index 100% rename from testing/protocols/misc/simplest.spdl rename to testing/simplest.spdl diff --git a/testing/protocols/misc/soph-keyexch.spdl b/testing/soph-keyexch.spdl similarity index 100% rename from testing/protocols/misc/soph-keyexch.spdl rename to testing/soph-keyexch.spdl diff --git a/testing/protocols/misc/soph.spdl b/testing/soph.spdl similarity index 100% rename from testing/protocols/misc/soph.spdl rename to testing/soph.spdl diff --git a/testing/protocols/misc/spdl-defaults.inc b/testing/spdl-defaults.inc similarity index 100% rename from testing/protocols/misc/spdl-defaults.inc rename to testing/spdl-defaults.inc diff --git a/testing/protocols/misc/spdl-intruder.inc b/testing/spdl-intruder.inc similarity index 100% rename from testing/protocols/misc/spdl-intruder.inc rename to testing/spdl-intruder.inc diff --git a/testing/protocols/misc/speedtest.spdl b/testing/speedtest.spdl similarity index 100% rename from testing/protocols/misc/speedtest.spdl rename to testing/speedtest.spdl diff --git a/testing/protocols/misc/splice-as-hc-cj.spdl b/testing/splice-as-hc-cj.spdl similarity index 100% rename from testing/protocols/misc/splice-as-hc-cj.spdl rename to testing/splice-as-hc-cj.spdl diff --git a/testing/protocols/misc/splice-as-hc.spdl b/testing/splice-as-hc.spdl similarity index 100% rename from testing/protocols/misc/splice-as-hc.spdl rename to testing/splice-as-hc.spdl diff --git a/testing/protocols/misc/splice-as.spdl b/testing/splice-as.spdl similarity index 100% rename from testing/protocols/misc/splice-as.spdl rename to testing/splice-as.spdl diff --git a/testing/protocols/misc/tls/tls-BM-1.m4 b/testing/tls/tls-BM-1.m4 similarity index 100% rename from testing/protocols/misc/tls/tls-BM-1.m4 rename to testing/tls/tls-BM-1.m4 diff --git a/testing/protocols/misc/tls/tls-BM-1.spdl b/testing/tls/tls-BM-1.spdl similarity index 100% rename from testing/protocols/misc/tls/tls-BM-1.spdl rename to testing/tls/tls-BM-1.spdl diff --git a/testing/protocols/misc/tls/tls-HSDDM05-2.cpp b/testing/tls/tls-HSDDM05-2.cpp similarity index 100% rename from testing/protocols/misc/tls/tls-HSDDM05-2.cpp rename to testing/tls/tls-HSDDM05-2.cpp diff --git a/testing/protocols/misc/tls/tls-HSDDM05-2.spdl b/testing/tls/tls-HSDDM05-2.spdl similarity index 100% rename from testing/protocols/misc/tls/tls-HSDDM05-2.spdl rename to testing/tls/tls-HSDDM05-2.spdl diff --git a/testing/protocols/misc/tls/tls-HSDDM05-fix.cpp b/testing/tls/tls-HSDDM05-fix.cpp similarity index 100% rename from testing/protocols/misc/tls/tls-HSDDM05-fix.cpp rename to testing/tls/tls-HSDDM05-fix.cpp diff --git a/testing/protocols/misc/tls/tls-HSDDM05-fix.m4 b/testing/tls/tls-HSDDM05-fix.m4 similarity index 100% rename from testing/protocols/misc/tls/tls-HSDDM05-fix.m4 rename to testing/tls/tls-HSDDM05-fix.m4 diff --git a/testing/protocols/misc/tls/tls-HSDDM05-fix.spdl b/testing/tls/tls-HSDDM05-fix.spdl similarity index 100% rename from testing/protocols/misc/tls/tls-HSDDM05-fix.spdl rename to testing/tls/tls-HSDDM05-fix.spdl diff --git a/testing/protocols/misc/tls/tls-HSDDM05.cpp b/testing/tls/tls-HSDDM05.cpp similarity index 100% rename from testing/protocols/misc/tls/tls-HSDDM05.cpp rename to testing/tls/tls-HSDDM05.cpp diff --git a/testing/protocols/misc/tls/tls-HSDDM05.spdl b/testing/tls/tls-HSDDM05.spdl similarity index 100% rename from testing/protocols/misc/tls/tls-HSDDM05.spdl rename to testing/tls/tls-HSDDM05.spdl diff --git a/testing/protocols/misc/tls/tls-paulson-avispa.cpp b/testing/tls/tls-paulson-avispa.cpp similarity index 100% rename from testing/protocols/misc/tls/tls-paulson-avispa.cpp rename to testing/tls/tls-paulson-avispa.cpp diff --git a/testing/protocols/misc/tls/tls-paulson-avispa.spdl b/testing/tls/tls-paulson-avispa.spdl similarity index 100% rename from testing/protocols/misc/tls/tls-paulson-avispa.spdl rename to testing/tls/tls-paulson-avispa.spdl diff --git a/testing/protocols/misc/tls/tls-paulson.cpp b/testing/tls/tls-paulson.cpp similarity index 100% rename from testing/protocols/misc/tls/tls-paulson.cpp rename to testing/tls/tls-paulson.cpp diff --git a/testing/protocols/misc/tls/tls-paulson.spdl b/testing/tls/tls-paulson.spdl similarity index 100% rename from testing/protocols/misc/tls/tls-paulson.spdl rename to testing/tls/tls-paulson.spdl diff --git a/testing/protocols/misc/tmn-Gijs.spdl b/testing/tmn-Gijs.spdl similarity index 100% rename from testing/protocols/misc/tmn-Gijs.spdl rename to testing/tmn-Gijs.spdl diff --git a/testing/protocols/misc/tmn.spdl b/testing/tmn.spdl similarity index 100% rename from testing/protocols/misc/tmn.spdl rename to testing/tmn.spdl diff --git a/testing/protocols/misc/unknown2.spdl b/testing/unknown2.spdl similarity index 100% rename from testing/protocols/misc/unknown2.spdl rename to testing/unknown2.spdl diff --git a/testing/protocols/misc/wmf-brutus.spdl b/testing/wmf-brutus.spdl similarity index 100% rename from testing/protocols/misc/wmf-brutus.spdl rename to testing/wmf-brutus.spdl diff --git a/testing/protocols/misc/woolam-cmv.spdl b/testing/woolam-cmv.spdl similarity index 100% rename from testing/protocols/misc/woolam-cmv.spdl rename to testing/woolam-cmv.spdl diff --git a/testing/protocols/misc/woolam-pi-f.spdl b/testing/woolam-pi-f.spdl similarity index 100% rename from testing/protocols/misc/woolam-pi-f.spdl rename to testing/woolam-pi-f.spdl diff --git a/testing/protocols/misc/yahalom-ban.spdl b/testing/yahalom-ban.spdl similarity index 100% rename from testing/protocols/misc/yahalom-ban.spdl rename to testing/yahalom-ban.spdl diff --git a/testing/protocols/misc/yahalom-lowe.spdl b/testing/yahalom-lowe.spdl similarity index 100% rename from testing/protocols/misc/yahalom-lowe.spdl rename to testing/yahalom-lowe.spdl diff --git a/testing/protocols/misc/yahalom-paulson.spdl b/testing/yahalom-paulson.spdl similarity index 100% rename from testing/protocols/misc/yahalom-paulson.spdl rename to testing/yahalom-paulson.spdl