Commit Graph

1626 Commits

Author SHA1 Message Date
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
3e3c2d7b07 Rewrote some code for humans to read, i.e. strcmp wrapper. 2008-08-21 16:59:05 +02:00
Cas Cremers
8f01637528 Output should also yield 'recv' instead of 'read'. 2008-08-21 16:58:57 +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
739f59174f Removed unused functions. 2008-08-21 16:58:12 +02:00
Cas Cremers
1a7aa73b26 Created a small program that can find unused functions. 2008-08-21 16:56:12 +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
a0a377a84f Added switch to disable verbose exit codes.
In the near future, the default exit code behavior should be made obsolete anyway,
as the exit codes are not a nice way to report status.
It used to be convenient for shell scripting in early times,
when the parallel tests were run using the forward model
checker, but no modern script should be relying on it.
2008-06-16 18:57:28 +02:00
Cas Cremers
c729d13a00 Reindent of the code revealed that some was not indented nicely yet. Silly. 2008-03-23 15:56:09 +09: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
8eec8e90e4 Merge branch 'master' of ssh://cremersc@buckleburg.inf.ethz.ch/home/cremersc/repos/scyther 2008-03-13 10:24:28 +01:00
Cas Cremers
27521d0e87 Added notes. 2008-03-13 10:24:13 +01:00
Cas Cremers
bea1c85d9d Tried to model Guttman variants, found multi-protocol attack. 2008-02-25 23:46:22 +01:00
Cas Cremers
b1ea3f6d4b Split up Neumann-Stubblebine. 2008-02-25 23:28:52 +01:00
Cas Cremers
cfe0f917a1 Added generator for ffgg protocol. 2008-02-25 14:11:11 +01:00
Cas Cremers
0709539737 Merge branch 'master' of ssh://cremersc@buckleburg.inf.ethz.ch/home/cremersc/repos/scyther 2008-01-28 15:25:46 +01:00
Cas Cremers
a7c1d8c696 Improved handling of cases with untyped variables.
When untyped variables occur, the encryption level depth pruning is for
now unjustified. Maybe we can get a proof later.  Previously this was
hidden, which was a bad design decision.  Now the output is much
clearer.
2008-01-28 15:23:40 +01:00
Cas Cremers
03522b7108 Try to not draw duplicate arrows.
This cleans up some graphs rather nicely. There is only one potential
drawback (not observed in practive):
If two bindings have the same from/to, but different interpretations,
we might lose information. In particular the 'select' intermediate nodes might
pose a problem and we would be better off by not having any interpretation on
what is selected.
2008-01-16 11:55:15 +01:00
Cas Cremers
bf24312fb1 Disabled intruder knowledge computation.
Isolated problem causing segfault identified by Simon Meier.
2008-01-10 16:50:02 +01:00
Cas Cremers
0e15b7221f Strange problem with concretization algorithm.
Terence is selected, but it should not be. This is a
bug and should be fixed.
2008-01-10 16:10:21 +01:00
Cas Cremers
ce9891d351 Disabled well-formedness temporarily.
Simon Meier found some problems with the draft implementation, so it is disabled
for now.
2008-01-10 16:09:24 +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
2d45daa8ee Introduced '-c,--characterize' switches for complete characterization.
This switch was previously known as '--state-space', but the new name is
much better.

Backwards compatibility:

'-c' was previously used by '--check', so check is now abbreviated to
'-C'.

'-s,--state-space' still works but is from now on considered to be
deprecated.
2007-11-15 21:49:56 +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
08bbdded3c Minor cleanup. 2007-10-22 21:42:43 +02:00
Cas Cremers
809b8290d9 Bugfixes for source script. 2007-10-22 21:36:39 +02:00
Cas Cremers
62561d78fc Added script to test source archive generation. 2007-10-22 21:28:17 +02:00
Cas Cremers
a6370726ef Cleanup. 2007-10-22 21:14:06 +02:00
Cas Cremers
6e65138dca Added --license switch to the Gui. 2007-10-08 14:52:50 +02:00
Cas Cremers
9d4ce4ecc1 Bugfix in releasescript. 2007-10-08 14:41:17 +02:00
Cas Cremers
f2d4b56c11 Build and release any git revision. 2007-10-08 14:37:50 +02:00
Cas Cremers
ccd90dccdb Releasescripts now also allow for building arbitrary description tags.
In a next pass, maybe we will allow for releasing *any* valid git revision.
2007-10-08 14:27:53 +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
b013440c8b Merge branch 'Todo' 2007-09-18 16:09:05 +02:00
Cas Cremers
2107d76532 Proof output improved for occurrences of the Athena problem. 2007-09-18 15:36:11 +02:00
Cas Cremers
59bcb18fec Caught Athena problem case.
I've added a marked for the Athena problem case, and now no more false 'complete proof' results are produced.
However, the tool reports, 'no attack within bounds', which is slightly inaccurate
depending on the interpretatio of 'bounds'.
2007-09-18 15:27:41 +02:00
Cas Cremers
6cf81b3e8e Added protocol that exploits the main problem of the Athena-based algorithm. 2007-09-18 15:25:32 +02:00
Cas Cremers
8a2ae84f35 Added incompleteness marker for the untyped variables and MGDU set problem. 2007-09-17 16:54:17 +02:00
Cas Cremers
a93b555b1a Added cast to solve long-standing compilation warning.
Note that the cast does not seem to be needed after manual inspection, but
the compiler insists.
2007-09-17 16:53:37 +02:00
Cas Cremers
ab7d37fca2 Further cleanup. 2007-06-12 14:48:13 +02:00
Cas Cremers
52e23f5c86 Merge branch 'manual' into 'master'. 2007-06-12 14:43:58 +02:00
Cas Cremers
4d1e62fac9 Removed a large number of obsolete files. 2007-06-12 14:39:08 +02:00
Cas Cremers
34ff7e28c6 Added GPL 2 notice to command-line usage of the Scyther backend.
Modified '--version' to report the Scyther license briefly, and
added '--license' to display the full license.
2007-06-11 15:05:49 +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