- Moved the tests into default arguments
This commit is contained in:
ccremers
parent
f4c80a3599
commit
8e4e0275e8
@ -22,26 +22,21 @@
|
||||
# To verify combos of protocols starting with s and t
|
||||
#
|
||||
|
||||
import tuplesdo
|
||||
# ***********************
|
||||
# MODULES
|
||||
# ***********************
|
||||
|
||||
import os
|
||||
import sys
|
||||
import string
|
||||
import commands
|
||||
import copy
|
||||
import scythercache
|
||||
from tempfile import NamedTemporaryFile
|
||||
from optparse import OptionParser
|
||||
|
||||
# ***********************
|
||||
# EXPERIMENTS
|
||||
# ***********************
|
||||
|
||||
### Test 0-2
|
||||
###------------------------------------------------------------------
|
||||
TupleWidth = "2"
|
||||
ScytherMethods = "--match=0 --arachne"
|
||||
ScytherBounds = "--timer=5 --max-runs=5 --max-length=20"
|
||||
|
||||
### Test 1-2
|
||||
###------------------------------------------------------------------
|
||||
#TupleWidth = "2"
|
||||
#ScytherMethods = "--match=1 --arachne"
|
||||
#ScytherBounds = "--timer=5 --max-runs=5 --max-length=20"
|
||||
import tuplesdo
|
||||
import scythercache
|
||||
import protocollist
|
||||
|
||||
|
||||
# ***********************
|
||||
@ -55,14 +50,8 @@ TempFileTuples = "scyther-blip.tmp"
|
||||
# External programs
|
||||
TupleProgram = "./tuples.py"
|
||||
|
||||
# Scyther parameters
|
||||
ScytherDefaults = "--summary"
|
||||
|
||||
# Build a large part of the command line (for Scyther) already
|
||||
ScytherArgs = ScytherDefaults + " " + ScytherMethods + " " + ScytherBounds
|
||||
CommandPrefix = "scyther " + ScytherArgs
|
||||
|
||||
# Some default settings for Agents, untrusted e with sk(e) and k(a,e) etc.
|
||||
ScytherDefaults = "--summary"
|
||||
IncludeProtocols = '../spdl/spdl-defaults.inc'
|
||||
|
||||
# Some protocols are causing troubles: this is a hard-coded filter to exclude
|
||||
@ -78,15 +67,6 @@ ProtocolToEffectsMap = {} # maps protocols that help create multiple flaws, to t
|
||||
# Ugly hack. Works.
|
||||
safetxt = " " * 20
|
||||
|
||||
# ***********************
|
||||
# MODULES
|
||||
# ***********************
|
||||
|
||||
import os
|
||||
import sys
|
||||
import string
|
||||
import commands
|
||||
|
||||
# ***********************
|
||||
# LIBS
|
||||
# ***********************
|
||||
@ -147,10 +127,11 @@ def ScytherEval (plist):
|
||||
|
||||
# Combine protocol list to an input
|
||||
input = ""
|
||||
for fn in plist:
|
||||
f = open(fn, "r")
|
||||
input = input + f.read()
|
||||
f.close()
|
||||
for fn in (IncludeProtocols.split(" ") + plist):
|
||||
if len(fn) > 0:
|
||||
f = open(fn, "r")
|
||||
input = input + f.read()
|
||||
f.close()
|
||||
|
||||
# Use Scyther
|
||||
(status,scout) = scythercache.eval(ScytherArgs,input)
|
||||
@ -426,36 +407,62 @@ def SignalAttack (protocols, claim):
|
||||
#
|
||||
# Furthermore, TempFileList is created.
|
||||
|
||||
parser = OptionParser()
|
||||
parser.add_option("-m","--match", dest="match",
|
||||
default = 0,
|
||||
help = "select matching method (0: no type flaws, 2: \
|
||||
full type flaws")
|
||||
parser.add_option("-t","--tuplewidth", dest="tuplewidth",
|
||||
default = 2,
|
||||
help = "number of concurrent protocols to test, >=2")
|
||||
parser.add_option("-p","--protocols", dest="protocols",
|
||||
default = 0,
|
||||
help = "protocol selection (0: all, 1:literature only)")
|
||||
parser.add_option("-b","--bounds", dest="bounds",
|
||||
default = 0,
|
||||
help = "bound type selection (0: quickscan, 1:thorough)")
|
||||
parser.add_option("-s","--start", dest="startpercentage",
|
||||
default = 0,
|
||||
help = "start test at a certain percentage")
|
||||
|
||||
(options, args) = parser.parse_args()
|
||||
|
||||
# Where should we start (if this is a number)
|
||||
if len(sys.argv) > 1:
|
||||
StartPercentage = int (sys.argv[1])
|
||||
if StartPercentage < 0 or StartPercentage > 100:
|
||||
print "Illegal range for starting percentage (0-100):", StartPercentage
|
||||
sys.exit()
|
||||
StartPercentage = int (options.startpercentage)
|
||||
if StartPercentage < 0 or StartPercentage > 100:
|
||||
print "Illegal range for starting percentage (0-100):", StartPercentage
|
||||
sys.exit()
|
||||
|
||||
else:
|
||||
StartPercentage = 0
|
||||
|
||||
# Read stdin into list and count, send to file
|
||||
loop = 1
|
||||
ProtocolCount = 0
|
||||
ProtocolFileList = []
|
||||
# Send protocollist to temp file (is this necessary?)
|
||||
ProtocolFileList = protocollist.select(options.protocols)
|
||||
ProtocolCount = len(ProtocolFileList)
|
||||
outp = open(TempFileList, 'w')
|
||||
while loop:
|
||||
line = sys.stdin.readline()
|
||||
if line != '':
|
||||
# not the end of the input
|
||||
cleanline = string.strip(line)
|
||||
if cleanline != '' and cleanline[0] != '#' and cleanline not in SkipList:
|
||||
# not a blank line, not forbidden
|
||||
ProtocolFileList.append(cleanline)
|
||||
ProtocolCount = ProtocolCount + 1
|
||||
outp.write(line)
|
||||
else:
|
||||
# end of the input
|
||||
loop = 0
|
||||
for l in ProtocolFileList:
|
||||
outp.write(l + "\n")
|
||||
outp.close()
|
||||
|
||||
# Determine arguments
|
||||
TupleWidth = str(options.tuplewidth)
|
||||
|
||||
# Match
|
||||
ScytherMethods = "--match=" + str(options.match)
|
||||
|
||||
# Method of bounding
|
||||
if options.bounds == 0:
|
||||
ScytherBounds = "--arachne --timer=4 --max-runs=5 --max-length=20"
|
||||
elif options.bounds == 1:
|
||||
ScytherBounds = "--arachne --timer=15 --max-runs=6 --max-length=30"
|
||||
else:
|
||||
print "Don't know bounds method", options.bounds
|
||||
sys.exit()
|
||||
|
||||
|
||||
# Combine it all
|
||||
ScytherArgs = ScytherDefaults + " " + ScytherMethods + " " + ScytherBounds
|
||||
CommandPrefix = "scyther " + ScytherArgs
|
||||
|
||||
|
||||
|
||||
# Caching of single-protocol results for speed gain.
|
||||
#----------------------------------------------------------------------
|
||||
#
|
||||
|
||||
73
test/protocollist.py
Normal file
73
test/protocollist.py
Normal file
@ -0,0 +1,73 @@
|
||||
#
|
||||
# protocol list
|
||||
#
|
||||
def from_literature():
|
||||
list = [ \
|
||||
"andrew-ban.spdl",
|
||||
"andrew-lowe-ban.spdl",
|
||||
"bkepk.spdl",
|
||||
"bke.spdl",
|
||||
"boyd.spdl",
|
||||
"ccitt509-ban.spdl",
|
||||
"denning-sacco-shared.spdl",
|
||||
"gong-nonce-b.spdl",
|
||||
"gong-nonce.spdl",
|
||||
"isoiec11770-2-13.spdl",
|
||||
"kaochow-palm.spdl",
|
||||
"kaochow.spdl",
|
||||
"ns3.spdl",
|
||||
"nsl3.spdl",
|
||||
"nsl7.spdl",
|
||||
"ns-symmetric-amended.spdl",
|
||||
"ns-symmetric.spdl",
|
||||
"otwayrees.spdl",
|
||||
"soph-keyexch.spdl",
|
||||
"soph.spdl",
|
||||
"splice-as-hc-cj.spdl",
|
||||
"splice-as-hc.spdl",
|
||||
"splice-as.spdl",
|
||||
"tmn.spdl",
|
||||
"wmf-brutus.spdl",
|
||||
"woolam-ce.spdl",
|
||||
"woolam-cmv.spdl",
|
||||
"yahalom-ban.spdl",
|
||||
"yahalom-lowe.spdl",
|
||||
"yahalom-paulson.spdl",
|
||||
"yahalom.spdl" ]
|
||||
|
||||
return list
|
||||
|
||||
def from_others():
|
||||
list = [ \
|
||||
"bke-broken.spdl",
|
||||
"bke-one.spdl",
|
||||
"bkepk-ce2.spdl",
|
||||
"bkepk-ce.spdl",
|
||||
"broken1.spdl",
|
||||
"carkey-broken-limited.spdl",
|
||||
"carkey-broken.spdl",
|
||||
"carkey-ni2.spdl",
|
||||
"carkey-ni.spdl",
|
||||
"five-run-bound.spdl",
|
||||
"helloworld.spdl",
|
||||
"ns3-brutus.spdl",
|
||||
"nsl3-nisynch-rep.spdl",
|
||||
"onetrace.spdl",
|
||||
"samasc-broken.spdl",
|
||||
"simplest.spdl",
|
||||
"speedtest.spdl",
|
||||
"unknown2.spdl"]
|
||||
return list
|
||||
|
||||
def select(type):
|
||||
list = from_literature()
|
||||
if int(type) == 0:
|
||||
# 0 means all protocols
|
||||
list = list + from_others()
|
||||
|
||||
# modify path
|
||||
for i in range(0, len(list)):
|
||||
list[i] = "../spdl/" + list[i]
|
||||
return list
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user