Merge pull request #7 from veraison/json-friendly-tsm-report

fix: make tsm-report JSON-friendly
veraison · Oct 6, 2024 · b43d2ca · b43d2ca
2 parents b415b8b + 4712983
commit b43d2ca
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/docs/tsm-report.cddl b/docs/tsm-report.cddl
@@ -1,8 +1,15 @@
 tsm-report = {
-  ? "auxblob": bstr
-  "outblob": bstr
-  "provider": bstr
+  ? auxblob: binary-string
+  outblob: binary-string
+  provider: tstr
   ? service-report
 }
-service-report //= ("manifestblob": bstr, "service_provider": bstr)
-service-report //= ("service_provider": bstr)
+
+service-report = ((
+  manifestblob: binary-string
+  service_provider: tstr
+) // service_provider: tstr)
+
+binary-string = base64url-string .feature "json" / bstr .feature "cbor"
+
+base64url-string = tstr .b64u bstr