From ee5ddea4d06643601d690552a2909e0e407160e0 Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Mon, 30 Aug 2004 06:06:37 +0000
Subject: [PATCH] - Added a new test. - Fixed some notations.

---
 spdl/bke-ordertest.spdl | 58 +++++++++++++++++++++++++++++++++++++
 spdl/yahalom-lowe.spdl  | 63 +++++++++++++++++++++--------------------
 2 files changed, 91 insertions(+), 30 deletions(-)
 create mode 100644 spdl/bke-ordertest.spdl

diff --git a/spdl/bke-ordertest.spdl b/spdl/bke-ordertest.spdl
new file mode 100644
index 0000000..05a600a
--- /dev/null
+++ b/spdl/bke-ordertest.spdl
@@ -0,0 +1,58 @@
+/* 
+	Bilateral Key Exchange with Public Key protocol (BKEPK)
+*/
+
+usertype Key;
+
+const pk,hash: Function;
+secret sk,unhash: Function;
+
+inversekeys (pk,sk);
+inversekeys (hash,unhash);
+
+protocol bkepk(I,R)
+{
+	role I
+	{
+		const ni: Nonce;
+		var nr: Nonce;
+		var kir: Key;
+
+		send_1 (I,R, { ni,I }pk(R) );
+		read_2 (R,I, { hash(ni),nr,R,kir }pk(I) );
+		send_3 (I,R, { hash(nr) }kir );
+		claim_4 (I, Secret, kir );
+	}
+
+	role R
+	{
+		var ni: Nonce;
+		const nr: Nonce;
+		const kir: Key;
+
+		read_1 (I,R, { ni,I }pk(R) );
+		send_2 (R,I, { hash(ni),nr,R,kir }pk(I) );
+		read_3 (I,R, { hash(nr) }kir );
+		claim_5 (R, Secret, kir );
+	}
+}
+
+const a,b,e: Agent;
+
+untrusted e;
+compromised sk(e);
+const ne: Nonce;
+
+run bkepk.I(a,Agent);
+run bkepk.I(a,Agent);
+run bkepk.R(Agent,b);
+run bkepk.R(Agent,b);
+
+run bkepk.I(a,Agent);
+run bkepk.R(Agent,b);
+run bkepk.I(a,Agent);
+run bkepk.R(Agent,b);
+
+run bkepk.I(a,Agent);
+run bkepk.R(Agent,b);
+
diff --git a/spdl/yahalom-lowe.spdl b/spdl/yahalom-lowe.spdl
index edee78d..87ecc5e 100644
--- a/spdl/yahalom-lowe.spdl
+++ b/spdl/yahalom-lowe.spdl
@@ -2,54 +2,57 @@
 
 usertype Sessionkey;
 
-const a,b,s,Eve : Agent;
+const Alice,Bob,Simon,Eve : Agent;
 secret k : Function;
 
 untrusted Eve;
-compromised k(Eve,s);
+compromised k(Eve,Simon);
+const ne: Nonce;
+const kee: Sessionkey;
 
-protocol yahalomlowe(A,B,S)
+protocol yahalomlowe(I,R,S)
 {
-	role A
+	role I
 	{
-		const na: Nonce;
-		var nb: Nonce;
-		var kab: Sessionkey;
+		const ni: Nonce;
+		var nr: Nonce;
+		var kir: Sessionkey;
 
-		send_1(A,B, A,na);
-		read_3(S,A, {B,kab,na,nb}k(A,S) );
-		send_5(A,B, {A,B,S,nb}kab );
-		claim(A, Secret,kab);
+		send_1(I,R, I,ni);
+		read_3(S,I, {R,kir,ni,nr}k(I,S) );
+		send_5(I,R, {I,R,S,nr}kir );
+		claim_8(I, Secret,kir);
 	}
 
-	role B
+	role R
 	{
-		const nb: Nonce;
-		var na: Nonce;
-		var kab: Sessionkey;
+		const nr: Nonce;
+		var ni: Nonce;
+		var kir: Sessionkey;
 
-		read_1(A,B, A,na);
-		send_2(B,S, {A,na,nb}k(B,S) );
-		read_4(S,B, {A,kab}k(B,S) );
-		read_5(A,B, {A,B,S,nb}kab );
-		claim(B, Secret,kab);
+		read_1(I,R, I,ni);
+		send_2(R,S, {I,ni,nr}k(R,S) );
+		read_4(S,R, {I,kir}k(R,S) );
+		read_5(I,R, {I,R,S,nr}kir );
+		claim_9(R, Secret,kir);
+		claim_10(R, Nisynch);
 	}
 
 	role S
 	{
-		const kab: Sessionkey;
-		var na,nb: Nonce;
+		const kir: Sessionkey;
+		var ni,nr: Nonce;
 
-		read_2(B,S, {A,na,nb}k(B,S) );
-		send_3(S,A, {B,kab,na,nb}k(A,S) );
-		send_4(S,B, {A,kab}k(B,S) );
+		read_2(R,S, {I,ni,nr}k(R,S) );
+		send_3(S,I, {R,kir,ni,nr}k(I,S) );
+		send_4(S,R, {I,kir}k(R,S) );
 	}
 }
 
-run yahalomlowe.A(Agent,Agent,s);
-run yahalomlowe.B(Agent,Agent,s);
-run yahalomlowe.S(Agent,Agent,s);
+run yahalomlowe.I(Agent,Agent,Simon);
+run yahalomlowe.R(Agent,Agent,Simon);
+run yahalomlowe.S(Agent,Agent,Simon);
 
-run yahalomlowe.A(Agent,Agent,s);
-run yahalomlowe.B(Agent,Agent,s);
+run yahalomlowe.I(Agent,Agent,Simon);
+run yahalomlowe.R(Agent,Agent,Simon);