- Added default include file.

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

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);
+
+