Merge branch 'master' of ssh://cremersc@buckleburg.inf.ethz.ch/home/cremersc/repos/scyther

This commit is contained in:
Cas Cremers 2008-01-28 15:25:46 +01:00
commit 0709539737
3 changed files with 11 additions and 0 deletions

View File

@ -15,7 +15,9 @@ secret unkeygen: Function;
inversekeys(keygen, unkeygen); inversekeys(keygen, unkeygen);
const pa,pb: Params; const pa,pb: Params;
const Alice,Bob: Agent;
const Terence: Agent; const Terence: Agent;
const Sally: Agent;
const false,true: Bool; const false,true: Bool;

View File

@ -2213,8 +2213,10 @@ preprocess (const System sys)
/* /*
* Check well-formedness * Check well-formedness
*/ */
/* TODO Temporarily disabled wellformedness check (well-formedness) after Simon bug reporting.
if (sys->knowledgedefined) if (sys->knowledgedefined)
{ {
checkWellFormed (sys); checkWellFormed (sys);
} }
*/
} }

View File

@ -115,6 +115,13 @@ anySubTerm (Term t, Termlist sublist)
void void
initialIntruderKnowledge (const System sys) initialIntruderKnowledge (const System sys)
{ {
/*
TODO this is buggy and leads to a segfault with Simon's example (bug report for wellformedness check)
Disabled for now.
./scyther-linux simple-challenge-SEGFAULT.spdl
*/
return;
/* /*
* display initial role knowledge * display initial role knowledge
*/ */