Large pass on protocol specification files to get rid of deprecated constructions.

This commit is contained in:
Cas Cremers
2012-04-23 15:53:28 +02:00
parent 30006b732a
commit 755c4519c6
83 changed files with 165 additions and 940 deletions

View File

@@ -7,7 +7,6 @@
usertype SessionKey;
secret k: Function;
const Fresh: Function;
const Compromised: Function;
@@ -15,7 +14,7 @@ protocol woolam(I,R,S)
{
role I
{
const N1: Nonce;
fresh N1: Nonce;
var Kir: SessionKey;
var N2: Nonce;
@@ -33,7 +32,7 @@ protocol woolam(I,R,S)
role R
{
const N2: Nonce;
fresh N2: Nonce;
var N1: Nonce;
var Kir: SessionKey;
var T1,T2: Ticket;
@@ -53,7 +52,7 @@ protocol woolam(I,R,S)
role S
{
const Kir: SessionKey;
fresh Kir: SessionKey;
var N1,N2: Nonce;
read_4(R,S, {I, R, N1, N2}k(I,S), {I, R, N1, N2}k(R,S));
@@ -61,14 +60,3 @@ protocol woolam(I,R,S)
}
}
const Alice,Bob,Eve,Simon: Agent;
const Ke: SessionKey;
const Te: Ticket;
const Ne: Nonce;
untrusted Eve;
compromised k(Eve,Simon);