From 3687bff185ef9e40d769a6f390b1d80935f67d3f Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Mon, 30 Aug 2004 22:12:18 +0000
Subject: [PATCH] - Fixed kaochow - Niek Palm version.

---
 spdl/kaochow-palm.spdl | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/spdl/kaochow-palm.spdl b/spdl/kaochow-palm.spdl
index d74fbf9..62a0535 100644
--- a/spdl/kaochow-palm.spdl
+++ b/spdl/kaochow-palm.spdl
@@ -1,4 +1,5 @@
 usertype Sessionkey;
+usertype Ticket;
 secret k: Function;
 
 protocol kaochowPalm(I,R,S)
@@ -6,17 +7,36 @@ protocol kaochowPalm(I,R,S)
 	role I
 	{
 		const ni: Nonce;
-		var X: Nonce;
-		var KX: Sessionkey;
+		var nr: Nonce;
+		var kir: Sessionkey;
 
+		send_1 (I,S, I,R,ni);
+		read_3 (R,I, {I,R,ni,kir}k(I,S), {ni}kir, nr );
+		send_4 (I,R, {nr}kir );
 	}	
 	
 	role R
 	{
+		var ni: Nonce;
+		const nr: Nonce;
+		var kir: Sessionkey;
+		var T;
+
+		read_2 (S,R, { T, { I,R,ni,kir }k(R,S) }k(R,S) ); 
+		send_3 (R,I, T, {ni}kir, nr );
+		read_4 (I,R, {nr}kir );
+
+		claim_5 (R, Nisynch);
+		claim_6 (R, Secret, kir);
 	}
 
 	role S
 	{
+		var ni: Nonce;
+		const kir: Sessionkey;
+
+		read_1 (I,S, I,R,ni);
+		send_2 (S,R, { {I,R,ni,kir}k(I,S), { I,R,ni,kir }k(R,S) }k(R,S) ); 
 	}
 }
 
@@ -24,7 +44,15 @@ const Alice,Bob,Simon,Eve: Agent;
 
 untrusted Eve;
 const ne: Nonce;
-compromised sk(Eve);
+const te: Ticket;
+const ke: Sessionkey;
+compromised k(Eve,Eve);
+compromised k(Eve,Alice);
+compromised k(Eve,Bob);
+compromised k(Eve,Simon);
+compromised k(Alice,Eve);
+compromised k(Bob,Eve);
+compromised k(Simon,Eve);
 
 run kaochowPalm.I(Agent,Agent,Simon);
 run kaochowPalm.R(Agent,Agent,Simon);