diff --git a/spdl/multiprotocoltest.py b/spdl/multiprotocoltest.py index 562c549..d0a0160 100755 --- a/spdl/multiprotocoltest.py +++ b/spdl/multiprotocoltest.py @@ -31,6 +31,7 @@ ReportInterval = 10 ScytherArgs = ScytherDefaults + " " + ScytherMethods + " " + ScytherBounds CommandPrefix = ScytherProgram + " " + ScytherArgs +IncludeProtocols = 'spdl-defaults.inc' ProtocolClaims = {} ProtocolFiles = {} @@ -71,7 +72,7 @@ def GetKeys (f, x): # Yield the commandline to test, given a list of protocols def CommandLine (plist): linelist = " ".join(plist) - return "cat " + linelist + " | " + CommandPrefix + return "cat " + IncludeProtocols + " " + linelist + " | " + CommandPrefix # ScytherEval diff --git a/spdl/spdl-defaults.inc b/spdl/spdl-defaults.inc new file mode 100644 index 0000000..9a0b77c --- /dev/null +++ b/spdl/spdl-defaults.inc @@ -0,0 +1,34 @@ +/* default includes */ + +/* asymmetric */ + +const pk,hash: Function; +secret sk,unhash: Function; +inversekeys (pk,sk); +inversekeys (hash,unhash); + + +/* symmetric */ + +usertype SessionKey; +secret k: Function; + +/* agents */ + +const a,b,e: Agent; + + +/* untrusted e */ + +untrusted e; +compromised sk(e); +const ne: Nonce; +const kee: SessionKey; + +compromised k(e,e); +compromised k(e,a); +compromised k(e,b); +compromised k(a,e); +compromised k(b,e); + +