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

Jump to bottom

Revert endorsement and reference triple records to original #268

Merged
merged 24 commits into from
Sep 25, 2024
Merged

Revert endorsement and reference triple records to original #268

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b5e5e68
compatibility CDDL and examples
nedmsmith Sep 6, 2024
ad623f0
Reverting triples to allow multiple measurement-maps
nedmsmith Sep 11, 2024
c08f898
Update draft-ietf-rats-corim.md
nedmsmith Sep 11, 2024
36da9cf
Updated examples to reflect changes to reference and endorsement triples
nedmsmith Sep 11, 2024
59f79ad
Update draft-ietf-rats-corim.md
nedmsmith Sep 13, 2024
3ca0690
Update publish.yml
nedmsmith Sep 13, 2024
2e27344
Update ghpages.yml
nedmsmith Sep 13, 2024
eb98163
Merge branch 'tcg-compatible' of https://github.com/ietf-rats-wg/draf…
nedmsmith Sep 13, 2024
5956324
Update draft-ietf-rats-corim.md
nedmsmith Sep 16, 2024
457bf6e
Introduce `Mkey` extensibility aspect
yogeshbdeshpande Sep 18, 2024
b024de0
Update draft-ietf-rats-corim.md
yogeshbdeshpande Sep 18, 2024
6c6567d
Update draft-ietf-rats-corim.md
henkbirkholz Sep 18, 2024
e4dc42b
Update draft-ietf-rats-corim.md
henkbirkholz Sep 18, 2024
017ae53
Measurement Keys wording and ECT definition
nedmsmith Sep 18, 2024
f9684e3
Fixed Environment description
nedmsmith Sep 18, 2024
b45e340
Refined corroboration text
nedmsmith Sep 18, 2024
d1045e9
Merge branch 'main' into tcg-compatible
yogeshbdeshpande Sep 19, 2024
68b0499
ECT matching wording change
nedmsmith Sep 19, 2024
e321d70
Changed ECT description to match new cddl
nedmsmith Sep 19, 2024
59fd80d
Edits applied to reference and simple endorsement sections
nedmsmith Sep 20, 2024
dc204a2
Further Tidy up Namespace from the ECT
yogeshbdeshpande Sep 20, 2024
59694ab
LGTM
nedmsmith Sep 20, 2024
c2331f7
fix typo
nedmsmith Sep 20, 2024
7a01ca6
List formatting, issues and parens
nedmsmith Sep 20, 2024
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 .github/workflows/ghpages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
token: ${{ github.token }}

- name: "Archive Built Drafts"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
path: |
draft-*.html
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ jobs:
make: upload

- name: "Archive Submitted Drafts"
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
path: "draft-*-[0-9][0-9].xml"
2 changes: 1 addition & 1 deletion cddl/endorsed-triple-record.cddl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
endorsed-triple-record = [
environment-map
measurement-map
[ + measurement-map ]
]
24 changes: 13 additions & 11 deletions cddl/examples/comid-1.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,20 @@
/ comid.layer / 3 : 1
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.ver / 0 : {
/ comid.version / 0 : "1.0.0",
/ comid.version-scheme / 1 : 16384 / semver /
},
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.ver / 0 : {
/ comid.version / 0 : "1.0.0",
/ comid.version-scheme / 1 : 16384 / semver /
},
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
}
}
}
]
] ]
}
}
51 changes: 51 additions & 0 deletions cddl/examples/comid-1a.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/ concise-mid-tag / {
/ comid.tag-identity / 1 : {
/ comid.tag-id / 0 : h'3f06af63a93c11e4979700505690773f'
},
/ comid.entity / 2 : [ {
/ comid.entity-name / 0 : "ACME Inc.",
/ comid.reg-id / 1 : 32("https://acme.example"),
/ comid.role / 2 : [ 0 ] / tag-creator /
} ],
/ comid.triples / 4 : {
/ comid.reference-triples / 0 : [ [
/ environment-map / {
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-uuid-type / 37(
h'67b28b6c34cc40a19117ab5b05911e37'
),
/ comid.vendor / 1 : "ACME Inc.",
/ comid.model / 2 : "ACME RoadRunner",
/ comid.layer / 3 : 1
}
},
[
/ measurement-map A / {
/ comid.mval / 1 : {
/ comid.ver / 0 : {
/ comid.version / 0 : "1.0.0",
/ comid.version-scheme / 1 : 16384 / semver /
},
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
}
},
/ measurement-map B / {
/ comid.mval / 1 : {
/ comid.ver / 0 : {
/ comid.version / 0 : "2.0.0",
/ comid.version-scheme / 1 : 16384 / semver /
},
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'FFaa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
}
}
]
] ]
}
}
76 changes: 8 additions & 68 deletions cddl/examples/comid-2.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,73 +8,6 @@
/ comid.role / 2 : [ 0 ] / tag-creator /
} ],
/ comid.triples / 4 : {
/ comid.reference-triples / 0 : [
[
/ environment-map / {
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-uuid-type / 37(
h'67b28b6c34cc40a19117ab5b05911e37'
),
/ comid.vendor / 1 : "ACME Inc.",
/ comid.model / 2 : "ACME RoadRunner Firmware",
/ comid.layer / 3 : 1
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
}
}
],
[
/ environment-map / {
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-uuid-type / 37(
h'a71b3e388d454a0581f352e58c832c5c'
),
/ comid.vendor / 1 : "WYLIE Inc.",
/ comid.model / 2 : "WYLIE Coyote Trusted OS",
/ comid.layer / 3 : 2,
/ comid.index / 4 : 0
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
] ]
}
}
],
[
/ environment-map / {
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-uuid-type / 37(
h'a71b3e388d454a0581f352e58c832c5c'
),
/ comid.vendor / 1 : "WYLIE Inc.",
/ comid.model / 2 : "WYLIE Coyote Trusted OS",
/ comid.layer / 3 : 2,
/ comid.index / 4 : 1
}
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
] ]
}
}
]
],
/ comid.endorsed-triples / 1 : [ [
/ environment-map / {
/ comid.class / 0 : {
Expand All @@ -87,11 +20,18 @@
/ comid.layer / 3 : 0
}
},
/ measurement-map / {
[
/ measurement-map A / {
/ comid.mval / 1 : {
/ comid.svn / 1 : 552(1)
}
},
/ measurement-map B / {
/ comid.mval / 1 : {
/ comid.svn / 1 : 552(2)
}
}
]
] ]
}
}
105 changes: 105 additions & 0 deletions cddl/examples/comid-2b.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
/ concise-mid-tag / {
/ comid.tag-identity / 1 : {
/ comid.tag-id / 0 : h'3f06af63a93c11e4979700505690773f'
},
/ comid.entity / 2 : [ {
/ comid.entity-name / 0 : "ACME Inc.",
/ comid.reg-id / 1 : 32("https://acme.example"),
/ comid.role / 2 : [ 0 ] / tag-creator /
} ],
/ comid.triples / 4 : {
/ comid.reference-triples / 0 : [
[
/ environment-map / {
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-uuid-type / 37(
h'67b28b6c34cc40a19117ab5b05911e37'
),
/ comid.vendor / 1 : "ACME Inc.",
/ comid.model / 2 : "ACME RoadRunner Firmware",
/ comid.layer / 3 : 1
}
},
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
}
}
]
],
[
/ environment-map / {
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-uuid-type / 37(
h'a71b3e388d454a0581f352e58c832c5c'
),
/ comid.vendor / 1 : "WYLIE Inc.",
/ comid.model / 2 : "WYLIE Coyote Trusted OS",
/ comid.layer / 3 : 2,
/ comid.index / 4 : 0
}
},
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
] ]
}
}
]
],
[
/ environment-map / {
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-uuid-type / 37(
h'a71b3e388d454a0581f352e58c832c5c'
),
/ comid.vendor / 1 : "WYLIE Inc.",
/ comid.model / 2 : "WYLIE Coyote Trusted OS",
/ comid.layer / 3 : 2,
/ comid.index / 4 : 1
}
},
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'bb71198ed60a95dc3c619e555c2c0b8d7564a38031b034a195892591c65365b0'
] ]
}
}
]
]
],
/ comid.endorsed-triples / 1 : [ [
/ environment-map / {
/ comid.class / 0 : {
/ comid.class-id / 0 :
/ tagged-uuid-type / 37(
h'67b28b6c34cc40a19117ab5b05911e37'
),
/ comid.vendor / 1 : "ACME Inc.",
/ comid.model / 2 : "ACME Root of Trust",
/ comid.layer / 3 : 0
}
},
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.svn / 1 : 552(1)
}
}
]
] ]
}
}
16 changes: 9 additions & 7 deletions cddl/examples/comid-3.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@
/ comid.model / 2 : "ACME RoadRunner Firmware"
}
},
/ measurement-map / {
/ comid.mkey / 0: 700,
/ comid.mval / 1 : {
/ comid.digests / 2 : [[
/ hash-alg-id / 6, / sha-256-32 /
/ hash-value / h'ABCDEF00' ]]
[
/ measurement-map / {
/ comid.mkey / 0: 700,
/ comid.mval / 1 : {
/ comid.digests / 2 : [[
/ hash-alg-id / 6, / sha-256-32 /
/ hash-value / h'ABCDEF00' ]]
}
}
}
]
]
]
}
Expand Down
18 changes: 10 additions & 8 deletions cddl/examples/comid-4.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@
/ layer / 3 : 1
}
},
/ measurement-map / {
/ mval / 1 : {
/ cryptokeys / 13 : [
/ tagged-pkix-base64-key-type / 554("base64_key_ACME_MAX"),
/ tagged-pkix-base64-cert-type / 555("base64_cert_ACME_MAX"),
/ tagged-pkix-base64-cert-path-type / 556("base64_cert_path_ACME_MAX")
]
[
/ measurement-map / {
/ mval / 1 : {
/ cryptokeys / 13 : [
/ tagged-pkix-base64-key-type / 554("base64_key_ACME_MAX"),
/ tagged-pkix-base64-cert-type / 555("base64_cert_ACME_MAX"),
/ tagged-pkix-base64-cert-path-type / 556("base64_cert_path_ACME_MAX")
]
}
}
}
]
]
]
}
Expand Down
24 changes: 13 additions & 11 deletions cddl/examples/comid-6.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,20 @@
/ environment-map / {
/ comid.instance / 1 : / tagged-pkix-base64-key-type / 554("base64_key_X")
},
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.ver / 0 : {
/ comid.version / 0 : "1.0.0",
/ comid.version-scheme / 1 : 16384 / semver /
},
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
[
/ measurement-map / {
/ comid.mval / 1 : {
/ comid.ver / 0 : {
/ comid.version / 0 : "1.0.0",
/ comid.version-scheme / 1 : 16384 / semver /
},
/ comid.digests / 2 : [ [
/ hash-alg-id / 1, / sha256 /
/ hash-value / h'44aa336af4cb14a879432e53dd6571c7fa9bccafb75f488259262d6ea3a4d91b'
] ]
}
}
}
]
] ]
}
}
Loading
Loading