Synchronising MPA branch with compromise branch where possible.

This commit is contained in:
Cas Cremers
2012-04-25 17:03:51 +02:00
parent 19359f9ba9
commit 9b0915441f
19 changed files with 54 additions and 105 deletions

View File

@@ -12,13 +12,14 @@ protocol ns3(I,R)
var nr: Nonce;
send_1(I,R, {ni,I}pk(R) );
read_2(R,I, {ni,nr}pk(I) );
recv_2(R,I, {ni,nr}pk(I) );
send_3(I,R, {nr}pk(R) );
claim_i1(I,Secret,ni);
claim_i2(I,Secret,nr);
claim_i3(I,Niagree);
claim_i4(I,Nisynch);
claim_i3(I,Alive);
claim_i4(I,Niagree);
claim_i5(I,Nisynch);
}
role R
@@ -26,14 +27,15 @@ protocol ns3(I,R)
var ni: Nonce;
fresh nr: Nonce;
read_1(I,R, {ni,I}pk(R) );
recv_1(I,R, {ni,I}pk(R) );
send_2(R,I, {ni,nr}pk(I) );
read_3(I,R, {nr}pk(R) );
recv_3(I,R, {nr}pk(R) );
claim_r1(R,Secret,ni);
claim_r2(R,Secret,nr);
claim_r3(R,Niagree);
claim_r4(R,Nisynch);
claim_r3(R,Alive);
claim_r4(R,Niagree);
claim_r5(R,Nisynch);
}
}