andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,559 Commits 1 Branch 0 Tags 21 MiB
2116fde993
Commit Graph

364 Commits

Author SHA1 Message Date
Cas Cremers
98dd606404 Adding agreement etc. to NS/NSL protocol. 2012-04-25 22:09:46 +02:00
Cas Cremers
9b0915441f Synchronising MPA branch with compromise branch where possible. 2012-04-25 17:03:51 +02:00
Cas Cremers
1cbe9826ac Updated dates. 2012-04-24 13:56:51 +02:00
Cas Cremers
626385821a Minor restructuring and fallback error even even tkInter is not installed. 2012-04-24 12:34:42 +02:00
Cas Cremers
755c4519c6 Large pass on protocol specification files to get rid of deprecated constructions. 2012-04-23 15:53:28 +02:00
Cas Cremers
30006b732a Fix Python 3 deprecated issues that cannot be resolved by 2to3. 2012-04-23 15:02:06 +02:00
Cas Cremers
b6ab044cd6 BUGFIX: 'Default' color not known to newer wxPython versions. 
The statement was redundant anyway.
 2012-04-09 21:14:41 +02:00
Cas Cremers
d348736c87 SPDL: Removing obsolete constructs from SPDL file. 2012-03-22 10:53:03 +01:00
Cas Cremers
6ed32d0f4c BUGFIX: Fixed overzealous deletion in init scripts and fixed reference to removed SetBinDir. 2012-02-27 11:52:33 +01:00
Cas Cremers
4b62062765 Cleanup of path reconstruction. 2011-09-23 12:18:59 +02:00
Cas Cremers
a6bb143101 Added some minimal explanation to the wiper script. 2011-09-23 11:24:02 +02:00
Cas Cremers
74ca7217ea ISO test script now points to Scyther models in papers directory. 2011-09-23 11:24:02 +02:00
Cas Cremers
2e7328e0df Updated install document. 2011-03-31 15:03:58 +02:00
Cas Cremers
bc667f3f32 Improving some scripts; exploit cache better. 2011-03-31 15:02:49 +02:00
Cas Cremers
c2662abaef More comments. 2011-03-31 15:01:50 +02:00
Cas Cremers
9959baf926 More ignore patterns. 2011-03-31 15:01:13 +02:00
Cas Cremers
da616c1198 Adding missing scripts. 2011-03-31 15:00:56 +02:00
Cas Cremers
810fc9eece Fixed wiper display. 2011-01-27 10:57:54 +01:00
Cas Cremers
c02ce53227 Adding make-bsub.py, which is needed by batcher.sh. 2011-01-26 13:21:02 +01:00
Cas Cremers
6cb4313bec Brutus support restored the batcher script. 2011-01-26 13:18:29 +01:00
Cas Cremers
68409e14ad Synchronise test batch files. 2011-01-25 17:32:54 +01:00
Cas Cremers
214c607529 Slightly nicer code. 2011-01-25 17:32:19 +01:00
Cas Cremers
6286a2c810 Added test scripts for book and iso. 2011-01-25 10:24:37 +01:00
Cas Cremers
88ee944c4b BUGFIX: Problem when progressbar.py missing, problem with zero correct claims. 2011-01-24 21:39:35 +01:00
Cas Cremers
19749e0293 Being more careful about adding scripts etc. 2011-01-24 20:58:53 +01:00
Cas Cremers
be6f7b481d Updating mpa test scripts. 2011-01-21 17:39:05 +01:00
Cas Cremers
985397c8b6 Cache structure change: from Cache/XX/file to Cache/XX/YY/file 2011-01-21 17:38:45 +01:00
Cas Cremers
63aefc1c46 BUGFIX: makedirs wasn't working as expected, reverting to builtin. 2011-01-21 17:38:14 +01:00
Cas Cremers
fa8440c8e5 BUGFIX: Silly typo. 2011-01-18 17:05:07 +01:00
Cas Cremers
04787e5516 Re-allowing positional arguments for test-mpa.py, i.e., command line specification of input files. 2011-01-04 14:14:35 +01:00
Cas Cremers
af25cfc9a0 Better MPA scans and added pickle/JSON output options. 2010-12-31 15:43:27 +01:00
Cas Cremers
ed147bbace Bugfix on empty input. 2010-12-31 15:42:01 +01:00
Cas Cremers
59080a2b5c Updating protocol descriptions. 2010-12-31 15:41:52 +01:00
Cas Cremers
94c9f1b444 No longer stop at first MPA attack: scan for all. 2010-12-27 22:31:15 +01:00
Cas Cremers
5ee0f7563b Improving latex output of MPA test, expanding glue functionality. 2010-12-27 22:30:58 +01:00
Cas Cremers
b6c67dec23 Initial latex output option that generations correct claims table. 2010-12-27 13:32:25 +01:00
Cas Cremers
5ffe3d2752 Added more verbosity to some parts with -v switch. 
In particular, verbose ('-v', '--verbose') now lists protocols with their correct
claims, and also the protocols without such correct claims.
 2010-12-26 23:10:39 +01:00
Cas Cremers
a21aeccad0 Fix caching discrepancy when relying on Scyther default options. 2010-12-26 23:09:30 +01:00
Cas Cremers
dd49526e02 Reintroduced ksl protocol description. 2010-12-12 22:13:18 +01:00
Cas Cremers
2ec70106ba MPA: Improved the attack summaries. 2010-11-24 17:13:26 +01:00
Cas Cremers
d96ffa3354 Added more Woo-Lam-Pi variants. 2010-11-24 17:13:14 +01:00
Cas Cremers
cecff7f55e Refactoring options. 2010-11-23 15:09:43 +01:00
Cas Cremers
3007887f38 Near complete rewrite of the MPA test script. 2010-11-15 23:20:48 +01:00
Cas Cremers
08ae9a2ac9 MPA: Added code for testing self-initiator stuff. 2010-11-15 17:39:03 +01:00
Cas Cremers
edba6aac7f MPA: Added --extravert option to pass on to backend. 2010-11-15 10:18:20 +01:00
Cas Cremers
135fbaf726 MPA: More detailed reporting of results. 2010-11-15 10:18:01 +01:00
Cas Cremers
31a1635a07 MPA: Added switch for the max number of parallel protocols in MPA attacks found. 2010-11-15 10:17:29 +01:00
Cas Cremers
f97afc4a62 MPA: Added --plain option for output to text files (disables progress bars) 2010-11-15 10:16:17 +01:00
Cas Cremers
b1f993a6c9 BUGFIX: Use /usr/bin/env to locate the correct Python interpreter. 2010-11-12 14:20:53 +01:00
Cas Cremers
9a04264d39 MPA: Improving test script with basic command-line options. 2010-11-12 14:12:23 +01:00
Cas Cremers
225a839dbc Improving summary output. 2010-11-12 13:28:22 +01:00
Cas Cremers
573f581800 Updating test script to isolate --init-uniq cases as well. 2010-11-12 10:37:48 +01:00
Cas Cremers
270eef6a39 BUGFIX: Progressbar dummy should exist for MPA script. 2010-11-11 12:19:35 +01:00
Cas Cremers
8ddd955415 MPA: Better test setup. 2010-11-11 12:08:53 +01:00
Cas Cremers
65074352c3 MPA: Improving the summaries given by the test script. 2010-11-11 11:16:59 +01:00
Cas Cremers
e42aa1215e Scyther.py: Added Caching to Scyther's Python interface. 
Cached data is stored in:

Cache/XX/YYYYY.out (stdout)
Cache/XX/YYYYY.err (stderr)

Where XX^YYYYY is the sha256 hexdigest of the concatenation of the input spdl and
the arguments.
 2010-11-11 10:37:18 +01:00
Cas Cremers
cbb66ea794 Scyther.py: Improving Scyther python interface by giving options and filenames when reporting an error. 2010-11-11 10:37:18 +01:00
Cas Cremers
fac14fc950 Added a new subdirectory with protocols for MPA experiments. 2010-11-11 10:37:18 +01:00
Cas Cremers
96e52a3724 Expanding test script for full MPA analysis. 2010-11-11 10:37:18 +01:00
Cas Cremers
e5fc05a379 Correctly escaping program file name. 2010-05-16 00:36:06 +02:00
Cas Cremers
dc4dc34624 String commands require shell=True. 2010-05-16 00:33:53 +02:00
Cas Cremers
d1b334765b Updated image construction code to also use subprocess.Popen. 2010-05-16 00:13:33 +02:00
Cas Cremers
1f75f73cb0 Added realistic check for graphviz/dot. 2010-05-15 23:27:11 +02:00
Cas Cremers
7d03f22b24 Added new 'safeCommandOutput' command to Scyther/Misc and force use of Python 2.4 or later. 2010-05-15 23:26:44 +02:00
Cas Cremers
feb400c610 Added GUI error message if wxPython is not present. 
If wxPython is not present, there would be a command-line message only.
Some users may not notice that. We now fall back to Tkinter to report
such messages.
 2010-05-15 22:56:48 +02:00
Cas Cremers
a45172583f Removed obsolete bibliography data from README. 2010-05-02 23:37:07 +02:00
Cas Cremers
2a2a087cf6 GUI BUGFIX: On some file systems, problems with case-insensitivity and name clash between sys module and local. 2009-04-30 15:06:28 +02:00
Cas Cremers
cd33fb3e14 BUGFIX: Paths with control characters (e.g. $) were causing trouble. 2009-04-30 13:40:06 +02:00
Cas Cremers
e3268bb8e5 GUI: Added a large set of possible output formats to the right-click menu. 
To do: We still need better error handling.
- File exists: overwrite?
- Write failed popup.
- Check for empty file at the end (what if dot does not support this particular
  output format?)
 2008-08-29 12:05:06 +02:00
Cas Cremers
63471c5053 Code cleanup for GUI code. 2008-08-29 12:05:06 +02:00
Cas Cremers
8471f13da3 Added 'prune' switch support in GUI. 
Allows to use the 'stop at first attack' feature of the backend.
 2008-08-29 12:05:00 +02:00
Cas Cremers
b352044f92 BUGFIX: PIL is tested at the start of the program. 
Previously, one would get one void verification result before Scyther detected
PIL was not working. Now nothing is wasted.
 2008-08-26 21:52:00 +02:00
Cas Cremers
a020cffec7 GUI: Added popup menu to save graphviz (.dot) data. 
A long requested feature was the option to print graphs more nicely.
This is a solution for knowledgeable users: the dot data is more basic
and can be converted in various ways.

TODO: Simple image export.
 2008-08-26 17:35:38 +02:00
Cas Cremers
76bf6328b6 Nicer crash handling for PIL problem with a warning etc. 2008-08-21 21:57:22 +02:00
Cas Cremers
630f6e9459 Added large delta-test script. 
The script runs over all protocol files it can find, and runs it using two different
command-line parameters to scyther. If the results differ, the script reports it.

The code can use some cleanup, removing e.g. global variables, but it works.
 2008-08-21 21:20:16 +02:00
Cas Cremers
aaf27779a3 Allow for use of RECV instead of READ. 
Read will become deprecated later on.
 2008-08-21 16:58:53 +02:00
Cas Cremers
feb3827ba1 BUGFIX: Fixed crash on some include file cases. 
Reported by ETH students last year: if you include a file, where the file has an
error in a line with a number higher than the original, the Python code crashes.

This is a *patch* only because the real underlying problem is that error reporting
does not take include commands into account, and does not propagate any
file names.
 2008-07-31 17:37:20 +02:00
Cas Cremers
9605d5e772 Introduced "all attacks" switch in GUI, and a bugfix. 
Passing the '--all-attacks' switch to the backend was not working. The reason
was the hack to get Vista working hardcoded cutting to the last attack found.

In the long term, this needs to be cleaned up, and cutting should be moved back
nicely to the Scyther C code where it used to work. Once done, switches.useAttackBuffer
can be set back to true.

BUGFIX: When cutting attacks/patterns, counts are no longer exact.
 2008-07-30 00:14:10 +02:00
Cas Cremers
4c469cf848 Added initial test script for the constraint solver module. 
It doesn't work yet because the import fails. Weird.
 2008-03-14 00:01:25 +01:00
Cas Cremers
8fe754f4ec Moved key-compromise models into their own directory and removed key-compromise models from base protocols. 2007-11-16 09:00:23 +01:00
Cas Cremers
b02c09f0dd Disabled --check for gui as well. 
--check is not working correctly, so we should disable it for now.
 2007-11-15 21:49:35 +01:00
Cas Cremers
870d1c2f41 BUGFIX: PIL no longer works on my Feisty machines: PIL disabled. 
Currently, both my Feisty Ubuntu's have stopped working with the GUI of
Scyther. So to be on the safe side, PIL is disabled for now, until I've
resolved the problem.

The error is the following:

---------------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/cas/src/scyther-dev/gui/Gui/Scytherthread.py", line 351, in onViewButton
    w = Attackwindow.AttackWindow(btn.claim)
  File "/home/cas/src/scyther-dev/gui/Gui/Attackwindow.py", line 176, in __init__
    self.CreateInteriorWindowComponents()
  File "/home/cas/src/scyther-dev/gui/Gui/Attackwindow.py", line 209, in CreateInteriorWindowComponents
    dp = AttackDisplay(self, self, attacks[0])
  File "/home/cas/src/scyther-dev/gui/Gui/Attackwindow.py", line 73, in __init__
    self.original = Image.open(filename)
  File "/usr/lib/python2.5/site-packages/PIL/Image.py", line 1912, in open
    return factory(fp, filename)
  File "/usr/lib/python2.5/site-packages/PIL/ImageFile.py", line 82, in __init__
    self._open()
  File "/usr/lib/python2.5/site-packages/PIL/EpsImagePlugin.py", line 277, in _open
    raise IOError, "cannot determine EPS bounding box"
IOError: cannot determine EPS bounding box
---------------------------------------------------------------------------

Great. Bounding boxes in eps again.
 2007-11-13 20:51:20 +01:00
Cas Cremers
6e65138dca Added --license switch to the Gui. 2007-10-08 14:52:50 +02:00
Cas Cremers
dd57481991 Added note to changelog. 2007-10-08 14:14:24 +02:00
Cas Cremers
59d061c47f Patch by Alberto Piai to address new integration of (c)elementtree into core python. 2007-10-08 13:59:16 +02:00
Cas Cremers
44f89d8e78 Added GPL 2 notice in the 'about' box. 2007-06-11 14:20:53 +02:00
Cas Cremers
f901951e4b Added GPL 2 to the Python scripts. 2007-06-11 14:12:33 +02:00
Cas Cremers
7d584cca1e Added GPL 2 License to the C sources. 
A first step towards releasing Scyther completely to the public.
 2007-06-11 14:01:04 +02:00
Cas Cremers
d5ba325233 Workaround for strange wxPython display error. 
Since a while, wxPython has been refusing to correctly display strings with a dash in them in the staticText object. Given a string "xx-yy", only "xx" is displayed. This caused some problems for protocols with dashes in their protocol names. I've worked around it by replacing all occurrences of "-" by "_".
 2007-05-29 16:39:25 +02:00
Cas Cremers
76c516dee0 Merge branch 'reverting-b7' into release 2007-05-21 16:41:19 +02:00
Cas Cremers
742cbcda60 - Added some ignore patterns. 2007-05-21 13:56:00 +02:00
Cas Cremers
b80de55289 Merge branch 'testing' of cas@roivas.shape9.nl:/export/git/scyther into reverting-b7 2007-05-21 13:48:56 +02:00
Cas Cremers
a09cf686f9 - Modified explanation too. 2007-05-21 13:34:46 +02:00
Cas Cremers
461895555b - Removed Bin subdirectory and updates scripts. 2007-05-21 13:34:43 +02:00
Cas Cremers
38a5d04c8c - Fix to the reverter. 2007-05-21 13:32:57 +02:00
Cas Cremers
38f1bffcef - Reverted version of beta7 for testing. 2007-05-21 13:29:33 +02:00
Cas Cremers
db78f91af1 Fixed version information updates of both the compiled code as well as the Gui. 2007-05-20 16:14:40 +02:00
Cas Cremers
173b1e8d41 Merge branch 'stable' of ssh://cas@roivas.shape9.nl/export/git/scyther-develop/ 
Conflicts:

	gui/Gui/Scytherthread.py
 2007-05-19 23:38:10 +02:00
Cas Cremers
f1e35b1cde - Fixed ns/nsl and mpa example. 2007-05-19 18:02:36 +02:00
Cas Cremers
9063c00f55 - Switched encoding of Changelog so windows users can read it too. 2007-05-19 17:57:18 +02:00