Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add TEEP extension, media types and registrations #3

Merged
merged 4 commits into from
Dec 13, 2022
Merged

add TEEP extension, media types and registrations #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f62cdd
extensibility: sketching initial thoughts
thomas-fossati Dec 12, 2022
b63133e
add extension section (+ reflow)
thomas-fossati Dec 12, 2022
e45a3f5
barebones veraison extension
thomas-fossati Dec 12, 2022
1bd5861
add TEEP extension, media types and registrations
thomas-fossati Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cddl/examples/ext-teep-json-1.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"iat": 1666529284,
"ear.appraisal-policy-id": "https://veraison.example/policy/1/60a0068d",
"ear.teep.claims": {
"ear.teep-claims": {
"nonce": "80FH7byS7VjfARIq0_KLqu6B9j-F79QtV6p",
"ueid": "AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAh",
"oemid": "Av8B",
Expand Down
4 changes: 2 additions & 2 deletions cddl/examples/ext-veraison-cbor-1.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
1002: h'6C696665626F61746D616E',
1003: "https://veraison.example/policy/1/60a0068d",
6: 1666529184,
64000: {
-70000: {
"eat-profile": "http://arm.com/psa/2.0.0",
"psa-client-id": 1,
"psa-security-lifecycle": 12288,
Expand All @@ -29,7 +29,7 @@
"psa-instance-id": "AQIDBAUGBwgJCgsMDQ4PEBESExQVFhcYGRobHB0eHyAh",
"psa-certification-reference": "1234567890123-12345"
},
64001: {
-70001: {
"psa-certified": {
"certificate-number": "1234567890123-12345",
"date-of-issue": "23/06/2022",
Expand Down
2 changes: 0 additions & 2 deletions cddl/teep-cbor-labels.cddl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
ear.teep.claims = 65000

; TODO

; vim: set tw=70 ts=2 et:
2 changes: 0 additions & 2 deletions cddl/teep-json-labels.cddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,3 @@ oemid-ieee = base64-url-text ; cddl(1)-unsupported: .size 4
oemid-random = base64-url-text ; cddl(1)-unsupported: .size 24

base64-url-text = tstr .regexp "[A-Za-z0-9_=-]+"

; vim: set tw=70 ts=2 et:
4 changes: 1 addition & 3 deletions cddl/teep.cddl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$$ear-extension //= (
ear.teep.claims => ear-teep-claims
ear.teep-claims => ear-teep-claims
)

ear-teep-claims = non-empty<{
Expand All @@ -10,5 +10,3 @@ ear-teep-claims = non-empty<{
? eat.hardware-version => eat.hardware-version-type
? eat.manifests => eat.manifests-type
}>

; vim: set tw=70 ts=2 et:
6 changes: 2 additions & 4 deletions cddl/veraison-cbor-labels.cddl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
ear.veraison.processed-evidence = 64000
ear.veraison.verifier-added-claims = 64001

; vim: set tw=70 ts=2 et:
ear.veraison.processed-evidence = -70000
ear.veraison.verifier-added-claims = -70001
7 changes: 4 additions & 3 deletions cddl/veraison-json-labels.cddl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ear.veraison.processed-evidence = "ear.veraison.processed-evidence"
ear.veraison.verifier-added-claims = "ear.veraison.verifier-added-claims"
ear.veraison.processed-evidence =
"ear.veraison.processed-evidence"

; vim: set tw=70 ts=2 et:
ear.veraison.verifier-added-claims =
"ear.veraison.verifier-added-claims"
8 changes: 4 additions & 4 deletions cddl/veraison.cddl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
$$ear-extension //= (
ear.veraison.processed-evidence => ear-veraison-processed-evidence
ear.veraison.processed-evidence =>
ear-veraison-processed-evidence
)

ear-veraison-processed-evidence = {
+ ear-label => any
}

$$ear-extension //= (
ear.veraison.verifier-added-claims => ear-veraison-verifier-added-claims
ear.veraison.verifier-added-claims =>
ear-veraison-verifier-added-claims
)

ear-veraison-verifier-added-claims = {
+ ear-label => any
}

; vim: set tw=70 ts=2 et:
Loading