- Improved these scenarios.

This commit is contained in:
ccremers 2004-08-31 14:32:31 +00:00
parent 8b48aade68
commit 5ed9fefa7e
2 changed files with 8 additions and 8 deletions

View File

@ -12,29 +12,27 @@ protocol otwayrees(A,B,S)
{ {
const na : Nonce; const na : Nonce;
const M : String; const M : String;
var nb : Nonce;
var kab : SesKey; var kab : SesKey;
send_1(A,B, M,A,B, { na,M,A,B }k(A,S) ); send_1(A,B, M,A,B, { na,M,A,B }k(A,S) );
read_4(B,A, M, { na,kab }k(A,S) ); read_4(B,A, M, { na,kab }k(A,S) );
claim(A, Secret,kab); claim_5(A, Secret,kab);
} }
role B role B
{ {
var na : Nonce;
var M : String; var M : String;
const nb : Nonce; const nb : Nonce;
var kab : SesKey; var kab : SesKey;
var t1,t2 : Ticket; var t1,t2;
read_1(A,B, M,A,B, t1 ); 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) ); read_3(S,B, M, t2, { nb,kab }k(B,S) );
send_4(B,A, M, t2 ); send_4(B,A, M, t2 );
claim(B, Secret,kab); claim_6(B, Secret,kab);
} }
role S role S

View File

@ -9,6 +9,8 @@ const s : Server;
secret k : Function; secret k : Function;
protocol yahalomBan(A,B,S) protocol yahalomBan(A,B,S)
{ {
role A role A
@ -21,7 +23,7 @@ protocol yahalomBan(A,B,S)
send_1(A,B, A,na); send_1(A,B, A,na);
read_3(S,A, nb, {B,kab,na}k(A,S), ticket ); read_3(S,A, nb, {B,kab,na}k(A,S), ticket );
send_4(A,B, ticket, {nb}kab ); send_4(A,B, ticket, {nb}kab );
claim(A, Secret,kab); claim_5(A, Secret,kab);
} }
role B role B
@ -34,7 +36,7 @@ protocol yahalomBan(A,B,S)
read_1(A,B, A,na); read_1(A,B, A,na);
send_2(B,S, B,nb, {A,na}k(B,S) ); send_2(B,S, B,nb, {A,na}k(B,S) );
read_4(A,B, {A,kab,nb}k(B,S) , {nb}kab ); read_4(A,B, {A,kab,nb}k(B,S) , {nb}kab );
claim(B, Secret,kab); claim_6(B, Secret,kab);
} }
role S role S