Skip to content

Commit d2b9aa0

Browse files
thomas-fossatithomas-fossati
committed
verifier processing revamp
Signed-off-by: Thomas Fossati <thomas.fossati@linaro.org>
1 parent 4821086 commit d2b9aa0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3022
-896
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ endef # cddl_targets
2525
$(eval $(call cddl_targets,corim,$(CORIM_FRAGS)))
2626
$(eval $(call cddl_targets,comid,$(COMID_FRAGS)))
2727
$(eval $(call cddl_targets,cotl,$(COTL_FRAGS)))
28-
$(eval $(call cddl_targets,intrep,$(INTREP_FRAGS)))
28+
$(eval $(call cddl_targets,intrep-acs,$(INTREP_FRAGS)))
29+
$(eval $(call cddl_targets,intrep-rel,$(INTREP_FRAGS)))
2930

3031
cddl/concise-swid-tag.cddl: ; $(MAKE) -C cddl $(notdir $@)
3132

‎cddl/Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ include check.mk
77
include corim-frags.mk
88

99
check:: cbor-tags-unique
10-
check:: check-intrep check-intrep-examples
10+
check:: check-intrep-acs check-intrep-acs-examples
11+
check:: check-intrep-rel check-intrep-rel-examples
1112
check:: check-corim check-corim-examples
1213
check:: check-comid check-comid-examples
1314
check:: check-cotl check-cotl-examples
@@ -17,7 +18,8 @@ include measured-component.mk
1718
$(eval $(call cddl_check_template,comid,$(COMID_FRAGS),$(COMID_EXAMPLES),$(COMID_IMPORTS)))
1819
$(eval $(call cddl_check_template,cotl,$(COTL_FRAGS),$(COTL_EXAMPLES),$(COTL_IMPORTS)))
1920
$(eval $(call cddl_check_template,corim,$(CORIM_FRAGS),$(CORIM_EXAMPLES),$(CORIM_IMPORTS)))
20-
$(eval $(call cddl_check_template,intrep,$(INTREP_FRAGS),$(INTREP_EXAMPLES),$(INTREP_IMPORTS)))
21+
$(eval $(call cddl_check_template,intrep-acs,$(INTREP_ACS_FRAGS),$(INTREP_ACS_EXAMPLES),$(INTREP_ACS_IMPORTS)))
22+
$(eval $(call cddl_check_template,intrep-rel,$(INTREP_REL_FRAGS),$(INTREP_REL_EXAMPLES),$(INTREP_REL_IMPORTS)))
2123

2224
clean: ; rm -f $(CLEANFILES)
2325

‎cddl/corim-frags.mk‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,35 @@ CORIM_FRAGS += $(COMID_FRAGS)
9393

9494
CORIM_EXAMPLES := $(wildcard examples/corim-*.diag)
9595

96-
INTREP_FRAGS := intrep-start.cddl
9796
INTREP_FRAGS += intrep-acs.cddl
9897
INTREP_FRAGS += intrep-ae.cddl
9998
INTREP_FRAGS += intrep-ar.cddl
10099
INTREP_FRAGS += intrep-ars.cddl
101100
INTREP_FRAGS += intrep-ect.cddl
101+
INTREP_FRAGS += intrep-ect-evidence-addition.cddl
102+
INTREP_FRAGS += intrep-e-ect.cddl
102103
INTREP_FRAGS += intrep-d-ect.cddl
103104
INTREP_FRAGS += intrep-k-ect.cddl
105+
INTREP_FRAGS += intrep-ect-common.cddl
104106
INTREP_FRAGS += intrep-ev.cddl
107+
INTREP_FRAGS += intrep-evs.cddl
108+
INTREP_FRAGS += intrep-domain-item.cddl
105109
INTREP_FRAGS += intrep-domain-mem.cddl
106110
INTREP_FRAGS += intrep-domain-dep.cddl
107111
INTREP_FRAGS += intrep-policy.cddl
108112
INTREP_FRAGS += intrep-rv.cddl
113+
INTREP_FRAGS += intrep-ect-refval-condition.cddl
114+
INTREP_FRAGS += intrep-ect-refval-addition.cddl
115+
INTREP_FRAGS += intrep-ect-endval-condition.cddl
116+
INTREP_FRAGS += intrep-ect-endval-addition.cddl
117+
INTREP_FRAGS += intrep-ect-endval-selection.cddl
118+
INTREP_FRAGS += intrep-ect-domain-condition.cddl
119+
INTREP_FRAGS += intrep-ect-domain-addition.cddl
120+
INTREP_FRAGS += intrep-ect-key-condition.cddl
121+
INTREP_FRAGS += intrep-ect-key-addition.cddl
109122
INTREP_FRAGS += intrep-claims-map.cddl
110123
INTREP_FRAGS += intrep-key.cddl
124+
INTREP_FRAGS += stagingarea.cddl
111125
# deps
112126
INTREP_FRAGS += non-empty.cddl
113127
INTREP_FRAGS += environment-map.cddl
@@ -136,4 +150,12 @@ INTREP_FRAGS += domain-type.cddl
136150

137151
INTREP_IMPORTS += eatmc=measured-component
138152

139-
INTREP_EXAMPLES := $(wildcard examples/intrep-*.diag)
153+
INTREP_ACS_FRAGS := intrep-acs-start.cddl
154+
INTREP_ACS_FRAGS += $(INTREP_FRAGS)
155+
INTREP_ACS_IMPORTS += $(INTREP_IMPORTS)
156+
INTREP_ACS_EXAMPLES := $(wildcard examples/intrep-acs*.diag)
157+
158+
INTREP_REL_FRAGS := intrep-rel-start.cddl
159+
INTREP_REL_FRAGS += $(INTREP_FRAGS)
160+
INTREP_REL_IMPORTS += $(INTREP_IMPORTS)
161+
INTREP_REL_EXAMPLES := $(wildcard examples/intrep-rel*.diag)

‎cddl/examples/intrep-1.diag‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎cddl/examples/intrep-2.diag‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎cddl/examples/intrep-3.diag‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎cddl/examples/intrep-acs-1.diag‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/ ACS / [
2+
/ ECT / {
3+
"cmtype" : 2
4+
}
5+
]
6+

‎cddl/examples/intrep-acs-2.diag‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/ ACS / [
2+
/ ECT / {
3+
"environment" : {
4+
/ class / 0 : {
5+
/ class-id / 0 :
6+
/ tagged-uuid-type / 37( h'67b28b6c34cc40a19117ab5b05911e37' )
7+
}
8+
},
9+
"cmtype" : 1
10+
}
11+
]

‎cddl/examples/intrep-acs-3.diag‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/ ACS / [
2+
/ ECT / {
3+
"environment" : {
4+
/ class / 0 : {
5+
/ class-id / 0 :
6+
/ tagged-uuid-type / 37( h'67b28b6c34cc40a19117ab5b05911e37' )
7+
}
8+
},
9+
"key-list" : [
10+
556("base64_cert_path_X"),
11+
554("base64_key_Y"),
12+
]
13+
}
14+
]

‎cddl/examples/intrep-rel-ae-1.diag‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"addition":{
3+
"environment":{0: {0: 37(h'B36EBFB5F2BC5001777A3C1FDF895115'), 3: 311, 4: 891}},
4+
"element-list":[
5+
{
6+
"element-claims":{
7+
1:553(2177),
8+
2:[
9+
["appendiculated", "c2VjdGlvbmFsbHk"],
10+
[3590, "dW5hcmlzaW5n"]
11+
],
12+
3:{
13+
0:false,
14+
1:true,
15+
2:false,
16+
3:true,
17+
4:false,
18+
6:true,
19+
7:false,
20+
8:false,
21+
9:false
22+
},
23+
4:563([h'746572636574', h'70617479']),
24+
5:h'676962626564',
25+
7:h'6D35A67D',
26+
8:"garnetwork",
27+
15:-374
28+
}
29+
},
30+
{
31+
"element-claims":{
32+
1:552(4233),
33+
3:{1: true, 2: true, 5: true, 7: true},
34+
6:h'AC26D55882CE',
35+
7:h'D44763CF08FB46DB348B010126BBBAD9',
36+
8:"farcelike",
37+
11:"batterman"
38+
}
39+
},
40+
{
41+
"element-claims":{
42+
1:552(2424),
43+
2:[
44+
["pinked", "QWNhcmFwaXM"],
45+
[-22, h'736563746F7269616C'],
46+
[1430, h'7363616D6D6F6E696E']
47+
],
48+
6:h'AD83A476E89AFDF4',
49+
7:h'72D02C3EF79361C399C56F34D85E2F6D',
50+
9:h'01BD0A514A8EC246CD69A4FE60B5',
51+
10:h'CA2A07D16CBB8FFF6FFD10D977D57B19',
52+
11:"unproductively",
53+
13:[
54+
558({1: "assignor", 5: h'646F646779', 1217: "weaved"}),
55+
560(h'6C61726765627261696E6564'),
56+
562(h'726567726174696679'),
57+
558({
58+
1:1912,
59+
5:h'756E6C697370696E67',
60+
-504:"palatalism",
61+
4382:"undiffused"
62+
})
63+
],
64+
15:1080
65+
}
66+
}
67+
],
68+
"authority":[
69+
558({1: -104, 2070: "crig"}),
70+
561([4504, "QXNwaWRvc3Blcm1h"]),
71+
561(["setwall", h'706572696E657074756E69756D']),
72+
560(h'626C617374696E67')
73+
],
74+
"cmtype":2,
75+
"profile":111(h'42616972616D')
76+
}
77+
}

0 commit comments

Comments
 (0)
⚡