- Added --proof switch for Arachne engine, which outputs the (partial)
proof of correctness.
This commit is contained in:
parent
d73351ace7
commit
1180d3cf6f
328
src/arachne.c
328
src/arachne.c
@ -43,14 +43,6 @@ Role I_RRS;
|
|||||||
static int indentDepth;
|
static int indentDepth;
|
||||||
static int max_encryption_level;
|
static int max_encryption_level;
|
||||||
|
|
||||||
#ifdef DEBUG
|
|
||||||
static char *explanation; // Pointer to a string that describes what we just tried to do
|
|
||||||
static int e_run;
|
|
||||||
static Term e_term1;
|
|
||||||
static Term e_term2;
|
|
||||||
static Term e_term3;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct goalstruct
|
struct goalstruct
|
||||||
{
|
{
|
||||||
int run;
|
int run;
|
||||||
@ -146,14 +138,16 @@ arachneDone ()
|
|||||||
void
|
void
|
||||||
indentPrint ()
|
indentPrint ()
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < indentDepth; i++)
|
for (i = 0; i < indentDepth; i++)
|
||||||
eprintf ("%i ", i);
|
{
|
||||||
#else
|
if (i % 3 == 0)
|
||||||
eprintf (">> ");
|
eprintf ("|");
|
||||||
#endif
|
else
|
||||||
|
eprintf (" ");
|
||||||
|
eprintf (" ");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Print indented binding
|
//! Print indented binding
|
||||||
@ -188,12 +182,29 @@ add_read_goals (const int run, const int old, const int new)
|
|||||||
{
|
{
|
||||||
if (rd->type == READ)
|
if (rd->type == READ)
|
||||||
{
|
{
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
if (count == 0)
|
||||||
|
{
|
||||||
|
indentPrint();
|
||||||
|
eprintf ("* Thus, we must also produce ");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
eprintf (", ");
|
||||||
|
}
|
||||||
|
termPrint (rd->message);
|
||||||
|
}
|
||||||
goal_add (rd->message, run, i);
|
goal_add (rd->message, run, i);
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
rd = rd->next;
|
rd = rd->next;
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
if ((count > 0) && sys->output == PROOF)
|
||||||
|
{
|
||||||
|
eprintf ("\n");
|
||||||
|
}
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -256,6 +267,87 @@ determine_unification_run (Termlist tl)
|
|||||||
return run;
|
return run;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//------------------------------------------------------------------------
|
||||||
|
// Proof reporting
|
||||||
|
//------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//! Protocol/role name of a run
|
||||||
|
void
|
||||||
|
role_name_print (const int run)
|
||||||
|
{
|
||||||
|
eprintf ("protocol ");
|
||||||
|
termPrint (sys->runs[run].protocol->nameterm);
|
||||||
|
eprintf (", role ");
|
||||||
|
termPrint (sys->runs[run].role->nameterm);
|
||||||
|
}
|
||||||
|
|
||||||
|
//! Adding a run/extending a run
|
||||||
|
void
|
||||||
|
proof_suppose_run (const int run, const int oldlength, const int newlength)
|
||||||
|
{
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
int reallength;
|
||||||
|
|
||||||
|
indentPrint ();
|
||||||
|
eprintf ("Suppose ");
|
||||||
|
if (oldlength == 0)
|
||||||
|
eprintf ("there is a ");
|
||||||
|
else
|
||||||
|
eprintf ("we extend ");
|
||||||
|
reallength = roledef_length (sys->runs[run].start);
|
||||||
|
if (reallength > newlength)
|
||||||
|
eprintf ("semi-");
|
||||||
|
eprintf ("run #%i of ", run);
|
||||||
|
role_name_print (run);
|
||||||
|
if (reallength > newlength)
|
||||||
|
{
|
||||||
|
if (oldlength == 0)
|
||||||
|
eprintf (" of");
|
||||||
|
else
|
||||||
|
eprintf (" to");
|
||||||
|
eprintf (" length %i");
|
||||||
|
}
|
||||||
|
eprintf ("\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//! Select a goal
|
||||||
|
void
|
||||||
|
proof_select_goal (Binding b)
|
||||||
|
{
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
Roledef rd;
|
||||||
|
|
||||||
|
rd = roledef_shift (sys->runs[b->run_to].start, b->ev_to);
|
||||||
|
indentPrint ();
|
||||||
|
eprintf ("Where does term ");
|
||||||
|
termPrint (b->term);
|
||||||
|
eprintf (" , needed for ");
|
||||||
|
roledefPrint (rd);
|
||||||
|
eprintf (" at index %i in run %i, originate first?\n", b->ev_to, b->run_to);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//! Test a binding
|
||||||
|
void
|
||||||
|
proof_suppose_binding (Binding b)
|
||||||
|
{
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
Roledef rd;
|
||||||
|
|
||||||
|
indentPrint ();
|
||||||
|
rd = roledef_shift (sys->runs[b->run_from].start, b->ev_from);
|
||||||
|
eprintf ("Suppose it originates in run %i, at ", b->run_from);
|
||||||
|
roledefPrint (rd);
|
||||||
|
eprintf (" from ");
|
||||||
|
role_name_print (b->run_from);
|
||||||
|
eprintf (" at index %i\n", b->ev_from);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
// Sub
|
// Sub
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
@ -323,16 +415,14 @@ bind_existing_to_goal (const Binding b, const int run, const int index)
|
|||||||
int keycount;
|
int keycount;
|
||||||
Termlist tl;
|
Termlist tl;
|
||||||
|
|
||||||
#ifdef DEBUG
|
proof_suppose_binding (b);
|
||||||
if (DEBUGL (5))
|
if (keylist != NULL && sys->output == PROOF)
|
||||||
{
|
{
|
||||||
binding_indent_print (b, 0);
|
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Adding key list for subterm iteration: ");
|
eprintf ("* This introduces the obligation to produce the following keys: ");
|
||||||
termlistPrint (keylist);
|
termlistPrint (keylist);
|
||||||
eprintf ("\n");
|
eprintf ("\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
keycount = 0;
|
keycount = 0;
|
||||||
tl = keylist;
|
tl = keylist;
|
||||||
while (tl != NULL)
|
while (tl != NULL)
|
||||||
@ -354,13 +444,11 @@ bind_existing_to_goal (const Binding b, const int run, const int index)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
if (sys->output == PROOF)
|
||||||
if (DEBUGL (5))
|
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Aborted binding existing run because of cycle.\n");
|
eprintf ("Aborted binding existing run because of cycle.\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
flag = 1;
|
flag = 1;
|
||||||
}
|
}
|
||||||
goal_unbind (b);
|
goal_unbind (b);
|
||||||
@ -378,14 +466,7 @@ bind_existing_to_goal (const Binding b, const int run, const int index)
|
|||||||
else
|
else
|
||||||
newgoals = 0;
|
newgoals = 0;
|
||||||
|
|
||||||
#ifdef DEBUG
|
// Bind to existing run
|
||||||
if (DEBUGL (3))
|
|
||||||
{
|
|
||||||
explanation = "Bind existing run (generic) ";
|
|
||||||
e_run = run;
|
|
||||||
e_term1 = b->term;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
flag = termMguSubTerm (b->term, rd->message,
|
flag = termMguSubTerm (b->term, rd->message,
|
||||||
subterm_iterate, sys->know->inverses, NULL);
|
subterm_iterate, sys->know->inverses, NULL);
|
||||||
// Reset length
|
// Reset length
|
||||||
@ -401,19 +482,12 @@ bind_existing_run (const Binding b, const Protocol p, const Role r,
|
|||||||
{
|
{
|
||||||
int run, flag;
|
int run, flag;
|
||||||
|
|
||||||
#ifdef DEBUG
|
if (sys->output == PROOF)
|
||||||
if (DEBUGL (4))
|
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Trying to bind ");
|
eprintf ("Can we bind it to an existing regular run?\n");
|
||||||
termPrint (b->term);
|
|
||||||
eprintf (" to an existing (of %i runs) instance of ", sys->maxruns);
|
|
||||||
termPrint (p->nameterm);
|
|
||||||
eprintf (", ");
|
|
||||||
termPrint (r->nameterm);
|
|
||||||
eprintf ("\n");
|
|
||||||
}
|
}
|
||||||
#endif
|
indentDepth++;
|
||||||
flag = 1;
|
flag = 1;
|
||||||
for (run = 0; run < sys->maxruns; run++)
|
for (run = 0; run < sys->maxruns; run++)
|
||||||
{
|
{
|
||||||
@ -422,6 +496,7 @@ bind_existing_run (const Binding b, const Protocol p, const Role r,
|
|||||||
flag = flag && bind_existing_to_goal (b, run, index);
|
flag = flag && bind_existing_to_goal (b, run, index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
indentDepth--;
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -436,20 +511,9 @@ bind_new_run (const Binding b, const Protocol p, const Role r,
|
|||||||
|
|
||||||
roleInstance (sys, p, r, NULL, NULL);
|
roleInstance (sys, p, r, NULL, NULL);
|
||||||
run = sys->maxruns - 1;
|
run = sys->maxruns - 1;
|
||||||
|
proof_suppose_run (run, 0, index+1);
|
||||||
|
|
||||||
newgoals = add_read_goals (run, 0, index + 1);
|
newgoals = add_read_goals (run, 0, index + 1);
|
||||||
#ifdef DEBUG
|
|
||||||
if (DEBUGL (4))
|
|
||||||
{
|
|
||||||
indentPrint ();
|
|
||||||
eprintf ("Trying to bind ");
|
|
||||||
termPrint (b->term);
|
|
||||||
eprintf (" to a new instance of ");
|
|
||||||
termPrint (p->nameterm);
|
|
||||||
eprintf (", ");
|
|
||||||
termPrint (r->nameterm);
|
|
||||||
eprintf (", run %i\n", run);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
flag = bind_existing_to_goal (b, run, index);
|
flag = bind_existing_to_goal (b, run, index);
|
||||||
remove_read_goals (newgoals);
|
remove_read_goals (newgoals);
|
||||||
roleInstanceDestroy (sys);
|
roleInstanceDestroy (sys);
|
||||||
@ -591,23 +655,19 @@ bind_goal_new_m0 (const Binding b)
|
|||||||
|
|
||||||
roleInstance (sys, INTRUDER, I_M, NULL, NULL);
|
roleInstance (sys, INTRUDER, I_M, NULL, NULL);
|
||||||
run = sys->maxruns - 1;
|
run = sys->maxruns - 1;
|
||||||
|
proof_suppose_run (run, 0,1);
|
||||||
sys->runs[run].start->message = termDuplicate (b->term);
|
sys->runs[run].start->message = termDuplicate (b->term);
|
||||||
sys->runs[run].length = 1;
|
sys->runs[run].length = 1;
|
||||||
if (goal_bind (b, run, 0))
|
if (goal_bind (b, run, 0))
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
proof_suppose_binding (b);
|
||||||
if (DEBUGL (3))
|
if (sys->output == PROOF)
|
||||||
{
|
{
|
||||||
if (DEBUGL (5))
|
|
||||||
{
|
|
||||||
binding_indent_print (b, 0);
|
|
||||||
}
|
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Retrieving ");
|
eprintf ("* Retrieving ");
|
||||||
termPrint (b->term);
|
termPrint (b->term);
|
||||||
eprintf (" from the initial knowledge.\n");
|
eprintf (" from the initial knowledge.\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
flag = flag && iterate ();
|
flag = flag && iterate ();
|
||||||
}
|
}
|
||||||
goal_unbind (b);
|
goal_unbind (b);
|
||||||
@ -661,9 +721,9 @@ bind_goal_new_encrypt (const Binding b)
|
|||||||
rd->next->message = termDuplicate (t2);
|
rd->next->message = termDuplicate (t2);
|
||||||
rd->next->next->message = termDuplicate (term);
|
rd->next->next->message = termDuplicate (term);
|
||||||
index = 2;
|
index = 2;
|
||||||
|
proof_suppose_run (run, 0, index+1);
|
||||||
newgoals = add_read_goals (run, 0, index + 1);
|
newgoals = add_read_goals (run, 0, index + 1);
|
||||||
#ifdef DEBUG
|
if (sys->output == PROOF)
|
||||||
if (DEBUGL (3))
|
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Encrypting ");
|
eprintf ("Encrypting ");
|
||||||
@ -674,9 +734,9 @@ bind_goal_new_encrypt (const Binding b)
|
|||||||
termPrint (t2);
|
termPrint (t2);
|
||||||
eprintf ("\n");
|
eprintf ("\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
if (goal_bind (b, run, index))
|
if (goal_bind (b, run, index))
|
||||||
{
|
{
|
||||||
|
proof_suppose_binding (b);
|
||||||
flag = flag && iterate ();
|
flag = flag && iterate ();
|
||||||
}
|
}
|
||||||
goal_unbind (b);
|
goal_unbind (b);
|
||||||
@ -822,9 +882,31 @@ bind_goal (const Binding b)
|
|||||||
{
|
{
|
||||||
int flag;
|
int flag;
|
||||||
|
|
||||||
|
proof_select_goal (b);
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
indentPrint ();
|
||||||
|
eprintf ("A. Suppose it is from a regular protocol role.\n");
|
||||||
|
}
|
||||||
|
indentDepth++;
|
||||||
flag = bind_goal_regular_run (b);
|
flag = bind_goal_regular_run (b);
|
||||||
|
indentDepth--;
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
indentPrint ();
|
||||||
|
eprintf ("B. Suppose it is from an existing intruder run.\n");
|
||||||
|
}
|
||||||
|
indentDepth++;
|
||||||
flag = flag && bind_goal_old_intruder_run (b);
|
flag = flag && bind_goal_old_intruder_run (b);
|
||||||
|
indentDepth--;
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
indentPrint ();
|
||||||
|
eprintf ("C. Suppose it is from a new intruder run.\n");
|
||||||
|
}
|
||||||
|
indentDepth++;
|
||||||
flag = flag && bind_goal_new_intruder_run (b);
|
flag = flag && bind_goal_new_intruder_run (b);
|
||||||
|
indentDepth--;
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -846,25 +928,21 @@ prune ()
|
|||||||
if (indentDepth > 20)
|
if (indentDepth > 20)
|
||||||
{
|
{
|
||||||
// Hardcoded limit on iterations
|
// Hardcoded limit on iterations
|
||||||
#ifdef DEBUG
|
if (sys->output == PROOF)
|
||||||
if (DEBUGL (3))
|
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Pruned because too many iteration levels.\n");
|
eprintf ("Pruned because too many iteration levels.\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (sys->maxruns > sys->switchRuns)
|
if (sys->maxruns > sys->switchRuns)
|
||||||
{
|
{
|
||||||
// Hardcoded limit on runs
|
// Hardcoded limit on runs
|
||||||
#ifdef DEBUG
|
if (sys->output == PROOF)
|
||||||
if (DEBUGL (3))
|
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Pruned because too many runs.\n");
|
eprintf ("Pruned because too many runs.\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -877,36 +955,30 @@ prune ()
|
|||||||
agent = deVar (tl->term);
|
agent = deVar (tl->term);
|
||||||
if (!realTermLeaf (agent))
|
if (!realTermLeaf (agent))
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
if (sys->output == PROOF)
|
||||||
if (DEBUGL (3))
|
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Pruned because agent cannot be compound term.\n");
|
eprintf ("Pruned because agent cannot be compound term.\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (!inTermlist (agent->stype, TERM_Agent))
|
if (!inTermlist (agent->stype, TERM_Agent))
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
if (sys->output == PROOF)
|
||||||
if (DEBUGL (3))
|
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Pruned because agent must contain agent type.\n");
|
eprintf ("Pruned because agent must contain agent type.\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (!realTermVariable (agent) && inTermlist (sys->untrusted, agent))
|
if (!realTermVariable (agent) && inTermlist (sys->untrusted, agent))
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
if (sys->output == PROOF)
|
||||||
if (DEBUGL (3))
|
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf
|
eprintf
|
||||||
("Pruned because all agents of the claim run must be trusted.\n");
|
("Pruned because all agents of the claim run must be trusted.\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
tl = tl->next;
|
tl = tl->next;
|
||||||
@ -915,13 +987,11 @@ prune ()
|
|||||||
// Check for c-minimality
|
// Check for c-minimality
|
||||||
if (!bindings_c_minimal ())
|
if (!bindings_c_minimal ())
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
if (sys->output == PROOF)
|
||||||
if (DEBUGL (3))
|
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Pruned because this is not <=c-minimal.\n");
|
eprintf ("Pruned because this is not <=c-minimal.\n");
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -935,6 +1005,13 @@ prune ()
|
|||||||
if (termInTerm (b->term, TERM_Hidden))
|
if (termInTerm (b->term, TERM_Hidden))
|
||||||
{
|
{
|
||||||
// Prune the state: we can never meet this
|
// Prune the state: we can never meet this
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
indentPrint ();
|
||||||
|
eprintf ("Pruned because intruder can never construnct ");
|
||||||
|
termPrint (b->term);
|
||||||
|
eprintf ("\n");
|
||||||
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
bl = bl->next;
|
bl = bl->next;
|
||||||
@ -951,6 +1028,15 @@ add_claim_specifics (const Claimlist cl, const Roledef rd)
|
|||||||
/**
|
/**
|
||||||
* Secrecy claim
|
* Secrecy claim
|
||||||
*/
|
*/
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
indentPrint ();
|
||||||
|
eprintf ("* To verify the secrecy claim, we add the term ");
|
||||||
|
termPrint (rd->message);
|
||||||
|
eprintf (" as a goal.\n");
|
||||||
|
indentPrint ();
|
||||||
|
eprintf ("* If all goals can be bound, this constitutes an attack.\n");
|
||||||
|
}
|
||||||
goal_add (rd->message, 0, cl->ev); // Assumption that all claims are in run 0
|
goal_add (rd->message, 0, cl->ev); // Assumption that all claims are in run 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -980,10 +1066,8 @@ property_check ()
|
|||||||
* By the way the claim is handled, this automatically means a flaw.
|
* By the way the claim is handled, this automatically means a flaw.
|
||||||
*/
|
*/
|
||||||
count_false ();
|
count_false ();
|
||||||
#ifdef DEBUG
|
if (sys->output == ATTACK)
|
||||||
if (DEBUGL (3))
|
printSemiState ();
|
||||||
printSemiState();
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
@ -1005,34 +1089,6 @@ iterate ()
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
sys->states = statesIncrease (sys->states);
|
sys->states = statesIncrease (sys->states);
|
||||||
#ifdef DEBUG
|
|
||||||
if (DEBUGL (3) && explanation != NULL)
|
|
||||||
{
|
|
||||||
indentDepth--;
|
|
||||||
indentPrint ();
|
|
||||||
indentDepth++;
|
|
||||||
eprintf ("ITERATE: %s", explanation);
|
|
||||||
|
|
||||||
if (e_run != INVALID)
|
|
||||||
eprintf ("#%i ", e_run);
|
|
||||||
if (e_term1 != NULL)
|
|
||||||
{
|
|
||||||
termPrint (e_term1);
|
|
||||||
eprintf (" ");
|
|
||||||
}
|
|
||||||
if (e_term2 != NULL)
|
|
||||||
{
|
|
||||||
termPrint (e_term2);
|
|
||||||
eprintf (" ");
|
|
||||||
}
|
|
||||||
if (e_term3 != NULL)
|
|
||||||
{
|
|
||||||
termPrint (e_term3);
|
|
||||||
eprintf (" ");
|
|
||||||
}
|
|
||||||
eprintf (" ]}>=--\n");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check whether its a final state (i.e. all goals bound)
|
* Check whether its a final state (i.e. all goals bound)
|
||||||
@ -1044,34 +1100,23 @@ iterate ()
|
|||||||
/*
|
/*
|
||||||
* all goals bound, check for property
|
* all goals bound, check for property
|
||||||
*/
|
*/
|
||||||
|
if (sys->output == PROOF)
|
||||||
|
{
|
||||||
|
indentPrint ();
|
||||||
|
eprintf ("All goals are now bound.");
|
||||||
|
}
|
||||||
sys->claims = statesIncrease (sys->claims);
|
sys->claims = statesIncrease (sys->claims);
|
||||||
current_claim->count = statesIncrease (current_claim->count);
|
current_claim->count = statesIncrease (current_claim->count);
|
||||||
flag = flag && property_check ();
|
flag = flag && property_check ();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
|
||||||
if (DEBUGL (3))
|
|
||||||
{
|
|
||||||
indentPrint ();
|
|
||||||
eprintf ("Trying to bind goal ");
|
|
||||||
termPrint (b->term);
|
|
||||||
eprintf (" from run %i, index %i.\n", b->run_to, b->ev_to);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
/*
|
/*
|
||||||
* bind this goal in all possible ways and iterate
|
* bind this goal in all possible ways and iterate
|
||||||
*/
|
*/
|
||||||
flag = bind_goal (b);
|
flag = bind_goal (b);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef DEBUG
|
|
||||||
explanation = NULL;
|
|
||||||
e_run = INVALID;
|
|
||||||
e_term1 = NULL;
|
|
||||||
e_term2 = NULL;
|
|
||||||
e_term3 = NULL;
|
|
||||||
#endif
|
|
||||||
indentDepth--;
|
indentDepth--;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
@ -1148,33 +1193,24 @@ arachne ()
|
|||||||
if (sys->switchClaimToCheck == NULL
|
if (sys->switchClaimToCheck == NULL
|
||||||
|| sys->switchClaimToCheck == cl->type)
|
|| sys->switchClaimToCheck == cl->type)
|
||||||
{
|
{
|
||||||
#ifdef DEBUG
|
current_claim = cl;
|
||||||
explanation = NULL;
|
|
||||||
e_run = INVALID;
|
|
||||||
e_term1 = NULL;
|
|
||||||
e_term2 = NULL;
|
|
||||||
e_term3 = NULL;
|
|
||||||
#endif
|
|
||||||
current_claim = cl;
|
|
||||||
p = (Protocol) cl->protocol;
|
p = (Protocol) cl->protocol;
|
||||||
r = (Role) cl->role;
|
r = (Role) cl->role;
|
||||||
#ifdef DEBUG
|
|
||||||
if (DEBUGL (2))
|
roleInstance (sys, p, r, NULL, NULL);
|
||||||
|
if (sys->output == PROOF)
|
||||||
{
|
{
|
||||||
indentPrint ();
|
indentPrint ();
|
||||||
eprintf ("Testing Claim ");
|
eprintf ("Testing Claim ");
|
||||||
termPrint (cl->type);
|
termPrint (cl->type);
|
||||||
eprintf (" in protocol ");
|
eprintf (" from ");
|
||||||
termPrint (p->nameterm);
|
role_name_print (0);
|
||||||
eprintf (", role ");
|
|
||||||
termPrint (r->nameterm);
|
|
||||||
eprintf (" at index %i.\n", cl->ev);
|
eprintf (" at index %i.\n", cl->ev);
|
||||||
}
|
}
|
||||||
#endif
|
proof_suppose_run (0,0, cl->ev+1);
|
||||||
|
|
||||||
roleInstance (sys, p, r, NULL, NULL);
|
|
||||||
add_read_goals (sys->maxruns - 1, 0, cl->ev + 1);
|
add_read_goals (sys->maxruns - 1, 0, cl->ev + 1);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add specific goal info
|
* Add specific goal info
|
||||||
*/
|
*/
|
||||||
|
@ -92,6 +92,7 @@ main (int argc, char **argv)
|
|||||||
"output file (default is stdout)");
|
"output file (default is stdout)");
|
||||||
struct arg_lit *switch_arachne =
|
struct arg_lit *switch_arachne =
|
||||||
arg_lit0 ("a", "arachne", "use Arachne engine");
|
arg_lit0 ("a", "arachne", "use Arachne engine");
|
||||||
|
struct arg_lit *switch_proof = arg_lit0 ("P", "proof", "generate proof output");
|
||||||
struct arg_str *switch_check = arg_str0 (NULL, "check", "CLAIM",
|
struct arg_str *switch_check = arg_str0 (NULL, "check", "CLAIM",
|
||||||
"claim type to check (default is all)");
|
"claim type to check (default is all)");
|
||||||
struct arg_int *switch_scenario = arg_int0 ("s", "scenario", NULL,
|
struct arg_int *switch_scenario = arg_int0 ("s", "scenario", NULL,
|
||||||
@ -163,6 +164,7 @@ main (int argc, char **argv)
|
|||||||
infile,
|
infile,
|
||||||
outfile,
|
outfile,
|
||||||
switch_empty,
|
switch_empty,
|
||||||
|
switch_proof,
|
||||||
switch_state_space_graph,
|
switch_state_space_graph,
|
||||||
switch_scenario,
|
switch_scenario,
|
||||||
switch_scenario_size,
|
switch_scenario_size,
|
||||||
@ -386,6 +388,8 @@ main (int argc, char **argv)
|
|||||||
sys->switchReduceClaims = 0; /* disable claim symmetry cutter */
|
sys->switchReduceClaims = 0; /* disable claim symmetry cutter */
|
||||||
if (switch_summary->count > 0)
|
if (switch_summary->count > 0)
|
||||||
sys->output = SUMMARY; /* report summary on stdout */
|
sys->output = SUMMARY; /* report summary on stdout */
|
||||||
|
if (switch_proof->count > 0)
|
||||||
|
sys->output = PROOF; /* report proof on stdout (for arachne only) */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The scenario selector has an important side effect; when it is non-null,
|
* The scenario selector has an important side effect; when it is non-null,
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#define runPointerSet(sys,run,newp) sys->runs[run].index = newp
|
#define runPointerSet(sys,run,newp) sys->runs[run].index = newp
|
||||||
|
|
||||||
enum outputs
|
enum outputs
|
||||||
{ EMPTY, ATTACK, STATESPACE, SCENARIOS, SUMMARY };
|
{ EMPTY, ATTACK, STATESPACE, SCENARIOS, SUMMARY, PROOF };
|
||||||
|
|
||||||
enum engines
|
enum engines
|
||||||
{ POR_ENGINE, ARACHNE_ENGINE };
|
{ POR_ENGINE, ARACHNE_ENGINE };
|
||||||
|
Loading…
Reference in New Issue
Block a user