sylv/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/Protocols/MultiProtocolAttacks/BKE.spdl
View File

@@ -37,9 +37,4 @@ protocol bke(I,R)
}
}
// An untrusted agent, with leaked information
const Eve: Agent;
untrusted Eve;
compromised sk(Eve);

6
gui/Protocols/MultiProtocolAttacks/andrew-ban-concrete.spdl
View File

@@ -65,9 +65,3 @@ protocol andrew-Concrete(I,R)
}
}
const Alice,Bob,Eve: Agent;
untrusted Eve;
const ne: Nonce;
const kee: SessionKey;

11
gui/Protocols/MultiProtocolAttacks/andrew-ban.spdl
View File

@@ -50,14 +50,3 @@ protocol andrew-Ban(I,R)
}
}
const Alice,Bob,Eve: Agent;
untrusted Eve;
const ne: Nonce;
const kee: SessionKey;
compromised k(Eve,Eve);
compromised k(Eve,Alice);
compromised k(Eve,Bob);
compromised k(Alice,Eve);
compromised k(Bob,Eve);

13
gui/Protocols/MultiProtocolAttacks/andrew-lowe-ban.spdl
View File

@@ -55,16 +55,3 @@ protocol andrew-LoweBan(I,R)
}
}
const Alice,Bob,Eve: Agent;
untrusted Eve;
const ne: Nonce;
const kee: SessionKey;
compromised k(Eve,Eve);
compromised k(Eve,Alice);
compromised k(Eve,Bob);
compromised k(Alice,Eve);
compromised k(Bob,Eve);

14
gui/Protocols/MultiProtocolAttacks/boyd.spdl
View File

@@ -54,17 +54,3 @@ protocol boyd(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
const mcsde: Macseed;
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);

6
gui/Protocols/MultiProtocolAttacks/ccitt509-ban3.spdl
View File

@@ -37,9 +37,3 @@ protocol ccitt509-ban3(I,R)
}
}
const Alice,Bob,Eve: Agent;
untrusted Eve;
const ne: Nonce;
compromised sk(Eve);

8
gui/Protocols/MultiProtocolAttacks/denning-sacco-lowe.spdl
View File

@@ -63,12 +63,4 @@ protocol denningSacco-Lowe(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const kee: SessionKey;
const tee: TimeStamp;
compromised k(Eve,Simon);

7
gui/Protocols/MultiProtocolAttacks/denning-sacco.spdl
View File

@@ -51,12 +51,5 @@ protocol denningSacco(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const kee: SessionKey;
const tee: TimeStamp;
compromised k(Eve,Simon);

14
gui/Protocols/MultiProtocolAttacks/gong-nonce-b.spdl
View File

@@ -58,17 +58,3 @@ protocol gongnonceb(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
const kpe: Keypart;
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);

14
gui/Protocols/MultiProtocolAttacks/gong-nonce.spdl
View File

@@ -55,17 +55,3 @@ protocol gongnonce(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
const kpe: Keypart;
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);

14
gui/Protocols/MultiProtocolAttacks/isoiec11770-2-13.spdl
View File

@@ -40,17 +40,3 @@ protocol isoiec11770213(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
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);

14
gui/Protocols/MultiProtocolAttacks/kaochow-v2.spdl
View File

@@ -53,17 +53,3 @@ protocol kaochow-2(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
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);

14
gui/Protocols/MultiProtocolAttacks/kaochow-v3.spdl
View File

@@ -57,17 +57,3 @@ protocol kaochow-3(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
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);

14
gui/Protocols/MultiProtocolAttacks/kaochow.spdl
View File

@@ -53,17 +53,3 @@ protocol kaochow(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
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);

15
gui/Protocols/MultiProtocolAttacks/ksl.spdl
View File

@@ -9,21 +9,16 @@
usertype Server, SessionKey, TimeStamp, TicketKey;
usertype ExpiredTimeStamp;
const a, b, e: Agent;
const s: Server;
const Fresh: Function;
const Compromised: Function;
untrusted e;
compromised k(e,s);
protocol ksl(I,R,S)
{
role I
{
const Ni, Mi: Nonce;
fresh Ni, Mi: Nonce;
var Nc, Mr: Nonce;
var T: Ticket;
var Kir: SessionKey;
@@ -45,10 +40,10 @@ protocol ksl(I,R,S)
role R
{
var Ni,Mi: Nonce;
const Nr,Nc,Mr: Nonce;
fresh Nr,Nc,Mr: Nonce;
var Kir: SessionKey;
const Kbb: TicketKey;
const Tr: TimeStamp;
fresh Kbb: TicketKey;
fresh Tr: TimeStamp;
var T: Ticket;
read_1(I,R, Ni, I);
@@ -70,7 +65,7 @@ protocol ksl(I,R,S)
role S
{
var Ni, Nr: Nonce;
const Kir: SessionKey;
fresh Kir: SessionKey;
read_2(R,S, Ni, I, Nr, R );
send_3(S,R, { Nr, I, Kir }k(R,S), { Ni,R,Kir }k(I,S) );

7
gui/Protocols/MultiProtocolAttacks/needham-schroeder-sk-amend.spdl
View File

@@ -64,10 +64,3 @@ protocol needhamschroedersk-amend(I,R,S)
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
compromised k(Eve,Simon);

6
gui/Protocols/MultiProtocolAttacks/needham-schroeder-sk.spdl
View File

@@ -54,9 +54,3 @@ protocol needhamschroedersk(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
compromised k(Eve,Simon);

5
gui/Protocols/MultiProtocolAttacks/ns3.spdl
View File

@@ -39,8 +39,3 @@ protocol ns3(I,R)
}
}
// An untrusted agent, with leaked information
const Eve: Agent;
untrusted Eve;
compromised sk(Eve);

5
gui/Protocols/MultiProtocolAttacks/nsl3.spdl
View File

@@ -37,8 +37,3 @@ protocol nsl3(I,R)
}
}
// An untrusted agent, with leaked information
const Eve: Agent;
untrusted Eve;
compromised sk(Eve);

5
gui/Protocols/MultiProtocolAttacks/otwayrees.spdl
View File

@@ -54,8 +54,3 @@ protocol otwayrees(I,R,S)
}
}
const Alice, Bob, Eve, Simon: Agent;
untrusted Eve;
compromised k(Eve,Simon);

6
gui/Protocols/MultiProtocolAttacks/soph.spdl
View File

@@ -19,9 +19,3 @@ protocol soph(I,R)
}
}
const Alice,Bob,Eve: Agent;
untrusted Eve;
const nc: Nonce;
compromised sk(Eve);

6
gui/Protocols/MultiProtocolAttacks/splice-as-cj.spdl
View File

@@ -64,9 +64,3 @@ protocol spliceAS-CJ(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
compromised sk(Eve);

11
gui/Protocols/MultiProtocolAttacks/splice-as-hc.spdl
View File

@@ -7,9 +7,6 @@
usertype TimeStamp, LifeTime;
const pk: Function;
secret sk: Function;
inversekeys (pk,sk);
const inc,dec: Function;
inversekeys (inc,dec);
@@ -62,11 +59,3 @@ protocol spliceAS-HC(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
compromised sk(Eve);

6
gui/Protocols/MultiProtocolAttacks/splice-as.spdl
View File

@@ -64,9 +64,3 @@ protocol spliceAS(I,R,S)
}
}
const Alice,Bob,Simon,Eve: Agent;
untrusted Eve;
const ne: Nonce;
compromised sk(Eve);

9
gui/Protocols/MultiProtocolAttacks/tmn.spdl
View File

@@ -49,12 +49,3 @@ protocol tmn(I,R,S)
}
}
const Alice,Bob,Eve,Simon: Agent;
const Ke: SessionKey;
untrusted Eve;
compromised sk(Eve);

8
gui/Protocols/MultiProtocolAttacks/wmf-brutus.spdl
View File

@@ -30,11 +30,3 @@ protocol wmfbrutus(A,B,S)
}
}
const Alice, Bob, Eve: Agent;
const Simon: Server;
untrusted Eve;
compromised k(Eve,Simon);

10
gui/Protocols/MultiProtocolAttacks/wmf-lowe.spdl
View File

@@ -61,13 +61,3 @@ protocol wmf-Lowe(I,R,S)
}
}
const Alice,Bob,Eve,Simon: Agent;
const Ke: SessionKey;
const Te: TimeStamp;
untrusted Eve;
compromised k(Eve,Simon);

10
gui/Protocols/MultiProtocolAttacks/wmf.spdl
View File

@@ -52,13 +52,3 @@ protocol wmf(I,R,S)
}
}
const Alice,Bob,Eve,Simon: Agent;
const Ke: SessionKey;
const Te: TimeStamp;
untrusted Eve;
compromised k(Eve,Simon);

12
gui/Protocols/MultiProtocolAttacks/woo-lam-pi-1.spdl
View File

@@ -18,7 +18,7 @@ protocol woolamPi-1(I,R,S)
role R
{
const Nr: Nonce;
fresh Nr: Nonce;
var T: Ticket;
read_1(I,R, I);
@@ -39,13 +39,3 @@ protocol woolamPi-1(I,R,S)
}
}
const Alice,Bob,Eve,Simon: Agent;
const Te: Ticket;
const Ne: Nonce;
untrusted Eve;
compromised k(Eve,Simon);

12
gui/Protocols/MultiProtocolAttacks/woo-lam-pi-2.spdl
View File

@@ -18,7 +18,7 @@ protocol woolamPi-2(I,R,S)
role R
{
const Nr: Nonce;
fresh Nr: Nonce;
var T: Ticket;
read_1(I,R, I);
@@ -39,13 +39,3 @@ protocol woolamPi-2(I,R,S)
}
}
const Alice,Bob,Eve,Simon: Agent;
const Te: Ticket;
const Ne: Nonce;
untrusted Eve;
compromised k(Eve,Simon);

12
gui/Protocols/MultiProtocolAttacks/woo-lam-pi-3.spdl
View File

@@ -18,7 +18,7 @@ protocol woolamPi-3(I,R,S)
role R
{
const Nr: Nonce;
fresh Nr: Nonce;
var T: Ticket;
read_1(I,R, I);
@@ -39,13 +39,3 @@ protocol woolamPi-3(I,R,S)
}
}
const Alice,Bob,Eve,Simon: Agent;
const Te: Ticket;
const Ne: Nonce;
untrusted Eve;
compromised k(Eve,Simon);

8
gui/Protocols/MultiProtocolAttacks/woo-lam-pi-f.spdl
View File

@@ -39,11 +39,3 @@ protocol woolamPi-f(I,R,S)
}
}
const Alice,Bob,Eve,Simon: Agent;
const Te: Ticket;
const Ne: Nonce;
untrusted Eve;
compromised k(Eve,Simon);

3
gui/Protocols/MultiProtocolAttacks/yahalom-ban-paulson-modified.spdl
View File

@@ -9,9 +9,6 @@
usertype Server;
usertype SessionKey;
const a,b,c : Agent;
const s : Server;
protocol yahalom-BAN-Paulson-modified(A,B,S)
{
role A

3
gui/Protocols/MultiProtocolAttacks/yahalom-ban-paulson.spdl
View File

@@ -7,9 +7,6 @@
usertype Server;
usertype SessionKey;
const a,b,c : Agent;
const s : Server;
protocol yahalom-BAN-Paulson(A,B,S)
{
role A

1
gui/Protocols/MultiProtocolAttacks/yahalom-ban.spdl
View File

@@ -52,5 +52,4 @@ protocol yahalom-BAN(I,R,S)
}
}
const Alice,Bob,Charlie,David: Agent;

1
gui/Protocols/MultiProtocolAttacks/yahalom-lowe.spdl
View File

@@ -50,5 +50,4 @@ protocol yahalom-Lowe(I,R,S)
}
}
const Alice,Bob,Simon : Agent;

7
gui/Protocols/MultiProtocolAttacks/yahalom.spdl
View File

@@ -50,10 +50,3 @@ protocol yahalom(I,R,S)
}
}
const Alice,Bob,Simon : Agent;
const Eve: Agent;
untrusted Eve;
compromised k(Eve,Simon);