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

Fix CDDL inconsistencies in attStmtType and compound format #2216

Merged
merged 4 commits into from
Dec 11, 2024
Merged

Fix CDDL inconsistencies in attStmtType and compound format #2216

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
804cece
Fix reference to $$attStmtType in definition of attestation statement…
emlun Nov 27, 2024
e6a998e
Formalize attStmtTemplate as more correct CDDL
emlun Nov 27, 2024
9b16167
Allow attStmt to be of array type
emlun Nov 27, 2024
8b29bec
Fix .within operator in nonCompountAttStmt
emlun Nov 27, 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
30 changes: 17 additions & 13 deletions index.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5736,7 +5736,7 @@ template:

- <strong>Syntax:</strong>
The syntax of an [=attestation statement=] produced in this format, defined using CDDL [[!RFC8610]] for the extension point
`$attStmtFormat` defined in [[#sctn-generating-an-attestation-object]].
`$$attStmtType` defined in [[#sctn-generating-an-attestation-object]].

- <dfn>Signing procedure</dfn>:
The [=signing procedure=] for computing an [=attestation statement=] in this [=attestation statement format|format=] given
Expand Down Expand Up @@ -5832,17 +5832,21 @@ the [=authenticator=] MUST:

```
attObj = {
authData: bytes,
$$attStmtType
}

attStmtTemplate = (
fmt: text,
attStmt: { * tstr => any } ; Map is filled in by each concrete attStmtType
)

; Every attestation statement format must have the above fields
attStmtTemplate .within $$attStmtType
authData: bytes,

; Each choice in $$attStmtType defines the fmt value and attStmt structure
$$attStmtType
} .within attStmtTemplate

attStmtTemplate = {
authData: bytes,
fmt: text,
attStmt: (
{ * tstr => any } ; Map is filled in by each concrete attStmtType
//
[ * any ] ; attStmt may also be an array
)
}
```

### Signature Formats for Packed Attestation, FIDO U2F Attestation, and Assertion Signatures ### {#sctn-signature-attestation-types}
Expand Down Expand Up @@ -6929,7 +6933,7 @@ The "compound" attestation statement format is used to pass multiple, self-conta
attStmt: [2* nonCompoundAttStmt]
)

nonCompoundAttStmt = { $$attStmtType } .within { fmt: text .ne "compound" }
nonCompoundAttStmt = { $$attStmtType } .within { fmt: text .ne "compound", * any => any }
```

: Signing procedure
Expand Down