andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- MakeTraceConcrete now yields nicer choices, e.g. "Agent1" or "Nonce2".

Browse Source
This commit is contained in:
ccremers 2006-04-02 11:56:22 +00:00
parent 8c03bba02a
commit 52708d09b4
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/arachne.c
View File

@ -1706,7 +1706,7 @@ createNewTermGeneric (Termlist tl, Term t)
Term newterm; Term newterm;
/* Determine first free number */ /* Determine first free number */
freenumber = 0; freenumber = sys->maxruns;
tlscan = tl; tlscan = tl;
while (tlscan != NULL) while (tlscan != NULL)
{ {
@ -1832,6 +1832,8 @@ deleteNewTerm (Term t)
* People find reading variables in attack outputs difficult. * People find reading variables in attack outputs difficult.
* Thus, we instantiate them in a sensible way to make things more readable. * Thus, we instantiate them in a sensible way to make things more readable.
* *
* This happens after sys->maxruns is fixed. Intruder constants thus are numbered from sys->maxruns onwards.
*
* \sa makeTraceClass * \sa makeTraceClass
*/ */
Termlist Termlist

9
src/dotout.c
View File

@ -67,6 +67,9 @@ printVisualRun (int rid)
int displayr; int displayr;
int display; int display;
if (rid < sys->maxruns)
{
// < sys->maxruns means normal thing (not from makeTraceConcrete)
displayi = 0; displayi = 0;
displayr = 0; displayr = 0;
for (run = 0; run < rid; run++) for (run = 0; run < rid; run++)
@ -89,6 +92,12 @@ printVisualRun (int rid)
display = displayr + 1; display = displayr + 1;
} }
eprintf ("#%i", display); eprintf ("#%i", display);
}
else
{
// >= sys->maxruns means intruder choice
eprintf ("%i", (rid - sys->maxruns + 1));
}
} }
//! Remap term stuff //! Remap term stuff