Merge pull request #32 from ietf-rats-wg/small-edits

Small edits

Author: thomas-fossati

cddl/Makefile

@@ -3,10 +3,10 @@ SHELL := /bin/bash
 .DEFAULT_GOAL := check
 
 FRAGMENTS += start.cddl
-FRAGMENTS += trustworthiness-vector.cddl 
-FRAGMENTS += trustworthiness-claim.cddl 
-FRAGMENTS += trust-tier.cddl 
-FRAGMENTS += verifier-id.cddl 
+FRAGMENTS += trustworthiness-vector.cddl
+FRAGMENTS += trustworthiness-claim.cddl
+FRAGMENTS += trustworthiness-tier.cddl
+FRAGMENTS += verifier-id.cddl
 FRAGMENTS += non-empty.cddl
 FRAGMENTS += jc.cddl
 

cddl/start.cddl

@@ -1 +1,4 @@
-$.start.$ = trustworthiness-vector / trust-tier / verifier-id
+$.start.$ = trustworthiness-vector /
+            trustworthiness-tier /
+            verifier-id /
+            trustworthiness-claim

cddl/trust-tier.cddl

@@ -0,0 +1,9 @@
+trustworthiness-tier-none-label = JC<"none", 0>
+trustworthiness-tier-affirming-label = JC<"affirming", 2>
+trustworthiness-tier-warning-label = JC<"warning", 32>
+trustworthiness-tier-contraindicated-label = JC<"contraindicated", 96>
+
+trustworthiness-tier /= trustworthiness-tier-none-label
+trustworthiness-tier /= trustworthiness-tier-affirming-label
+trustworthiness-tier /= trustworthiness-tier-warning-label
+trustworthiness-tier /= trustworthiness-tier-contraindicated-label

cddl/trustworthiness-tier.cddl

@@ -660,16 +660,16 @@ A missing entry means that the verifier makes no claim about this specific appra
 
 As required by the `non-empty` macro, at least one entry MUST be present in the vector.
 
-## Trust Tiers {#sec-trusttiers}
+## Trustworthiness Tiers {#sec-trusttiers}
 
-The `trust-tier` type represents one of the equivalency classes in which the `trustworthiness-claim` space is partitioned.
+The `trustworthiness-tier` type represents one of the equivalency classes in which the `trustworthiness-claim` space is partitioned.
 
 See {{sec-enum-encoding}} for the details.
 
 The allowed values for the type are as follows:
 
 ~~~cddl
-{::include cddl/trust-tier.cddl}
+{::include cddl/trustworthiness-tier.cddl}
 ~~~
 {: #fig-cddl-ttiers title="Trustworthiness Tiers" }