Commit Graph

177 Commits

Author SHA1 Message Date
ccremers
f22ce0dcb9 - Big change in the Arachne algorithm: decryptor sequences now get
expanded explicitly. This solves a long-standing issue with {k}k
  decryption to yield k. Needs some testing to ensure that it did not
  introduce any new errors.
2005-05-17 18:45:01 +00:00
ccremers
71558706a6 - XML output should be workable now. 2005-05-02 13:38:45 +00:00
ccremers
924abc065d - Added xml output switch (-x, check scyther --help). It's not complete
yet, to be finished tomorrow.
2005-05-01 13:32:50 +00:00
ccremers
8e1041b567 - Minor output fixes. 2005-04-21 12:04:45 +00:00
ccremers
9271cc7624 - Matching method propagation was wrong in new switch code.
- Some fixes for protocols that do not include matching send/read
  combo's. In particular, the max encryption level method ranged over
  the sends; now over all events. Maybe it can range over read events
  only?
2005-04-18 05:51:25 +00:00
ccremers
88e2f3d26c - Added a better reverse-engineered variation of the Athena goal
selector.
- Added an idea that might make searches somewhat faster.
2005-03-11 20:41:59 +00:00
ccremers
c8df32c7a2 - Minor improvements.
* Old bindings detections (immediately binds them to older binding)
  * Know_only derivation for keylevel lemmas.
2005-03-08 13:02:16 +00:00
ccremers
291353a14f - Improved version of the latex renderer of arachne attacks. Still not
usable, however.
2005-03-07 19:02:08 +00:00
ccremers
197117f2fe - Made a start with the arachne latex output. It's a mess currently. 2005-03-07 15:38:01 +00:00
ccremers
5c90a5af29 - Improved the .dot output format quite a bit. 2005-02-21 15:12:59 +00:00
ccremers
820c2caed8 - Revisited type matching conditions.
- Introduced tuple unfolding stuff for Arachne. -m2 should work now.
2005-01-14 18:18:40 +00:00
ccremers
d5cdac84cc - Some unfolding of tuple goals towards getting -m2 Arachne to work. 2005-01-14 14:08:01 +00:00
ccremers
b607b1e260 - If we run into the time bound, report it. 2005-01-14 13:01:31 +00:00
ccremers
e0e56964d1 - Added a --timer=x switch to abort Arachne proofs after x seconds. 2005-01-05 15:29:27 +00:00
ccremers
45c42408dd - Added weight level to proof output in <..> notation.
- Added selection factor for singular variables (not rolenames)
2004-12-29 19:40:12 +00:00
ccremers
54ccd5179e - Added a new selector that picks goals that are local variables. 2004-12-29 16:05:32 +00:00
ccremers
d425bdb850 - For now, set equal weights to the parameters. 2004-12-29 14:24:33 +00:00
ccremers
5e695097f2 - Reimplemented the weight functions for goal selection.
- Added --goal-select function, defaults to 3.
2004-12-29 14:17:49 +00:00
ccremers
635470d976 - Added -d switch. 2004-12-09 15:27:50 +00:00
ccremers
b56c01c422 - Added '--max-depth=X' switch (which is equal to the old '-l X -a')
- Modified semantics of -l with -a : this corresponds more to the
  intuition and introduces the new option to prune proofs based on trace
  length.
2004-12-09 15:11:45 +00:00
ccremers
4f36181c3c - Removed debugging stuff, now that the memory stuff is solved. It
turned out that I solved the memory leak first, and then spent an
  afternoon finding the 8 blocks. These were simply not being given back
  by memrealloc, which I should have guessed.
2004-12-09 13:34:36 +00:00
ccremers
c690b0622a - More cleanup and comments. 2004-12-08 19:30:26 +00:00
ccremers
3ca180d968 - Despite a full afternoon of debugging, semiRunCreate/Destroy still
lose 8 blocks. I'm fairly confused.
2004-12-08 16:25:27 +00:00
ccremers
506e42f841 - Re-indented the files. 2004-11-16 12:07:55 +00:00
ccremers
a38925c9c2 - Added some useful macros to term.h to address subparts (e.g.
TermOp1(t)). Renamed all uses.
2004-11-16 12:06:36 +00:00
ccremers
0ec70b9de0 - Added lots of debugging info. 2004-10-28 15:23:16 +00:00
ccremers
3673fc689d - Improved roledef printing by adding roledefPrintShort. 2004-10-28 12:56:13 +00:00
ccremers
61457b5f3d - Fixed the agentsOfRunPrint output. It was caused by the agent adding
order.
- Fixed the pruning bug, which was related to this.
2004-10-28 12:33:57 +00:00
ccremers
9a24bb0f21 - Somehow, agentOfRunRole is playing up. I found a bug in the pruning
(untrusted actors), but the fix did not work. It's maybe due to the
  roleInstance variants.
2004-10-27 16:20:12 +00:00
ccremers
461a040d29 - Revised Arachne dot output significantly. It is now based on explicit
ranking instead of the subgraphs. This will make it easier to layout
  e.g. LaTeX MSCs using the same algorithm.
2004-10-27 16:10:58 +00:00
ccremers
2680a2ca7a - Added rank calculation and output. If the subgraphs are removed, this
will allow for better positioning of the graphs. It also helps a lot
  for latex output. In fact, latex output is fairly trivial now.
2004-10-25 14:28:53 +00:00
ccremers
94b3ac7c96 - Added debug code for dot output.
- Push/pop goals are counted now, making the child parameter obsolete.
2004-10-18 13:04:34 +00:00
ccremers
d33ec486ce - Modified -l switch to also serve as proof depth limit. 2004-10-14 15:25:28 +00:00
ccremers
ba832159b1 - Added a new prioritylevel for seemingly public keys, but the splice-as
problem remains.
2004-10-14 15:09:48 +00:00
ccremers
8b48aade68 - Huge effort to make match type 2 (typeflaw generic) matching work.
Problem with goals that turn into tuples, will have to be solved.
2004-08-31 14:31:06 +00:00
ccremers
0e9b7dcf11 - Some added error/bounds detection all around. 2004-08-31 12:35:05 +00:00
ccremers
f5ab30995c - Removed the debugging output. 2004-08-30 22:09:44 +00:00
ccremers
5c90522c55 - Fixed a bug in the pruning algorithm, where intruder runs were also
checked for agent lists, which is false.
2004-08-30 22:08:44 +00:00
ccremers
b04bc86185 - Some minor cleanups. 2004-08-30 21:49:51 +00:00
ccremers
4832e9116c - Added pruning theorem for untrusted actors. 2004-08-30 21:07:45 +00:00
ccremers
d43e3d432f - Ignoring singular variables seems to be a smart choice, although it
implies that the intruder can generate any type. That is not conform
  the usual semantics. So we either change the usual semantics (wise) or
  we make this choice optional.
2004-08-30 20:48:11 +00:00
ccremers
02041cfbab - Fixed binding displays.
- Improved attack dot output.
- goal_graph_create now takes originator assumption into account.
2004-08-30 13:57:16 +00:00
ccremers
1d431dc6f1 - Attack output is a bit broken now for Arachne. Fix. 2004-08-30 06:07:17 +00:00
ccremers
25fa261e30 - Added some comments. 2004-08-28 14:05:38 +00:00
ccremers
c907c1f657 - Added prefixed start nodes to indicate agent initiative in dot output. 2004-08-28 14:00:48 +00:00
ccremers
391c939b83 - New algorithm to draw bindings between runs. Much cleaner. 2004-08-28 13:47:37 +00:00
ccremers
b349b6cef2 - More improvements to the dot output. 2004-08-28 12:42:11 +00:00
ccremers
acb89922f1 - Singular variables need to be bound as well (to ensure ordering is
correct w.r.t. e.g. nonces, if the intruder cannot construct them.)
2004-08-28 12:20:50 +00:00
ccremers
2ddd1eee13 - Improved dot output for Arachne attacks. 2004-08-28 11:43:06 +00:00
ccremers
9d64b837db - Improved roledef printing for NULL, NULL roles (intruder)
- Added graph output in dot format.
2004-08-28 09:24:30 +00:00
ccremers
4420e06e4e - Ignore choose actions when determining Arachne trace length. 2004-08-27 19:15:24 +00:00
ccremers
957b920b98 - Added extra Arachne check for -r0. 2004-08-27 18:26:19 +00:00
ccremers
17ad6de97b - Semistate printing now reports trace length.
- Pruning was wrong, so the shortest attack wasn't always found. Now it
  is.
2004-08-27 18:18:16 +00:00
ccremers
198afa135e - Implemented attack length scanner per claim. Not stored yet. 2004-08-27 18:09:09 +00:00
ccremers
6ccb09297a - Better prune adherence. 2004-08-27 17:37:43 +00:00
ccremers
f90f16fe93 - Arachne engine now respects --prune=2 (and thus the default setting)
somewhat. There is no good definition of length yet, so we don't do
  this yet.
2004-08-27 17:35:23 +00:00
ccremers
21b2c27320 - Niagree claim seems to be working fine now. 2004-08-27 17:25:38 +00:00
ccremers
2decf44bd2 - Checks are now in. Untested though. 2004-08-27 15:02:33 +00:00
ccremers
d7e49028c1 - Added pruning of functions the intruder does not know (e.g. SK) 2004-08-20 14:55:34 +00:00
ccremers
851044ecd0 - Improved the SK lemma, but it is NOT correct yet. 2004-08-20 11:47:00 +00:00
ccremers
72d52a6e12 - Key goals now have priority. This strategy yields complete proofs for
e.g. bke, and reduces states for NSL.
2004-08-20 10:52:40 +00:00
ccremers
baae7ef94a - The proofs now also show a list of open goals at each step. 2004-08-20 09:53:44 +00:00
ccremers
be44ed047a - Fixed some goal selection issues.
- Added note about mirroring model checker semantics.
2004-08-20 09:21:39 +00:00
ccremers
bd84625ae4 - Fixed some more problems. Seems to be stable, although pruning is not
sufficient. Investigate bke-broken.
2004-08-19 15:30:31 +00:00
ccremers
f2bc78cc1f - Improved proof output. 2004-08-19 14:55:21 +00:00
ccremers
8fa7c4e839 - Fixed bug in printing.
- Algorithm should work again.
2004-08-19 14:52:17 +00:00
ccremers
f25f0abd4e - Fixed a memory error. 2004-08-19 14:49:03 +00:00
ccremers
5c15c21832 - Reports on completeness of proofs. 2004-08-19 13:09:35 +00:00
ccremers
15580c6ec9 - Added subrun counters. 2004-08-19 12:47:53 +00:00
ccremers
be2df84f91 - Much improvements to the proof output. 2004-08-19 12:35:51 +00:00
ccremers
c993e17597 - Improving proof output. 2004-08-19 11:37:41 +00:00
ccremers
1180d3cf6f - Added --proof switch for Arachne engine, which outputs the (partial)
proof of correctness.
2004-08-19 10:46:27 +00:00
ccremers
85ac32fbd1 - Claim counting now works. 2004-08-18 20:22:33 +00:00
ccremers
c95630f93b - Improved pruning. 2004-08-18 19:43:58 +00:00
ccremers
0f75efc787 - Fixed bug in interm relation.
- Commented flag for normal version.
2004-08-18 18:41:49 +00:00
ccremers
8583b4ef5c BROKEN
- Improved algorithm.
2004-08-18 18:22:59 +00:00
ccremers
341f519bbb BROKEN
- Works better all the time. Huge shift of main logic. Much better.
2004-08-18 15:46:33 +00:00
ccremers
b2d21f0a8a BROKEN
- Working on new algorithm. Some memory error can occur.
2004-08-18 14:06:14 +00:00
ccremers
eb5a39522b - Compilation again. Now we have the sufficient components, and can
start to reconnect.
2004-08-18 09:57:01 +00:00
ccremers
b2838ed1e4 - Made a start with the new version. 2004-08-17 15:52:52 +00:00
ccremers
bb78c71c90 - Introduced termInTerm (bigterm, smallterm) 2004-08-17 14:11:25 +00:00
ccremers
8869477cf0 - Broken first attempt to work towards simplified method. 2004-08-17 11:30:03 +00:00
ccremers
5dd6127e4b - Added term to binding relation. 2004-08-17 11:03:18 +00:00
ccremers
f384042bfe - Switched -r n behaviour for Arachne, effectively turning it into the
upper bound on runs.
2004-08-16 14:49:41 +00:00
ccremers
536e5bf237 - Fixed some errors in length detection.
- Added more bounds checking.
2004-08-16 13:18:04 +00:00
ccremers
05ee3f7f0a - Added a new warshall. Compare with previous version at home.
- Rewrote the bind_to_*_run functions.
2004-08-16 09:50:37 +00:00
ccremers
c518e68881 BROKEN
- Added broken attempt to solve to problem, where a new instance has to
  be bound, but older variables point to role terms, e.g. RV#1->RV.
  What should happen, is that it becomes RV#1->RV#new. I thought of a
  solution, but it is still somewhat broken. Maybe I should ignore any
  mappings of variables such as RV, which might be included.
2004-08-15 19:58:26 +00:00
ccremers
91a679a129 - Made the output of the semistate include the bindings. 2004-08-15 17:50:41 +00:00
ccremers
071b9bd735 - Improved semistate printing. 2004-08-15 17:16:13 +00:00
ccremers
1f99b16ee8 - Much better implementation of M_0. 2004-08-15 17:07:38 +00:00
ccremers
ca2eeb7235 - Implemented better matching.
- Pruning for untrusted agent lists in the claim run as well.
- Sloppy M_0 implementation; needs to be fixed.
2004-08-15 16:44:54 +00:00
ccremers
c7e290197c - Cycle detection seems to be working. 2004-08-15 14:57:50 +00:00
ccremers
28782548b0 - Implemented cycle detection. Untested. 2004-08-15 14:07:34 +00:00
ccremers
ffe20fb168 - Integrated new binding relation. No closure as yet. 2004-08-15 12:24:27 +00:00
ccremers
0fee6b5797 - Secrecy claims are now handled fairly okayish, as long as only one
term is in the claim. This should be tupling-or, really, for
  convenience.
2004-08-14 19:19:23 +00:00
ccremers
18415c95a2 - Fixed bug in run forcing. 2004-08-14 18:38:43 +00:00
ccremers
68d3bab305 - Improved indenting. 2004-08-14 18:11:30 +00:00
ccremers
bf75e93f4c - Substitutions from roles have to be reset to compare existing runs. 2004-08-14 16:26:57 +00:00
ccremers
1b3ef9e4ac - Improved debugging output by adhering to the level setup. 2004-08-14 16:12:32 +00:00
ccremers
53cb869426 - Claim iteration works nicely now. 2004-08-14 15:59:14 +00:00