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

- Added bounds settings.

Browse Source 
- Improved flags' help text.
This commit is contained in:
ccremers 2005-03-14 10:19:59 +00:00
parent e73a08a056
commit 1473cb301e
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/multiprotocoltest.py
View File

@ -531,7 +531,7 @@ def main():
help = "test for all matching methods") help = "test for all matching methods")
parser.add_option("-p","--protocols", dest="protocols", parser.add_option("-p","--protocols", dest="protocols",
default = 0, default = 0,
help = "protocol selection (0: all, 1:literature only)") help = "protocol selection (0: all, 1:literature only, 2:literature without know attacks)")
parser.add_option("-B","--disable-progressbar", dest="progressbar", parser.add_option("-B","--disable-progressbar", dest="progressbar",
default = "True", default = "True",
action = "store_false", action = "store_false",

24
test/scythertest.py
View File

@ -79,6 +79,7 @@ def add_extra_parameters(args):
# 1: thorough # 1: thorough
# #
def default_arguments(plist,match,bounds): def default_arguments(plist,match,bounds):
timer = 0
n = 2 + bounds n = 2 + bounds
# These bounds assume at least two protocols, otherwise # These bounds assume at least two protocols, otherwise
# stuff breaks. # stuff breaks.
@ -90,25 +91,32 @@ def default_arguments(plist,match,bounds):
maxruns = 2 maxruns = 2
maxlength = 10 maxlength = 10
if bounds == 0: if bounds == 0:
timer = nmin**2 timer = 10 * (nmin**2)
maxruns = 2*nmin maxruns = 2*nmin
maxlength = 2 + maxruns * 4 maxlength = 2 + maxruns * 4
elif bounds == 1: elif bounds == 1:
timer = nmin**3 timer = 10 * (nmin**3)
maxruns = 3*nmin maxruns = 3*nmin
maxlength = 2 + maxruns * 6 maxlength = 4 + maxruns * 6
elif bounds == 2:
timer = 0
maxruns = 3*nmin
maxlength = 4 + maxruns * 6
else: else:
print "Don't know bounds method", bounds print "Don't know bounds method", bounds
sys.exit() sys.exit()
args = "--arachne --timer=%i --max-runs=%i --max-length=%i" % (timer, maxruns, maxlength) args = "--arachne"
if timer > 0:
args = args + " --timer=%i" % timer
args = args + " --max-runs=%i --max-length=%i" % (maxruns, maxlength)
matching = "--match=" + str(match) matching = "--match=" + str(match)
allargs = "--summary " + matching + " " + args args = "--summary " + matching + " " + args
extra = get_extra_parameters() extra = get_extra_parameters()
if extra != "": if extra != "":
allargs = extra + " " + allargs args = extra + " " + args
return allargs return args
# Yield test results # Yield test results
def default_test(plist, match, bounds): def default_test(plist, match, bounds):
@ -144,7 +152,7 @@ def default_options(parser):
full type flaws") full type flaws")
parser.add_option("-b","--bounds", dest="bounds", parser.add_option("-b","--bounds", dest="bounds",
default = 0, default = 0,
help = "bound type selection (0: quickscan, 1:thorough)") help = "bound type selection (0: quickscan, 1:thorough, 2: no time limit)")
parser.add_option("-x","--extra", dest="extra", parser.add_option("-x","--extra", dest="extra",
default = "", default = "",
help = "add arguments to pass to Scyther") help = "add arguments to pass to Scyther")