From 5ed9fefa7ef25585c2c9970c6bf62cddff51a09f Mon Sep 17 00:00:00 2001
From: ccremers <ccremers@4f7d145f-a0d4-0310-ae10-d96cc04433c1>
Date: Tue, 31 Aug 2004 14:32:31 +0000
Subject: [PATCH] - Improved these scenarios.

---
 spdl/otwayrees.spdl   | 10 ++++------
 spdl/yahalom-ban.spdl |  6 ++++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spdl/otwayrees.spdl b/spdl/otwayrees.spdl
index 710285a..b81e201 100644
--- a/spdl/otwayrees.spdl
+++ b/spdl/otwayrees.spdl
@@ -12,29 +12,27 @@ protocol otwayrees(A,B,S)
 	{
 		const na : Nonce;
 		const M : String;
-		var nb : Nonce;
 		var kab : SesKey;
 
 		send_1(A,B, M,A,B, { na,M,A,B }k(A,S) );
 		read_4(B,A, M, { na,kab }k(A,S) );
 
-		claim(A, Secret,kab);
+		claim_5(A, Secret,kab);
 	}
 
 	role B
 	{
-		var na : Nonce;
 		var M : String;
 		const nb : Nonce;
 		var kab : SesKey;
-		var t1,t2 : Ticket;
+		var t1,t2;
 
 		read_1(A,B, M,A,B, t1 );
-		send_2(B,S, M,A,B, t2, { nb,M,A,B }k(B,S) );
+		send_2(B,S, M,A,B, t1, { nb,M,A,B }k(B,S) );
 		read_3(S,B, M, t2, { nb,kab }k(B,S) );
 		send_4(B,A, M, t2 );
 
-		claim(B, Secret,kab);
+		claim_6(B, Secret,kab);
 	}
 
 	role S
diff --git a/spdl/yahalom-ban.spdl b/spdl/yahalom-ban.spdl
index fa620c4..64f43c3 100644
--- a/spdl/yahalom-ban.spdl
+++ b/spdl/yahalom-ban.spdl
@@ -9,6 +9,8 @@ const s : Server;
 secret k : Function;
 
 
+
+
 protocol yahalomBan(A,B,S)
 {
 	role A
@@ -21,7 +23,7 @@ protocol yahalomBan(A,B,S)
 		send_1(A,B, A,na);
 		read_3(S,A, nb, {B,kab,na}k(A,S), ticket );
 		send_4(A,B, ticket, {nb}kab );
-		claim(A, Secret,kab);
+		claim_5(A, Secret,kab);
 	}
 
 	role B
@@ -34,7 +36,7 @@ protocol yahalomBan(A,B,S)
 		read_1(A,B, A,na);
 		send_2(B,S, B,nb, {A,na}k(B,S) );
 		read_4(A,B, {A,kab,nb}k(B,S) , {nb}kab );
-		claim(B, Secret,kab);
+		claim_6(B, Secret,kab);
 	}
 
 	role S