Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TTool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mbe-tools
TTool
Commits
0b8bb45b
Commit
0b8bb45b
authored
9 years ago
by
Florian Lugou
Browse files
Options
Downloads
Patches
Plain Diff
corrected ProVerif Output analyzer test
parent
84bb960f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/proverifspec/ProVerifOutputAnalyzerTest.java
+0
-235
0 additions, 235 deletions
src/proverifspec/ProVerifOutputAnalyzerTest.java
tests/Avatar/ProVerif/ProVerifOutputAnalyzerTest.java
+39
-35
39 additions, 35 deletions
tests/Avatar/ProVerif/ProVerifOutputAnalyzerTest.java
with
39 additions
and
270 deletions
src/proverifspec/ProVerifOutputAnalyzerTest.java
deleted
100644 → 0
+
0
−
235
View file @
84bb960f
/**Copyright or (C) or Copr. GET / ENST, Telecom-Paris, Ludovic Apvrille
*
* ludovic.apvrille AT enst.fr
*
* This software is a computer program whose purpose is to allow the
* edition of TURTLE analysis, design and deployment diagrams, to
* allow the generation of RT-LOTOS or Java code from this diagram,
* and at last to allow the analysis of formal validation traces
* obtained from external tools, e.g. RTL from LAAS-CNRS and CADP
* from INRIA Rhone-Alpes.
*
* This software is governed by the CeCILL license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL license and that you accept its terms.
*
* /**
* Class ProVerifOutputAnalyzer
* Creation: 16/09/2010
* @version 1.0 16/09/2010
* @author Ludovic APVRILLE
* @see
*/
import
java.io.BufferedReader
;
import
java.io.FileReader
;
import
java.io.IOException
;
import
java.security.MessageDigest
;
import
java.security.NoSuchAlgorithmException
;
import
avatartranslator.AvatarAttribute
;
import
avatartranslator.AvatarBlock
;
import
avatartranslator.AvatarSpecification
;
import
avatartranslator.toproverif.AVATAR2ProVerif
;
import
proverifspec.ProVerifOutputAnalyzer
;
public
class
ProVerifOutputAnalyzerTest
{
public
static
void
main
(
String
[]
args
){
BufferedReader
br
=
null
;
byte
[]
expected
=
{-
6
,
-
76
,
-
105
,
122
,
48
,
-
22
,
6
,
-
4
,
75
,
68
,
112
,
-
32
,
38
,
67
,
123
,
-
98
,
-
38
,
-
87
,
30
,
-
27
};
try
{
String
s
=
""
;
String
sCurrentLine
;
br
=
new
BufferedReader
(
new
FileReader
(
"typed.txt"
));
while
((
sCurrentLine
=
br
.
readLine
())
!=
null
)
{
s
=
s
.
concat
(
sCurrentLine
+
"\n"
);
}
//System.out.println(s);
System
.
out
.
print
(
"==========> Testing ProVerif Output Analyzer"
);
AvatarSpecification
avspec
=
new
AvatarSpecification
(
"dummy"
,
null
);
AvatarBlock
aliceBlock
=
new
AvatarBlock
(
"Alice"
,
avspec
,
null
);
aliceBlock
.
addAttribute
(
new
AvatarAttribute
(
"sk__data"
,
null
,
aliceBlock
,
null
));
aliceBlock
.
addAttribute
(
new
AvatarAttribute
(
"m__data"
,
null
,
aliceBlock
,
null
));
aliceBlock
.
addAttribute
(
new
AvatarAttribute
(
"m1__data"
,
null
,
aliceBlock
,
null
));
aliceBlock
.
addAttribute
(
new
AvatarAttribute
(
"secretData"
,
null
,
aliceBlock
,
null
));
AvatarBlock
bobBlock
=
new
AvatarBlock
(
"Bob"
,
avspec
,
null
);
bobBlock
.
addAttribute
(
new
AvatarAttribute
(
"m__data"
,
null
,
bobBlock
,
null
));
bobBlock
.
addAttribute
(
new
AvatarAttribute
(
"m2__data"
,
null
,
bobBlock
,
null
));
bobBlock
.
addAttribute
(
new
AvatarAttribute
(
"receivedData"
,
null
,
bobBlock
,
null
));
avspec
.
addBlock
(
aliceBlock
);
avspec
.
addBlock
(
bobBlock
);
MessageDigest
md
=
MessageDigest
.
getInstance
(
"SHA"
);
ProVerifOutputAnalyzer
poa
=
new
ProVerifOutputAnalyzer
(
new
AVATAR2ProVerif
(
avspec
)
{
public
String
getTrueName
(
AvatarAttribute
attr
)
{
return
AVATAR2ProVerif
.
translateTerm
(
attr
,
null
);
}
});
poa
.
analyzeOutput
(
s
,
true
);
//Test for Reachable Events
//System.out.println("Reachable Events " + poa.getReachableEvents().size());
for
(
String
str:
poa
.
getReachableEvents
()){
md
.
update
(
str
.
getBytes
());
}
//System.out.println("NonReachable Events " + poa.getNonReachableEvents().size());
for
(
String
str:
poa
.
getNonReachableEvents
()){
md
.
update
(
str
.
getBytes
());
}
//System.out.println("Secret Terms " + poa.getSecretTerms().size());
for
(
AvatarAttribute
attr:
poa
.
getSecretTerms
()){
md
.
update
((
attr
.
getBlock
().
getName
()
+
"."
+
attr
.
getName
()).
getBytes
());
}
//System.out.println("Non Secret Terms " + poa.getNonSecretTerms().size());
for
(
AvatarAttribute
attr:
poa
.
getNonSecretTerms
()){
md
.
update
((
attr
.
getBlock
().
getName
()
+
"."
+
attr
.
getName
()).
getBytes
());
}
//System.out.println("Satisfied Authenticity " +poa.getSatisfiedAuthenticity().size());
for
(
String
str:
poa
.
getSatisfiedAuthenticity
()){
md
.
update
(
str
.
getBytes
());
}
//System.out.println("Satisfied Weak Authenticity " +poa.getSatisfiedWeakAuthenticity().size());
for
(
String
str:
poa
.
getSatisfiedWeakAuthenticity
()){
md
.
update
(
str
.
getBytes
());
}
//System.out.println("Non Satisfied Authenticity " +poa.getNonSatisfiedAuthenticity().size());
for
(
String
str:
poa
.
getNonSatisfiedAuthenticity
()){
md
.
update
(
str
.
getBytes
());
}
//System.out.println("Errors " +poa.getErrors().size());
for
(
String
str:
poa
.
getErrors
()){
md
.
update
(
str
.
getBytes
());
}
//System.out.println("Not proved " +poa.getNotProved().size());
for
(
String
str:
poa
.
getNotProved
()){
md
.
update
(
str
.
getBytes
());
}
byte
[]
dig
=
md
.
digest
();
for
(
int
i
=
0
;
i
<
dig
.
length
;
i
++)
if
(
expected
[
i
]
!=
dig
[
i
])
{
System
.
err
.
println
(
"\nCouldn't analyze ProVerif typed output...\n"
);
System
.
exit
(-
1
);
}
//System.out.print ("{");
//for (byte b: dig) {
// System.out.print (b);
// System.out.print (", ");
//}
//System.out.println ();
//Untyped Tests
//System.out.println("Untyped Tests");
br
=
new
BufferedReader
(
new
FileReader
(
"untyped.txt"
));
while
((
sCurrentLine
=
br
.
readLine
())
!=
null
)
{
s
=
s
.
concat
(
sCurrentLine
+
"\n"
);
}
//System.out.println(s);
//System.out.println("__________________________________");
poa
=
new
ProVerifOutputAnalyzer
(
new
AVATAR2ProVerif
(
avspec
)
{
public
String
getTrueName
(
AvatarAttribute
attr
)
{
return
AVATAR2ProVerif
.
translateTerm
(
attr
,
null
);
}
});
poa
.
analyzeOutput
(
s
,
false
);
md
.
reset
();
System
.
out
.
println
(
"\nReachable Events "
+
poa
.
getReachableEvents
().
size
());
for
(
String
str:
poa
.
getReachableEvents
()){
System
.
out
.
println
(
str
);
}
System
.
out
.
println
(
"NonReachable Events "
+
poa
.
getNonReachableEvents
().
size
());
for
(
String
str:
poa
.
getNonReachableEvents
()){
System
.
out
.
println
(
str
);
}
System
.
out
.
println
(
"Secret Terms "
+
poa
.
getSecretTerms
().
size
());
for
(
AvatarAttribute
attr:
poa
.
getSecretTerms
()){
System
.
out
.
println
((
attr
.
getBlock
().
getName
()
+
"."
+
attr
.
getName
()));
}
System
.
out
.
println
(
"Non Secret Terms "
+
poa
.
getNonSecretTerms
().
size
());
for
(
AvatarAttribute
attr:
poa
.
getNonSecretTerms
()){
System
.
out
.
println
((
attr
.
getBlock
().
getName
()
+
"."
+
attr
.
getName
()));
}
System
.
out
.
println
(
"Satisfied Authenticity "
+
poa
.
getSatisfiedAuthenticity
().
size
());
for
(
String
str:
poa
.
getSatisfiedAuthenticity
()){
System
.
out
.
println
(
str
);
}
System
.
out
.
println
(
"Satisfied Weak Authenticity "
+
poa
.
getSatisfiedWeakAuthenticity
().
size
());
for
(
String
str:
poa
.
getSatisfiedWeakAuthenticity
()){
System
.
out
.
println
(
str
);
}
System
.
out
.
println
(
"Non Satisfied Authenticity "
+
poa
.
getNonSatisfiedAuthenticity
().
size
());
for
(
String
str:
poa
.
getNonSatisfiedAuthenticity
()){
System
.
out
.
println
(
str
);
}
System
.
out
.
println
(
"Errors "
+
poa
.
getErrors
().
size
());
for
(
String
str:
poa
.
getErrors
()){
System
.
out
.
println
(
str
);
}
System
.
out
.
println
(
"Not proved "
+
poa
.
getNotProved
().
size
());
for
(
String
str:
poa
.
getNotProved
()){
System
.
out
.
println
(
str
);
}
//dig = md.digest ();
//for (int i=0; i<dig.length; i++)
// if (expected[i] != dig[i]) {
// System.err.println ("\nCouldn't analyze ProVerif untyped output...\n");
// System.exit (-1);
// }
//System.out.println(": ok");
}
catch
(
IOException
|
NoSuchAlgorithmException
e
)
{
e
.
printStackTrace
();
System
.
exit
(-
1
);
}
finally
{
try
{
if
(
br
!=
null
)
br
.
close
();
}
catch
(
IOException
ex
)
{
ex
.
printStackTrace
();
System
.
exit
(-
1
);
}
}
}
}
This diff is collapsed.
Click to expand it.
tests/Avatar/ProVerif/ProVerifOutputAnalyzerTest.java
+
39
−
35
View file @
0b8bb45b
...
...
@@ -59,7 +59,8 @@ import proverifspec.ProVerifOutputAnalyzer;
public
class
ProVerifOutputAnalyzerTest
{
public
static
void
main
(
String
[]
args
){
BufferedReader
br
=
null
;
byte
[]
expected
=
{-
6
,
-
76
,
-
105
,
122
,
48
,
-
22
,
6
,
-
4
,
75
,
68
,
112
,
-
32
,
38
,
67
,
123
,
-
98
,
-
38
,
-
87
,
30
,
-
27
};
byte
[]
expectedTyped
=
{-
6
,
-
76
,
-
105
,
122
,
48
,
-
22
,
6
,
-
4
,
75
,
68
,
112
,
-
32
,
38
,
67
,
123
,
-
98
,
-
38
,
-
87
,
30
,
-
27
};
byte
[]
expectedUntyped
=
{-
84
,
-
61
,
35
,
-
120
,
72
,
-
116
,
-
42
,
37
,
-
20
,
80
,
-
38
,
-
73
,
-
1
,
-
17
,
85
,
-
81
,
53
,
-
5
,
70
,
88
};
try
{
String
s
=
""
;
...
...
@@ -138,21 +139,15 @@ public class ProVerifOutputAnalyzerTest {
byte
[]
dig
=
md
.
digest
();
for
(
int
i
=
0
;
i
<
dig
.
length
;
i
++)
if
(
expected
[
i
]
!=
dig
[
i
])
{
if
(
expected
Typed
[
i
]
!=
dig
[
i
])
{
System
.
err
.
println
(
"\nCouldn't analyze ProVerif typed output...\n"
);
System
.
exit
(-
1
);
}
//System.out.print ("{");
//for (byte b: dig) {
// System.out.print (b);
// System.out.print (", ");
//}
//System.out.println ();
//Untyped Tests
//System.out.println("Untyped Tests");
s
=
""
;
s
=
""
;
br
=
new
BufferedReader
(
new
FileReader
(
"untyped.txt"
));
while
((
sCurrentLine
=
br
.
readLine
())
!=
null
)
{
s
=
s
.
concat
(
sCurrentLine
+
"\n"
);
...
...
@@ -172,52 +167,61 @@ public class ProVerifOutputAnalyzerTest {
md
.
reset
();
System
.
out
.
println
(
"
\n
Reachable Events "
+
poa
.
getReachableEvents
().
size
());
//
System.out.println("Reachable Events " + poa.getReachableEvents().size());
for
(
String
str:
poa
.
getReachableEvents
()){
System
.
out
.
println
(
str
);
md
.
update
(
str
.
getBytes
()
);
}
System
.
out
.
println
(
"NonReachable Events "
+
poa
.
getNonReachableEvents
().
size
());
//
System.out.println("NonReachable Events " + poa.getNonReachableEvents().size());
for
(
String
str:
poa
.
getNonReachableEvents
()){
System
.
out
.
println
(
str
);
md
.
update
(
str
.
getBytes
()
);
}
System
.
out
.
println
(
"Secret Terms "
+
poa
.
getSecretTerms
().
size
());
//
System.out.println("Secret Terms " + poa.getSecretTerms().size());
for
(
AvatarAttribute
attr:
poa
.
getSecretTerms
()){
System
.
out
.
println
((
attr
.
getBlock
().
getName
()
+
"."
+
attr
.
getName
()));
md
.
update
((
attr
.
getBlock
().
getName
()
+
"."
+
attr
.
getName
())
.
getBytes
()
);
}
System
.
out
.
println
(
"Non Secret Terms "
+
poa
.
getNonSecretTerms
().
size
());
//
System.out.println("Non Secret Terms " + poa.getNonSecretTerms().size());
for
(
AvatarAttribute
attr:
poa
.
getNonSecretTerms
()){
System
.
out
.
println
((
attr
.
getBlock
().
getName
()
+
"."
+
attr
.
getName
()));
md
.
update
((
attr
.
getBlock
().
getName
()
+
"."
+
attr
.
getName
())
.
getBytes
()
);
}
System
.
out
.
println
(
"Satisfied Authenticity "
+
poa
.
getSatisfiedAuthenticity
().
size
());
//
System.out.println("Satisfied Authenticity " +poa.getSatisfiedAuthenticity().size());
for
(
String
str:
poa
.
getSatisfiedAuthenticity
()){
System
.
out
.
println
(
str
);
md
.
update
(
str
.
getBytes
()
);
}
System
.
out
.
println
(
"Satisfied Weak Authenticity "
+
poa
.
getSatisfiedWeakAuthenticity
().
size
());
//
System.out.println("Satisfied Weak Authenticity " +poa.getSatisfiedWeakAuthenticity().size());
for
(
String
str:
poa
.
getSatisfiedWeakAuthenticity
()){
System
.
out
.
println
(
str
);
md
.
update
(
str
.
getBytes
()
);
}
System
.
out
.
println
(
"Non Satisfied Authenticity "
+
poa
.
getNonSatisfiedAuthenticity
().
size
());
//
System.out.println("Non Satisfied Authenticity " +poa.getNonSatisfiedAuthenticity().size());
for
(
String
str:
poa
.
getNonSatisfiedAuthenticity
()){
System
.
out
.
println
(
str
);
md
.
update
(
str
.
getBytes
()
);
}
System
.
out
.
println
(
"Errors "
+
poa
.
getErrors
().
size
());
//
System.out.println("Errors " +poa.getErrors().size());
for
(
String
str:
poa
.
getErrors
()){
System
.
out
.
println
(
str
);
md
.
update
(
str
.
getBytes
()
);
}
System
.
out
.
println
(
"Not proved "
+
poa
.
getNotProved
().
size
());
//
System.out.println("Not proved " +poa.getNotProved().size());
for
(
String
str:
poa
.
getNotProved
()){
System
.
out
.
println
(
str
);
md
.
update
(
str
.
getBytes
()
);
}
//dig = md.digest ();
//for (int i=0; i<dig.length; i++)
// if (expected[i] != dig[i]) {
// System.err.println ("\nCouldn't analyze ProVerif untyped output...\n");
// System.exit (-1);
// }
//System.out.println(": ok");
dig
=
md
.
digest
();
//System.out.print ("{");
//for (byte b: dig) {
// System.out.print (b);
// System.out.print (", ");
//}
//System.out.println ();
for
(
int
i
=
0
;
i
<
dig
.
length
;
i
++)
if
(
expectedUntyped
[
i
]
!=
dig
[
i
])
{
System
.
err
.
println
(
"\nCouldn't analyze ProVerif untyped output...\n"
);
System
.
exit
(-
1
);
}
System
.
out
.
println
(
": ok"
);
}
catch
(
IOException
|
NoSuchAlgorithmException
e
)
{
e
.
printStackTrace
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment