From 59080a2b5cc086ba7c331c6b6a839a213b1d5071 Mon Sep 17 00:00:00 2001
From: Cas Cremers <cas.cremers@gmail.com>
Date: Fri, 31 Dec 2010 15:41:52 +0100
Subject: [PATCH] Updating protocol descriptions.

---
 gui/Protocols/MultiProtocolAttacks/BKE.spdl          |  6 ++++++
 gui/Protocols/MultiProtocolAttacks/gong-nonce-b.spdl |  6 ------
 gui/Protocols/MultiProtocolAttacks/gong-nonce.spdl   | 12 ++++++------
 .../MultiProtocolAttacks/isoiec11770-2-13.spdl       |  6 ------
 gui/Protocols/MultiProtocolAttacks/ns3.spdl          |  5 +++++
 gui/Protocols/MultiProtocolAttacks/nsl3.spdl         |  5 +++++
 gui/Protocols/MultiProtocolAttacks/soph.spdl         |  4 ----
 gui/Protocols/MultiProtocolAttacks/wmf-brutus.spdl   |  7 -------
 8 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/gui/Protocols/MultiProtocolAttacks/BKE.spdl b/gui/Protocols/MultiProtocolAttacks/BKE.spdl
index eaa08b9..426ac1b 100644
--- a/gui/Protocols/MultiProtocolAttacks/BKE.spdl
+++ b/gui/Protocols/MultiProtocolAttacks/BKE.spdl
@@ -37,3 +37,9 @@ protocol bke(I,R)
 	}
 }
 
+// An untrusted agent, with leaked information
+
+const Eve: Agent;
+untrusted Eve;
+compromised sk(Eve);
+
diff --git a/gui/Protocols/MultiProtocolAttacks/gong-nonce-b.spdl b/gui/Protocols/MultiProtocolAttacks/gong-nonce-b.spdl
index 57e9b60..894ae70 100644
--- a/gui/Protocols/MultiProtocolAttacks/gong-nonce-b.spdl
+++ b/gui/Protocols/MultiProtocolAttacks/gong-nonce-b.spdl
@@ -72,9 +72,3 @@ compromised k(Alice,Eve);
 compromised k(Bob,Eve);
 compromised k(Simon,Eve);
 
-run gongnonceb.I(Agent,Agent,Simon);
-run gongnonceb.R(Agent,Agent,Simon);
-run gongnonceb.S(Agent,Agent,Simon);
-run gongnonceb.I(Agent,Agent,Simon);
-run gongnonceb.R(Agent,Agent,Simon);
-run gongnonceb.S(Agent,Agent,Simon);
diff --git a/gui/Protocols/MultiProtocolAttacks/gong-nonce.spdl b/gui/Protocols/MultiProtocolAttacks/gong-nonce.spdl
index 48d053d..801e5a2 100644
--- a/gui/Protocols/MultiProtocolAttacks/gong-nonce.spdl
+++ b/gui/Protocols/MultiProtocolAttacks/gong-nonce.spdl
@@ -1,3 +1,9 @@
+/*
+ * From Boyd Mathuria
+ *
+ * To check: 3.38 or other?
+ *
+ */
 usertype Sessionkey;
 usertype Keypart;
 
@@ -63,9 +69,3 @@ compromised k(Alice,Eve);
 compromised k(Bob,Eve);
 compromised k(Simon,Eve);
 
-run gongnonce.I(Agent,Agent,Simon);
-run gongnonce.R(Agent,Agent,Simon);
-run gongnonce.S(Agent,Agent,Simon);
-run gongnonce.I(Agent,Agent,Simon);
-run gongnonce.R(Agent,Agent,Simon);
-run gongnonce.S(Agent,Agent,Simon);
diff --git a/gui/Protocols/MultiProtocolAttacks/isoiec11770-2-13.spdl b/gui/Protocols/MultiProtocolAttacks/isoiec11770-2-13.spdl
index 6715f83..735b869 100644
--- a/gui/Protocols/MultiProtocolAttacks/isoiec11770-2-13.spdl
+++ b/gui/Protocols/MultiProtocolAttacks/isoiec11770-2-13.spdl
@@ -54,9 +54,3 @@ compromised k(Alice,Eve);
 compromised k(Bob,Eve);
 compromised k(Simon,Eve);
 
-run isoiec11770213.I(Agent,Agent,Simon);
-run isoiec11770213.R(Agent,Agent,Simon);
-run isoiec11770213.S(Agent,Agent,Simon);
-run isoiec11770213.I(Agent,Agent,Simon);
-run isoiec11770213.R(Agent,Agent,Simon);
-run isoiec11770213.S(Agent,Agent,Simon);
diff --git a/gui/Protocols/MultiProtocolAttacks/ns3.spdl b/gui/Protocols/MultiProtocolAttacks/ns3.spdl
index b860cbf..fea06ab 100644
--- a/gui/Protocols/MultiProtocolAttacks/ns3.spdl
+++ b/gui/Protocols/MultiProtocolAttacks/ns3.spdl
@@ -39,3 +39,8 @@ protocol ns3(I,R)
 	}
 }
 
+// An untrusted agent, with leaked information
+
+const Eve: Agent;
+untrusted Eve;
+compromised sk(Eve);
diff --git a/gui/Protocols/MultiProtocolAttacks/nsl3.spdl b/gui/Protocols/MultiProtocolAttacks/nsl3.spdl
index af99579..479bbbb 100644
--- a/gui/Protocols/MultiProtocolAttacks/nsl3.spdl
+++ b/gui/Protocols/MultiProtocolAttacks/nsl3.spdl
@@ -37,3 +37,8 @@ protocol nsl3(I,R)
 	}
 }
 
+// An untrusted agent, with leaked information
+
+const Eve: Agent;
+untrusted Eve;
+compromised sk(Eve);
diff --git a/gui/Protocols/MultiProtocolAttacks/soph.spdl b/gui/Protocols/MultiProtocolAttacks/soph.spdl
index 523f62c..be14707 100644
--- a/gui/Protocols/MultiProtocolAttacks/soph.spdl
+++ b/gui/Protocols/MultiProtocolAttacks/soph.spdl
@@ -25,7 +25,3 @@ untrusted Eve;
 const nc: Nonce;
 compromised sk(Eve);
 
-run soph.I(Agent,Agent);
-run soph.R(Agent,Agent);
-run soph.I(Agent,Agent);
-run soph.R(Agent,Agent);
diff --git a/gui/Protocols/MultiProtocolAttacks/wmf-brutus.spdl b/gui/Protocols/MultiProtocolAttacks/wmf-brutus.spdl
index e552f51..e980104 100644
--- a/gui/Protocols/MultiProtocolAttacks/wmf-brutus.spdl
+++ b/gui/Protocols/MultiProtocolAttacks/wmf-brutus.spdl
@@ -36,12 +36,5 @@ const Simon: Server;
 untrusted Eve;
 compromised k(Eve,Simon);
 
-run wmfbrutus.A(Agent, Agent, Simon);
-run wmfbrutus.B(Agent, Agent, Simon);
-run wmfbrutus.A(Agent, Agent, Simon);
-run wmfbrutus.B(Agent, Agent, Simon);
-run wmfbrutus.A(Agent, Agent, Simon);
-run wmfbrutus.B(Agent, Agent, Simon);
 
-run wmfbrutus.S(Agent, Agent, Simon);