Cleanup and restructuring of testing directory setup.

cascremers · Nov 15, 2012 · 51495be · 51495be
1 parent 1860527
commit 51495be
Show file tree

Hide file tree

Showing 105 changed files with 1 addition and 1 deletion.
diff --git 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 → gui/Protocols/Demo/ns3.spdl b/testing/protocols/Demo/ns3.spdl → gui/Protocols/Demo/ns3.spdl
diff --git a/testing/protocols/Demo/nsl3-broken.spdl → gui/Protocols/Demo/nsl3-broken.spdl b/testing/protocols/Demo/nsl3-broken.spdl → gui/Protocols/Demo/nsl3-broken.spdl
diff --git a/...ing/protocols/Demo/nsl3-updated-both.spdl → gui/Protocols/Demo/nsl3-updated-both.spdl b/...ing/protocols/Demo/nsl3-updated-both.spdl → gui/Protocols/Demo/nsl3-updated-both.spdl
diff --git a/testing/protocols/Demo/nsl3.spdl → gui/Protocols/Demo/nsl3.spdl b/testing/protocols/Demo/nsl3.spdl → gui/Protocols/Demo/nsl3.spdl
diff --git a/...otocols/multiparty/heuristics-results.txt → ...rotocols/multi-NSL/heuristics-results.txt b/...otocols/multiparty/heuristics-results.txt → ...rotocols/multi-NSL/heuristics-results.txt
diff --git a/...ing/protocols/multiparty/mnsl-results.txt → gui/Protocols/multi-NSL/mnsl-results.txt b/...ing/protocols/multiparty/mnsl-results.txt → gui/Protocols/multi-NSL/mnsl-results.txt
diff --git a/...rotocols/multiparty/multinsl-generator.py → ...Protocols/multi-NSL/multinsl-generator.py b/...rotocols/multiparty/multinsl-generator.py → ...Protocols/multi-NSL/multinsl-generator.py
diff --git a/...g/protocols/multiparty/test-heuristics.py → gui/Protocols/multi-NSL/test-heuristics.py b/...g/protocols/multiparty/test-heuristics.py → gui/Protocols/multi-NSL/test-heuristics.py
diff --git a/...ing/protocols/multiparty/test-variants.py → gui/Protocols/multi-NSL/test-variants.py b/...ing/protocols/multiparty/test-variants.py → gui/Protocols/multi-NSL/test-variants.py
diff --git a/testing/protocols/misc/2r890-ex3-a.spdl → testing/2r890-ex3-a.spdl b/testing/protocols/misc/2r890-ex3-a.spdl → testing/2r890-ex3-a.spdl
diff --git a/testing/protocols/misc/2r890-ex3-b.spdl → testing/2r890-ex3-b.spdl b/testing/protocols/misc/2r890-ex3-b.spdl → testing/2r890-ex3-b.spdl
diff --git a/testing/protocols/misc/README.txt → testing/README.txt b/testing/protocols/misc/README.txt → testing/README.txt
diff --git a/testing/protocols/misc/andrew-ban.spdl → testing/andrew-ban.spdl b/testing/protocols/misc/andrew-ban.spdl → testing/andrew-ban.spdl
diff --git a/testing/protocols/misc/andrew-lowe-ban.spdl → testing/andrew-lowe-ban.spdl b/testing/protocols/misc/andrew-lowe-ban.spdl → testing/andrew-lowe-ban.spdl
diff --git a/testing/protocols/misc/athena-breaker.spdl → testing/athena-breaker.spdl b/testing/protocols/misc/athena-breaker.spdl → testing/athena-breaker.spdl
diff --git a/testing/protocols/misc/bke-broken.spdl → testing/bke-broken.spdl b/testing/protocols/misc/bke-broken.spdl → testing/bke-broken.spdl
diff --git a/testing/protocols/misc/bke-one.spdl → testing/bke-one.spdl b/testing/protocols/misc/bke-one.spdl → testing/bke-one.spdl
diff --git a/testing/protocols/misc/bke-variation.spdl → testing/bke-variation.spdl b/testing/protocols/misc/bke-variation.spdl → testing/bke-variation.spdl
diff --git a/testing/protocols/misc/bke.spdl → testing/bke.spdl b/testing/protocols/misc/bke.spdl → testing/bke.spdl
diff --git a/testing/protocols/misc/bkepk-ce.spdl → testing/bkepk-ce.spdl b/testing/protocols/misc/bkepk-ce.spdl → testing/bkepk-ce.spdl
diff --git a/testing/protocols/misc/bkepk-ce2.spdl → testing/bkepk-ce2.spdl b/testing/protocols/misc/bkepk-ce2.spdl → testing/bkepk-ce2.spdl
diff --git a/testing/protocols/misc/boyd-nsl-fix.spdl → testing/boyd-nsl-fix.spdl b/testing/protocols/misc/boyd-nsl-fix.spdl → testing/boyd-nsl-fix.spdl
diff --git a/testing/protocols/misc/boyd.spdl → testing/boyd.spdl b/testing/protocols/misc/boyd.spdl → testing/boyd.spdl
diff --git a/testing/protocols/misc/broken1.spdl → testing/broken1.spdl b/testing/protocols/misc/broken1.spdl → testing/broken1.spdl
diff --git a/testing/protocols/misc/bunava-1-3.spdl → testing/bunava-1-3.spdl b/testing/protocols/misc/bunava-1-3.spdl → testing/bunava-1-3.spdl
diff --git a/testing/protocols/misc/bunava-1-4.spdl → testing/bunava-1-4.spdl b/testing/protocols/misc/bunava-1-4.spdl → testing/bunava-1-4.spdl
diff --git a/testing/protocols/misc/bunava-2-3.spdl → testing/bunava-2-3.spdl b/testing/protocols/misc/bunava-2-3.spdl → testing/bunava-2-3.spdl
diff --git a/testing/protocols/misc/bunava-2-4.spdl → testing/bunava-2-4.spdl b/testing/protocols/misc/bunava-2-4.spdl → testing/bunava-2-4.spdl
diff --git a/...protocols/misc/carkey-broken-limited.spdl → testing/carkey-broken-limited.spdl b/...protocols/misc/carkey-broken-limited.spdl → testing/carkey-broken-limited.spdl
diff --git a/testing/protocols/misc/carkey-broken.spdl → testing/carkey-broken.spdl b/testing/protocols/misc/carkey-broken.spdl → testing/carkey-broken.spdl
diff --git a/testing/protocols/misc/carkey-ni.spdl → testing/carkey-ni.spdl b/testing/protocols/misc/carkey-ni.spdl → testing/carkey-ni.spdl
diff --git a/testing/protocols/misc/carkey-ni2.spdl → testing/carkey-ni2.spdl b/testing/protocols/misc/carkey-ni2.spdl → testing/carkey-ni2.spdl
diff --git a/testing/protocols/misc/ccitt509-ban.spdl → testing/ccitt509-ban.spdl b/testing/protocols/misc/ccitt509-ban.spdl → testing/ccitt509-ban.spdl
diff --git a/.../misc/compositionality-examples/th-1.spdl → testing/compositionality-examples/th-1.spdl b/.../misc/compositionality-examples/th-1.spdl → testing/compositionality-examples/th-1.spdl
diff --git a/...c/compositionality-examples/th-1par2.spdl → ...g/compositionality-examples/th-1par2.spdl b/...c/compositionality-examples/th-1par2.spdl → ...g/compositionality-examples/th-1par2.spdl
diff --git a/...ionality-examples/th-1seq2-rename-ni.spdl → ...ionality-examples/th-1seq2-rename-ni.spdl b/...ionality-examples/th-1seq2-rename-ni.spdl → ...ionality-examples/th-1seq2-rename-ni.spdl
diff --git a/...ionality-examples/th-1seq2-rename-nr.spdl → ...ionality-examples/th-1seq2-rename-nr.spdl b/...ionality-examples/th-1seq2-rename-nr.spdl → ...ionality-examples/th-1seq2-rename-nr.spdl
diff --git a/...c/compositionality-examples/th-1seq2.spdl → ...g/compositionality-examples/th-1seq2.spdl b/...c/compositionality-examples/th-1seq2.spdl → ...g/compositionality-examples/th-1seq2.spdl
diff --git a/.../misc/compositionality-examples/th-2.spdl → testing/compositionality-examples/th-2.spdl b/.../misc/compositionality-examples/th-2.spdl → testing/compositionality-examples/th-2.spdl
diff --git a/.../protocols/misc/denning-sacco-shared.spdl → testing/denning-sacco-shared.spdl b/.../protocols/misc/denning-sacco-shared.spdl → testing/denning-sacco-shared.spdl
diff --git a/testing/protocols/misc/f4.spdl → testing/f4.spdl b/testing/protocols/misc/f4.spdl → testing/f4.spdl
diff --git a/testing/protocols/misc/f5.spdl → testing/f5.spdl b/testing/protocols/misc/f5.spdl → testing/f5.spdl
diff --git a/testing/protocols/misc/ffgg_n/ffgg_n.py → testing/ffgg_n/ffgg_n.py b/testing/protocols/misc/ffgg_n/ffgg_n.py → testing/ffgg_n/ffgg_n.py
diff --git a/testing/protocols/misc/five-run-bound.spdl → testing/five-run-bound.spdl b/testing/protocols/misc/five-run-bound.spdl → testing/five-run-bound.spdl
diff --git a/testing/protocols/misc/fourway-HSDDM05.cpp → testing/fourway-HSDDM05.cpp b/testing/protocols/misc/fourway-HSDDM05.cpp → testing/fourway-HSDDM05.cpp
diff --git a/testing/protocols/misc/fourway-HSDDM05.spdl → testing/fourway-HSDDM05.spdl b/testing/protocols/misc/fourway-HSDDM05.spdl → testing/fourway-HSDDM05.spdl
diff --git a/testing/protocols/misc/gong-nonce-b.spdl → testing/gong-nonce-b.spdl b/testing/protocols/misc/gong-nonce-b.spdl → testing/gong-nonce-b.spdl
diff --git a/testing/protocols/misc/gong-nonce.spdl → testing/gong-nonce.spdl b/testing/protocols/misc/gong-nonce.spdl → testing/gong-nonce.spdl
diff --git a/testing/protocols/misc/helloworld.spdl → testing/helloworld.spdl b/testing/protocols/misc/helloworld.spdl → testing/helloworld.spdl
diff --git a/testing/protocols/misc/ibe-ns.spdl → testing/ibe-ns.spdl b/testing/protocols/misc/ibe-ns.spdl → testing/ibe-ns.spdl
diff --git a/testing/protocols/misc/ibe.spdl → testing/ibe.spdl b/testing/protocols/misc/ibe.spdl → testing/ibe.spdl
diff --git a/testing/protocols/misc/isoiec11770-2-13.spdl → testing/isoiec11770-2-13.spdl b/testing/protocols/misc/isoiec11770-2-13.spdl → testing/isoiec11770-2-13.spdl
diff --git a/testing/protocols/misc/kaochow-palm.spdl → testing/kaochow-palm.spdl b/testing/protocols/misc/kaochow-palm.spdl → testing/kaochow-palm.spdl
diff --git a/testing/protocols/misc/kaochow-v2.spdl → testing/kaochow-v2.spdl b/testing/protocols/misc/kaochow-v2.spdl → testing/kaochow-v2.spdl
diff --git a/testing/protocols/misc/kaochow-v3.spdl → testing/kaochow-v3.spdl b/testing/protocols/misc/kaochow-v3.spdl → testing/kaochow-v3.spdl
diff --git a/testing/protocols/misc/kaochow.spdl → testing/kaochow.spdl b/testing/protocols/misc/kaochow.spdl → testing/kaochow.spdl
diff --git a/testing/protocols/misc/kerberos-rddm.spdl → testing/kerberos-rddm.spdl b/testing/protocols/misc/kerberos-rddm.spdl → testing/kerberos-rddm.spdl
diff --git a/testing/protocols/misc/ksl.spdl → testing/ksl.spdl b/testing/protocols/misc/ksl.spdl → testing/ksl.spdl
diff --git a/...g/protocols/misc/localclaims-breaker.spdl → testing/localclaims-breaker.spdl b/...g/protocols/misc/localclaims-breaker.spdl → testing/localclaims-breaker.spdl
diff --git a/testing/protocols/misc/localclaims-seq1.spdl → testing/localclaims-seq1.spdl b/testing/protocols/misc/localclaims-seq1.spdl → testing/localclaims-seq1.spdl
diff --git a/testing/protocols/misc/localclaims.spdl → testing/localclaims.spdl b/testing/protocols/misc/localclaims.spdl → testing/localclaims.spdl
diff --git a/.../protocols/misc/ns-symmetric-amended.spdl → testing/ns-symmetric-amended.spdl b/.../protocols/misc/ns-symmetric-amended.spdl → testing/ns-symmetric-amended.spdl
diff --git a/testing/protocols/misc/ns-symmetric.spdl → testing/ns-symmetric.spdl b/testing/protocols/misc/ns-symmetric.spdl → testing/ns-symmetric.spdl
diff --git a/testing/protocols/misc/ns3-brutus.spdl → testing/ns3-brutus.spdl b/testing/protocols/misc/ns3-brutus.spdl → testing/ns3-brutus.spdl
diff --git a/testing/protocols/misc/ns3.spdl → testing/ns3.spdl b/testing/protocols/misc/ns3.spdl → testing/ns3.spdl
diff --git a/testing/protocols/misc/nsl3-nisynch-rep.spdl → testing/nsl3-nisynch-rep.spdl b/testing/protocols/misc/nsl3-nisynch-rep.spdl → testing/nsl3-nisynch-rep.spdl
diff --git a/testing/protocols/misc/nsl3.spdl → testing/nsl3.spdl b/testing/protocols/misc/nsl3.spdl → testing/nsl3.spdl
diff --git a/testing/protocols/misc/nst1.spdl → testing/nst1.spdl b/testing/protocols/misc/nst1.spdl → testing/nst1.spdl
diff --git a/testing/protocols/misc/nst2.spdl → testing/nst2.spdl b/testing/protocols/misc/nst2.spdl → testing/nst2.spdl
diff --git a/testing/protocols/misc/onetrace.spdl → testing/onetrace.spdl b/testing/protocols/misc/onetrace.spdl → testing/onetrace.spdl
diff --git a/testing/protocols/misc/otwayrees.spdl → testing/otwayrees.spdl b/testing/protocols/misc/otwayrees.spdl → testing/otwayrees.spdl
diff --git a/testing/protocols/misc/protocol-list.txt → testing/protocol-list.txt b/testing/protocols/misc/protocol-list.txt → testing/protocol-list.txt
diff --git a/testing/protocols/misc/samasc-broken.spdl → testing/samasc-broken.spdl b/testing/protocols/misc/samasc-broken.spdl → testing/samasc-broken.spdl
diff --git a/testing/protocols/misc/simplest.spdl → testing/simplest.spdl b/testing/protocols/misc/simplest.spdl → testing/simplest.spdl
diff --git a/testing/protocols/misc/soph-keyexch.spdl → testing/soph-keyexch.spdl b/testing/protocols/misc/soph-keyexch.spdl → testing/soph-keyexch.spdl
diff --git a/testing/protocols/misc/soph.spdl → testing/soph.spdl b/testing/protocols/misc/soph.spdl → testing/soph.spdl
diff --git a/testing/protocols/misc/spdl-defaults.inc → testing/spdl-defaults.inc b/testing/protocols/misc/spdl-defaults.inc → testing/spdl-defaults.inc
diff --git a/testing/protocols/misc/spdl-intruder.inc → testing/spdl-intruder.inc b/testing/protocols/misc/spdl-intruder.inc → testing/spdl-intruder.inc
diff --git a/testing/protocols/misc/speedtest.spdl → testing/speedtest.spdl b/testing/protocols/misc/speedtest.spdl → testing/speedtest.spdl
diff --git a/testing/protocols/misc/splice-as-hc-cj.spdl → testing/splice-as-hc-cj.spdl b/testing/protocols/misc/splice-as-hc-cj.spdl → testing/splice-as-hc-cj.spdl
diff --git a/testing/protocols/misc/splice-as-hc.spdl → testing/splice-as-hc.spdl b/testing/protocols/misc/splice-as-hc.spdl → testing/splice-as-hc.spdl
diff --git a/testing/protocols/misc/splice-as.spdl → testing/splice-as.spdl b/testing/protocols/misc/splice-as.spdl → testing/splice-as.spdl
diff --git a/testing/protocols/misc/tls/tls-BM-1.m4 → testing/tls/tls-BM-1.m4 b/testing/protocols/misc/tls/tls-BM-1.m4 → testing/tls/tls-BM-1.m4
diff --git a/testing/protocols/misc/tls/tls-BM-1.spdl → testing/tls/tls-BM-1.spdl b/testing/protocols/misc/tls/tls-BM-1.spdl → testing/tls/tls-BM-1.spdl
diff --git a/testing/protocols/misc/tls/tls-HSDDM05-2.cpp → testing/tls/tls-HSDDM05-2.cpp b/testing/protocols/misc/tls/tls-HSDDM05-2.cpp → testing/tls/tls-HSDDM05-2.cpp
diff --git a/...ing/protocols/misc/tls/tls-HSDDM05-2.spdl → testing/tls/tls-HSDDM05-2.spdl b/...ing/protocols/misc/tls/tls-HSDDM05-2.spdl → testing/tls/tls-HSDDM05-2.spdl
diff --git a/...ng/protocols/misc/tls/tls-HSDDM05-fix.cpp → testing/tls/tls-HSDDM05-fix.cpp b/...ng/protocols/misc/tls/tls-HSDDM05-fix.cpp → testing/tls/tls-HSDDM05-fix.cpp
diff --git a/...ing/protocols/misc/tls/tls-HSDDM05-fix.m4 → testing/tls/tls-HSDDM05-fix.m4 b/...ing/protocols/misc/tls/tls-HSDDM05-fix.m4 → testing/tls/tls-HSDDM05-fix.m4
diff --git a/...g/protocols/misc/tls/tls-HSDDM05-fix.spdl → testing/tls/tls-HSDDM05-fix.spdl b/...g/protocols/misc/tls/tls-HSDDM05-fix.spdl → testing/tls/tls-HSDDM05-fix.spdl
diff --git a/testing/protocols/misc/tls/tls-HSDDM05.cpp → testing/tls/tls-HSDDM05.cpp b/testing/protocols/misc/tls/tls-HSDDM05.cpp → testing/tls/tls-HSDDM05.cpp
diff --git a/testing/protocols/misc/tls/tls-HSDDM05.spdl → testing/tls/tls-HSDDM05.spdl b/testing/protocols/misc/tls/tls-HSDDM05.spdl → testing/tls/tls-HSDDM05.spdl
diff --git a/...protocols/misc/tls/tls-paulson-avispa.cpp → testing/tls/tls-paulson-avispa.cpp b/...protocols/misc/tls/tls-paulson-avispa.cpp → testing/tls/tls-paulson-avispa.cpp
diff --git a/...rotocols/misc/tls/tls-paulson-avispa.spdl → testing/tls/tls-paulson-avispa.spdl b/...rotocols/misc/tls/tls-paulson-avispa.spdl → testing/tls/tls-paulson-avispa.spdl
diff --git a/testing/protocols/misc/tls/tls-paulson.cpp → testing/tls/tls-paulson.cpp b/testing/protocols/misc/tls/tls-paulson.cpp → testing/tls/tls-paulson.cpp
diff --git a/testing/protocols/misc/tls/tls-paulson.spdl → testing/tls/tls-paulson.spdl b/testing/protocols/misc/tls/tls-paulson.spdl → testing/tls/tls-paulson.spdl
diff --git a/testing/protocols/misc/tmn-Gijs.spdl → testing/tmn-Gijs.spdl b/testing/protocols/misc/tmn-Gijs.spdl → testing/tmn-Gijs.spdl
diff --git a/testing/protocols/misc/tmn.spdl → testing/tmn.spdl b/testing/protocols/misc/tmn.spdl → testing/tmn.spdl
diff --git a/testing/protocols/misc/unknown2.spdl → testing/unknown2.spdl b/testing/protocols/misc/unknown2.spdl → testing/unknown2.spdl
diff --git a/testing/protocols/misc/wmf-brutus.spdl → testing/wmf-brutus.spdl b/testing/protocols/misc/wmf-brutus.spdl → testing/wmf-brutus.spdl
diff --git a/testing/protocols/misc/woolam-cmv.spdl → testing/woolam-cmv.spdl b/testing/protocols/misc/woolam-cmv.spdl → testing/woolam-cmv.spdl
diff --git a/testing/protocols/misc/woolam-pi-f.spdl → testing/woolam-pi-f.spdl b/testing/protocols/misc/woolam-pi-f.spdl → testing/woolam-pi-f.spdl
diff --git a/testing/protocols/misc/yahalom-ban.spdl → testing/yahalom-ban.spdl b/testing/protocols/misc/yahalom-ban.spdl → testing/yahalom-ban.spdl
diff --git a/testing/protocols/misc/yahalom-lowe.spdl → testing/yahalom-lowe.spdl b/testing/protocols/misc/yahalom-lowe.spdl → testing/yahalom-lowe.spdl
diff --git a/testing/protocols/misc/yahalom-paulson.spdl → testing/yahalom-paulson.spdl b/testing/protocols/misc/yahalom-paulson.spdl → testing/yahalom-paulson.spdl