From b831c755f31c665180bc89ef5e5eabfdb7635c4c Mon Sep 17 00:00:00 2001 From: ccremers Date: Fri, 11 Mar 2005 15:52:20 +0000 Subject: [PATCH] - Filter out some overly zealous server claims. --- test/results/conclusions.txt | 16 ---------------- test/results/process.py | 19 ++++++++++++++----- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/test/results/conclusions.txt b/test/results/conclusions.txt index e2d2aec..d39fee1 100644 --- a/test/results/conclusions.txt +++ b/test/results/conclusions.txt @@ -146,20 +146,6 @@ >>>G spliceAShcCJ CV Secret [1] tmn >>>G spliceAShcCJ CV Secret [2] nssymmetric >>>G spliceAShcCJ CV Secret [2] nssymmetricamended ->>>G spliceAShcCJ SV Secret [0] soph ->>>G spliceAShcCJ SV Secret [0] spliceAS ->>>G spliceAShcCJ SV Secret [0] spliceAShc ->>>G spliceAShcCJ SV Secret [1] tmn ->>>G spliceAShcCJ SV Secret [2] andrewBan soph ->>>G spliceAShcCJ SV Secret [2] gongnonceb soph ->>>G spliceAShcCJ SV Secret [2] gongnonce soph ->>>G spliceAShcCJ SV Secret [2] isoiec11770213 soph ->>>G spliceAShcCJ SV Secret [2] kaochow2 soph ->>>G spliceAShcCJ SV Secret [2] kaochow3 soph ->>>G spliceAShcCJ SV Secret [2] kaochowPalm soph ->>>G spliceAShcCJ SV Secret [2] kaochow soph ->>>G spliceAShcCJ SV Secret [2] nssymmetric ->>>G spliceAShcCJ SV Secret [2] nssymmetricamended >>>G wmfbrutus BV Secret [0] yahalomBan >>>G wmfbrutus BV Secret [1] yahalompaulson >>>G wmfbrutus BV Secret [2] boyd @@ -184,8 +170,6 @@ >>>G woolamcmv BV Secret [1] denningsaccosh >>>G woolamcmv BV Secret [2] yahalomBan >>>G woolamcmv BV Secret [2] yahalompaulson ->>>G woolamcmv SV Secret [1] denningsaccosh ->>>G woolamcmv SV Secret [1] yahalomlowe >>>G yahalom AV Secret [1] denningsaccosh woolamcmv >>>G yahalom AV Secret [2] yahalomBan >>>G yahalom AV Secret [2] yahalompaulson diff --git a/test/results/process.py b/test/results/process.py index 4ecdfb2..d4bc3f3 100755 --- a/test/results/process.py +++ b/test/results/process.py @@ -68,6 +68,14 @@ class buffer: self.reset() +def ignore_this(data): + if (data[3].rfind(" SV") != -1): + # Server role! + return True + else: + # Not including the server role + return False + def main(): buf_big = buffer("[Global]",">>>G") @@ -92,11 +100,12 @@ def main(): match = int(line[loc + len(matchprefix)]) print "Detected match type", match else: - # Yes! - claim = data[3] - helpers = "\t".join(data[4:]) - buf_big.add((claim,helpers), match) - buf_small.add((claim,helpers), match) + if not ignore_this(data): + # Yes! + claim = data[3] + helpers = "\t".join(data[4:]) + buf_big.add((claim,helpers), match) + buf_small.add((claim,helpers), match) # Proceed to next line line = sys.stdin.readline()