- Modified everything for explicit usertype declarations.
This commit is contained in:
parent
95f8558514
commit
635e583039
@ -5,6 +5,8 @@
|
|||||||
Tried to stay as close as possible to compare timing results.
|
Tried to stay as close as possible to compare timing results.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
usertype Key;
|
||||||
|
|
||||||
const pk,hash: Function;
|
const pk,hash: Function;
|
||||||
secret sk: Function;
|
secret sk: Function;
|
||||||
|
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
Tried to stay as close as possible to compare timing results.
|
Tried to stay as close as possible to compare timing results.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
usertype Key;
|
||||||
|
|
||||||
const pk,hash: Function;
|
const pk,hash: Function;
|
||||||
secret sk,unhash: Function;
|
secret sk,unhash: Function;
|
||||||
|
|
||||||
|
@ -4,6 +4,8 @@ secret const k : Function;
|
|||||||
http://www.lsv.ens-cachan.fr/spore/otwayRees.html
|
http://www.lsv.ens-cachan.fr/spore/otwayRees.html
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
usertype String, SesKey, Ticket, Server;
|
||||||
|
|
||||||
protocol otwayrees(A,B,S)
|
protocol otwayrees(A,B,S)
|
||||||
{
|
{
|
||||||
role A
|
role A
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
#define CLIENTK hash(sid,M,na,pa,a,nb,pb,b,false)
|
#define CLIENTK hash(sid,M,na,pa,a,nb,pb,b,false)
|
||||||
#define SERVERK hash(sid,M,na,pa,a,nb,pb,b,true)
|
#define SERVERK hash(sid,M,na,pa,a,nb,pb,b,true)
|
||||||
|
|
||||||
|
usertype Params, Bool, SessionID;
|
||||||
|
|
||||||
const pk,hash: Function;
|
const pk,hash: Function;
|
||||||
secret sk,unhash: Function;
|
secret sk,unhash: Function;
|
||||||
inversekeys(pk,sk);
|
inversekeys(pk,sk);
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
usertype SesKey, Server;
|
||||||
secret const k : Function;
|
secret const k : Function;
|
||||||
|
|
||||||
/* Version from the Brutus reports
|
/* Version from the Brutus reports
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
usertype Server, SessionKey, Token, SymmetricKey;
|
||||||
secret k: Function;
|
secret k: Function;
|
||||||
|
|
||||||
const Alice, Bob, Charlie, Eve: Agent;
|
const Alice, Bob, Charlie, Eve: Agent;
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
usertype Server, SessionKey, Token, Ticket;
|
||||||
secret k: Function;
|
secret k: Function;
|
||||||
|
|
||||||
const Alice, Bob, Charlie, Eve: Agent;
|
const Alice, Bob, Charlie, Eve: Agent;
|
||||||
|
@ -2,8 +2,10 @@
|
|||||||
// Type flaw
|
// Type flaw
|
||||||
// This version actually works!
|
// This version actually works!
|
||||||
|
|
||||||
|
usertype Server;
|
||||||
|
|
||||||
const a,b,c : Agent;
|
const a,b,c : Agent;
|
||||||
const s : Simon;
|
const s : Server;
|
||||||
secret k : Function;
|
secret k : Function;
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
// Yahalom protocol
|
// Yahalom protocol
|
||||||
|
|
||||||
|
usertype Sessionkey;
|
||||||
|
|
||||||
const a,b,s,Eve : Agent;
|
const a,b,s,Eve : Agent;
|
||||||
secret k : Function;
|
secret k : Function;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user