Commit Graph

773 Commits

Author SHA1 Message Date
ccremers
c125c8f54e - Added dependencies 2007-01-09 14:47:52 +00:00
ccremers
16291579e7 - Fixed malloc problem. 2007-01-09 14:47:33 +00:00
ccremers
3aaffd3110 - Mac building should work fine now. 2007-01-09 10:55:39 +00:00
ccremers
da94176985 - Last few improvements for build scripts. 2007-01-09 09:47:06 +00:00
ccremers
7898de5f15 - Fix to find_file: this needs a path. 2007-01-09 08:54:00 +00:00
ccremers
41021072fa Added Mac build scripts 2007-01-08 13:41:39 +00:00
ccremers
7978eb6716 - Refactored code for readability, and split off archives. Works fine now on Mac-Intel 2007-01-08 13:24:37 +00:00
ccremers
ad984680ac - Compiles on Mac now, although generates linux too. Very weird. 2007-01-08 11:20:19 +00:00
ccremers
0a1a13dd5a - Added more features for cross-compilation. 2007-01-08 07:38:17 +00:00
ccremers
3f68f5ece5 - Started towards cross-compilation. 2007-01-08 07:21:29 +00:00
ccremers
3ed08929a2 - Fixed bug in code. 2007-01-08 07:21:09 +00:00
ccremers
17e1eb4b6e - More improvements to the SVNVersion retrieval. 2007-01-08 06:32:00 +00:00
ccremers
e595169501 - Improved svnversion writes. 2007-01-08 06:17:10 +00:00
ccremers
e508befbf5 - Some fixes for GUI by hiding variables. 2007-01-07 17:32:15 +00:00
ccremers
5e300ee18c - Removed makefile from archive, as it is now generated by cmake. 2007-01-07 17:23:24 +00:00
ccremers
dadf2e02fb - Added basic cmake setup files. It seems to compile for now. 2007-01-07 17:19:45 +00:00
ccremers
179cc9e3be - Added unused function, to test programs for that later. 2007-01-06 18:44:04 +00:00
ccremers
0fddd9f566 - Some fixes after pedantic tests. What remains: (a) C++ style comments (//) and (b) nested functions. 2007-01-06 18:01:36 +00:00
ccremers
89c3a20acf - Many cleanups to make -Wall happy. Next up is pedantic... 2007-01-06 14:45:29 +00:00
ccremers
92090142a0 - Added small script to be strict about stuff check. 2007-01-06 14:07:06 +00:00
ccremers
903f9bcbce - Fixes working towards attack indent output. 2007-01-02 15:22:25 +00:00
ccremers
55a5acc0eb - Added 'clean' target. 2006-12-15 14:22:13 +00:00
ccremers
e8d8524ed4 - Added local SCons copy (0.96.93)
- Added Makefile wrapper for SCons
2006-12-15 14:20:04 +00:00
ccremers
7786e0d65f - Added 'append' switches and modified gui behaviour correspondingly. 2006-12-14 16:28:29 +00:00
ccremers
8c397d984e - Turned error switch into append switch. 2006-12-14 16:14:18 +00:00
ccremers
654c2e3500 - New location of binaries. 2006-12-13 10:20:57 +00:00
ccremers
bd03983fc5 - Final fixes for beta 5 2006-12-11 10:12:03 +00:00
ccremers
b8c57a1395 - Added --errors switch. 2006-12-11 09:18:54 +00:00
ccremers
8d66dc48fd - Fixed intruder generated value displays. 2006-12-05 10:10:17 +00:00
ccremers
5b527cbc9c - Clearer output for intruder-generated terms. 2006-11-30 16:16:37 +00:00
ccremers
5954188fff - Fixed obsolete usage of 'CLK_TCK', which has received a new name. 2006-11-29 08:41:23 +00:00
ccremers
271550a55a - Better builders and naming.
- Some cleanup.
2006-11-23 11:46:33 +00:00
ccremers
17f4f34d23 - Improved locating binaries etc. 2006-11-23 11:28:51 +00:00
ccremers
ec9bf11719 - New semantics for maxattacks 2006-11-23 10:49:28 +00:00
ccremers
d8414daf95 - Fixed bug in new --max-attacks semantics. 2006-11-23 10:40:10 +00:00
ccremers
e28c494a18 - Changes to --max-attacks switch semantics. Maybe it should even be called max-patterns. 2006-11-22 15:15:12 +00:00
ccremers
420ea29fc4 - Note on nested functions. 2006-09-13 06:20:44 +00:00
ccremers
31f1753e4e - Added malloc wrappers for OSX builds. 2006-09-12 16:17:49 +00:00
ccremers
c0f87ce87d - Cross compilation for windows added. 2006-09-08 13:09:14 +00:00
ccremers
b5470aa894 - Fixed some stupid maxAttacks handling. Note that it still needs to
improve (todo list).
2006-08-15 08:16:02 +00:00
ccremers
e4bbd59b6e - Added release information. 2006-08-11 17:15:39 +00:00
ccremers
347010bfa4 - Moving files means the dev file needs updating. 2006-08-11 08:55:17 +00:00
ccremers
c41edf7f8c - Removed font settings from dot output, let somebody else worry about that 2006-08-10 12:36:11 +00:00
ccremers
341bbfeb0c - Minor refactoring. 2006-08-08 14:50:28 +00:00
ccremers
3256a38a65 - Windows output for recompiles now goes directly to the correct location. Saves me time. 2006-08-08 14:02:05 +00:00
ccremers
e2aca6f3ce - Better filter. 2006-08-08 13:00:16 +00:00
ccremers
36ccfd776a - Even less warnings. 2006-08-08 12:40:04 +00:00
ccremers
d9a37b62b3 - Some warnings are only interesting when checking. 2006-08-08 12:35:43 +00:00
ccremers
29f0756f0a - Generating a label should not cause a warning. 2006-08-08 12:34:11 +00:00
ccremers
ec3be3d55b - Implemented --claim=ns3,I switch to filter certain claims. 2006-08-08 12:30:29 +00:00
ccremers
cbe6307e8a - New todo priority. 2006-08-07 18:10:05 +00:00
ccremers
720d18415f - Fixed bug in stderror enable/disable code. 2006-08-07 10:52:17 +00:00
ccremers
2ef343ba6e - Order of claim processing now corresponds to the order in which they
occur in the file.
2006-08-07 09:56:55 +00:00
ccremers
f1f796c70a - Added dev file for Bloodshed C dev (under Microsoft Windows) 2006-08-06 18:04:02 +00:00
ccremers
9683d76598 - Using stderr or not is now a macro in error.h 2006-08-06 18:01:23 +00:00
ccremers
460c087cf2 - Some work towards moving stderror output for non-linux things out of
the way.
2006-08-02 10:29:40 +00:00
ccremers
180d00ff41 - Fully removed substitutions.h artefacts. 2006-08-02 09:50:21 +00:00
ccremers
b0a0b5cdfa - Obsolete stuff has to go. 2006-08-02 09:48:44 +00:00
ccremers
82869fb583 - Some misc fixes. 2006-08-02 09:46:57 +00:00
ccremers
3475896536 - Moved switches old definitions to text file (to avoid confusion with
sources)
2006-08-02 09:41:39 +00:00
ccremers
8eb50e30d9 - Added scanner/parser stuff (for windows) 2006-08-02 09:38:28 +00:00
ccremers
0a15692124 - Oops. 2006-08-02 09:35:18 +00:00
ccremers
b6d8930438 - More non-linux compatibility stuff. 2006-08-02 09:32:29 +00:00
ccremers
0c1684e1f2 - Windows-compatible (by disabling, duh..) 2006-08-02 09:27:09 +00:00
ccremers
203b652bab - Updated syntax for claim xml output. 2006-08-01 11:20:53 +00:00
ccremers
4b671384af - Some fixes to compile under Cygwin 2006-08-01 09:13:55 +00:00
ccremers
18d4b94b1e - Reverted to manual flex push/pup structure for include files. 2006-08-01 09:09:44 +00:00
ccremers
5e10206df1 - Added encapsulated dot output and claim reporting to the XML output. 2006-08-01 07:31:40 +00:00
ccremers
9a98e66671 - Claim status is now reported after each claim. 2006-08-01 06:10:12 +00:00
ccremers
92a98a85cc - Single claim check branched. 2006-08-01 06:04:01 +00:00
ccremers
ff87bf180f - Claim reporting moved into claim.c 2006-08-01 05:58:02 +00:00
ccremers
80eafb7374 - Additional --check output should go to stderror. 2006-07-31 11:31:52 +00:00
ccremers
cc358c5df3 - Misc fixes, some reporting with --check. 2006-07-31 11:30:08 +00:00
ccremers
e902aaa260 - Added well-formedness checks. This will only be enabled if a role uses
the 'knows' keyword.
2006-07-31 11:08:51 +00:00
ccremers
ff21e9e572 - Added function shortcuts in M_0 derivation. 2006-07-27 14:19:19 +00:00
ccremers
df1a56c780 - Iteration seems to work nicely, thank you. 2006-07-27 11:55:24 +00:00
ccremers
4e085f0eb8 - Initial knowledge displayed when running --check. 2006-07-27 10:45:26 +00:00
ccremers
f00392ac3e - Added functional 'knows' keyword. 2006-07-27 10:44:12 +00:00
ccremers
30b629909b - Added note on --chec- Added note on --checkk 2006-07-15 19:32:15 +00:00
ccremers
f31b5bfe9c - Started rewrite of main algorithm, by removing dynamic addition of M_0
nodes, and simply restricting it to a single M_0 send node.
2006-07-09 15:08:42 +00:00
ccremers
7409a38d12 - Note regarding pruning. 2006-07-06 15:55:43 +00:00
ccremers
dcb1625c3a - Changed my mind.
--prune 0 : all attacks
  --prune 1 : select first attack
  --prune 2+: use heuristic (currently only 2 supported)
2006-07-06 15:54:14 +00:00
ccremers
a8dee79504 - Added support for different attack heuristics. Disable with --prune=2. 2006-07-06 15:52:13 +00:00
ccremers
784304ed65 - Bugfix: separators between local constants were not printed correctly. 2006-07-02 23:44:18 +00:00
ccremers
fc8b0de971 - Added special weights in dot output for M_0 originating terms. 2006-07-02 13:38:20 +00:00
ccremers
4ec62ddad9 - Fixed an empty balloon which might confuse people, in the dot output. 2006-07-02 13:10:46 +00:00
ccremers
0184b6277b - Better handling of function from M0 collapse in dot output. 2006-07-02 12:51:19 +00:00
ccremers
aeac3d6616 - M_0 function application is now absorbed. 2006-07-02 12:03:57 +00:00
ccremers
c52a340d8e - Improved heuristics. Default is now 162 (but 99 performs equally well) 2006-06-29 07:49:23 +00:00
ccremers
d87d9ede30 - Fixed some comments. 2006-06-12 14:48:57 +00:00
ccremers
780ca9880f - Added feature to ensure include files come from the right place. The
order in which Scyther searches for files is now.
   1. From the prefix of the previously found file.
   2. Current directory.
   3. Anything in SPDLDIRS
  Here, 1 is new.
- When using -E (--expert), scyther shows any files it reads on stderr.
2006-06-11 15:22:20 +00:00
ccremers
6ac5e2a428 - Added '--lightness' switch. 2006-05-26 12:57:27 +00:00
ccremers
07cc2c2b55 - Minor updates in output format. 2006-05-26 12:34:37 +00:00
ccremers
2e94dd065e - "--clusters" output is quite advanced, but still dot makes a bit of a
mess out of it. One of the reasons is that the intruder events
  cannot be used along with the normal ranking, because they no longer
  correspond to real events.
2006-05-26 11:27:05 +00:00
ccremers
e3b84a0f67 - New '--clusters' switch: needs some work. 2006-05-26 09:39:10 +00:00
ccremers
0679cbc3b8 - Added '--monochrome' switch, to be used in thesis output. There is a
hardcoded lightness factor in dotout.c (MONOCHROMEFACTOR)
2006-05-25 20:35:01 +00:00
ccremers
6a74883adf - Restricted the syntax somewhat, to avoid people typing crap.
(Cf. Golsteijn)
2006-05-16 15:00:21 +00:00
ccremers
6dff931dbc - Term identifiers can now contain primes (SM)
- If labels start with a bang (!), they are ignored in synch/agree
  claims.
2006-04-25 13:58:14 +00:00
ccremers
974e5f7315 - Reset encryption level issue. 2006-04-13 12:43:13 +00:00
ccremers
08f705234b - Added `include "dinges";' command, that is aware of Scytherdirs. 2006-04-12 12:42:04 +00:00
ccremers
db8e72f37e - Misc fixes to heuristic. 2006-04-03 08:21:52 +00:00
ccremers
d2058d937b - Revised cost heuristic. Trace length is no longer the real
optimization.
2006-04-02 12:29:02 +00:00
ccremers
e1890ddc9f - Improved cost function: now also avoids using initiators when
possible.
2006-04-02 12:07:25 +00:00
ccremers
52708d09b4 - MakeTraceConcrete now yields nicer choices, e.g. "Agent1" or "Nonce2". 2006-04-02 11:56:22 +00:00
ccremers
8c03bba02a - Fixed a bug in output overwrite for de-class code. 2006-03-31 12:24:32 +00:00
ccremers
4d7b744e1b - Discovered ugly bit in de-class code, which causes what seem to be
errors with --extravert: even if Alice is already occurring in the
  system, the name can be used.
- Added explicit level 2 encryption bound. This is technically
  incorrect, but for now it should work.
2006-03-31 10:12:58 +00:00
ccremers
cb440700e3 - Added --unique responder/initiator switches, which are both implied by
--extravert.
2006-03-31 08:24:41 +00:00
ccremers
5fe55d35cf - Code refactoring. 2006-03-28 14:45:02 +00:00
ccremers
b224344b59 - Bugfixed --extravert. 2006-03-28 14:24:46 +00:00
ccremers
ac87af60c1 - More improvements. Current drawbacks: Intruder choice still not clear. 2006-03-20 09:54:45 +00:00
ccremers
f3d4e8c350 - Some improvements to the intruder nodes. 2006-03-20 09:40:45 +00:00
ccremers
543e430e6c - In the light of recent discoveries on Athena method, I reinstated the
--match switch.
2006-03-20 08:47:12 +00:00
ccremers
881eccd6be - Fixed --disable-intruder: it now also uses no tupling shortcuts. 2006-03-19 12:59:26 +00:00
ccremers
a35a618a27 - Cleanup; make headers more compact. 2006-03-16 16:15:14 +00:00
ccremers
f11f1fff0b - Bugfix for dot output. 2006-03-16 13:26:46 +00:00
ccremers
3241c0c828 - Better class printing for the headers. 2006-03-16 08:49:10 +00:00
ccremers
1ce03104c5 Major:
- Added rho/sigma/constants fields to the runs, on which the new code is
  based. Over time, .locals should be deprecated in favour of these
  better variants.
- Untyped variant is out of grace for the time being (cf. Athena interm
  problems)
- Improved graph output further.

Minor:
- Added TERMLISTADD and APPEND macros for more concise code.
2006-03-15 21:30:19 +00:00
ccremers
5624f7e7b6 - Added some comments. 2006-03-15 08:56:23 +00:00
ccremers
25244c5b23 - Fixed bug in new tuple expansion code (again, caused by the intricate
"realX" versus "isX" distinction.)
- Added structures for rho, sigma, constants, but did not activate them
  yet.
2006-03-15 08:51:08 +00:00
ccremers
2b9246bb64 - Bug report: this should be fixed. 2006-03-15 08:33:09 +00:00
ccremers
16a59624fe - Revised dot output.
- Reintroduced intruder events.
  - Added colors.
2006-03-14 11:37:28 +00:00
ccremers
f7ee9743d2 - Bugfix for self-initiator detection. Woops. 2006-03-13 14:19:01 +00:00
ccremers
74052cf226 - Code cleanup for intruder count. 2006-03-10 14:52:45 +00:00
ccremers
af07f0cc3f - Removed obsolete stuff. 2006-03-10 14:51:05 +00:00
ccremers
895852de89 - Added iterators.
- More space in encryption notation for better readability.
2006-03-10 14:48:40 +00:00
ccremers
2280187b32 - Improved dot class output. 2006-03-08 15:12:58 +00:00
ccremers
5487d3ae90 - From this version onwards, Scyther no longer supports the modelchecker
method. A big cleanup has been started, but is not finished yet, so
  minor artefacts might still remain. These are to be cleaned up later.
2006-03-08 13:58:46 +00:00
ccremers
2830c8e8ff - Fixed some Doxygen documentation errors. 2006-03-08 12:38:39 +00:00
ccremers
1678577ce0 - Improved proof reports.
- Minor (epsilon type) efficiency improvement.
2006-03-05 15:18:39 +00:00
ccremers
527bf8baa5 - Better error reporting for local order constraints. 2006-02-28 15:33:12 +00:00
ccremers
f3d94b8e0d - Removed old hack lemmas by clean ones. 2006-02-28 15:01:58 +00:00
ccremers
282c0d5094 - --experimental is now available in the normal version, but for experts
only.
2006-02-28 14:06:12 +00:00
ccremers
a4429d548f - Turned 'hidden' term lemma back on by default. 2006-02-28 13:57:38 +00:00
ccremers
00616e45ed - Bit masking was incorrect: & binds less strong than == !
This caused many of the --experimental switches not to work.
2006-02-28 13:41:36 +00:00
ccremers
cf832ca1b1 - Seems to work again, but further testing is needed. 2006-02-27 22:27:09 +00:00
ccremers
b49d13b6ee - [[[ Broken commit. ]]]
Stuff seems to be working again, slightly less efficient though (count
  states).
2006-02-27 16:08:17 +00:00
ccremers
bb16bd755e - Print states in a more countable format. 2006-02-27 15:20:37 +00:00
ccremers
c22173e5ee - [[[ Broken commit ]]]
More work on the arachne multiple-decryptor. Horrific.
2006-02-26 20:01:22 +00:00
ccremers
95df010a54 - [[[ Broken commit ]]]
More intermediate work.
2006-02-26 17:18:59 +00:00
ccremers
0ce88af6ac - [[[ Broken commit ]]]
Committing partial new Warshall work because it is getting too big.
2006-02-26 15:00:58 +00:00
ccremers
1d3d154a2f - If the timebound is hit, it should be reported anyway, because the
results are not to be trusted anymore.
2006-02-23 16:21:25 +00:00
ccremers
b16023bf0e - Cleaned up heuristic code. Note that there is a "hidden" heuristic:
implicitly, older goals are resolved first, if some goals have equal
  weights. This is encoded in the "w <=" comparison; if this is set to
  "w <", the heuristic becomes much less effective.
2006-02-23 15:03:43 +00:00
ccremers
f333fb8276 - Explicit casts. 2006-02-23 10:44:44 +00:00
ccremers
8f896432d1 - Added some stuff on the new graph code. 2006-02-22 16:58:11 +00:00
ccremers
f376260512 - Changed default heuristic to 34. 2006-02-22 15:57:55 +00:00
ccremers
41e797413c - Added new heuristics based on hidelevel results.
Preliminary results:
  1. For typed matching, either heuristic 32 or 34 are best, and far
  superior to the previous best (3).
  2. For untyped matching, partial tests indicate that heuristic 1 is
  best, which is rather interesting.
2006-02-22 15:48:58 +00:00
ccremers
921c82876d - experimental=4 now disables some things. Weirdly enough, they don't
seem to make much difference.
2006-02-22 09:53:50 +00:00
ccremers
dbc0a3583d - Better setup for --experimental= switch using bit masks. 2006-02-22 08:55:42 +00:00
ccremers
10b6793d97 - More cleaning of switches. 2006-02-22 08:47:22 +00:00
ccremers
5ddcdfed22 - Added --long-help and -E, --expert switches. 2006-02-22 08:41:06 +00:00