fix(rust/signed_doc): remove alg from top-level protected header

Author: saibatizoku

rust/signed_doc/examples/mk_signed_doc.rs

@@ -186,7 +186,6 @@ fn brotli_decompress_json(mut doc_bytes: &[u8]) -> anyhow::Result<serde_json::Va
 
 fn cose_protected_header() -> coset::Header {
     coset::HeaderBuilder::new()
-        .algorithm(coset::iana::Algorithm::EdDSA)
         .content_format(coset::iana::CoapContentFormat::Json)
         .text_value(
             CONTENT_ENCODING_KEY.to_string(),
@@ -269,7 +268,9 @@ fn load_public_key_from_file(pk_path: &PathBuf) -> anyhow::Result<ed25519_dalek:
 }
 
 fn add_signature_to_cose(cose: &mut coset::CoseSign, sk: &ed25519_dalek::SigningKey, kid: String) {
-    let protected_header = coset::HeaderBuilder::new().key_id(kid.into_bytes());
+    let protected_header = coset::HeaderBuilder::new()
+        .key_id(kid.into_bytes())
+        .algorithm(coset::iana::Algorithm::EdDSA);
     let mut signature = coset::CoseSignatureBuilder::new()
         .protected(protected_header.build())
         .build();

rust/signed_doc/src/lib.rs

@@ -175,44 +175,43 @@ impl CatalystSignedDocument {
     /// Return Document Type `UUIDv4`.
     #[must_use]
     pub fn doc_type(&self) -> uuid::Uuid {
-        self.inner.metadata.r#type
+        self.inner.metadata.doc_type()
     }
 
     /// Return Document ID `UUIDv7`.
     #[must_use]
     pub fn doc_id(&self) -> uuid::Uuid {
-        self.inner.metadata.id
+        self.inner.metadata.doc_id()
     }
 
     /// Return Document Version `UUIDv7`.
     #[must_use]
     pub fn doc_ver(&self) -> uuid::Uuid {
-        self.inner.metadata.ver
+        self.inner.metadata.doc_ver()
     }
 
     /// Return Last Document Reference `Option<DocumentRef>`.
     #[must_use]
     pub fn doc_ref(&self) -> Option<DocumentRef> {
-        self.inner.metadata.r#ref
+        self.inner.metadata.doc_ref()
     }
 
     /// Return Document Template `Option<DocumentRef>`.
     #[must_use]
     pub fn doc_template(&self) -> Option<DocumentRef> {
-        self.inner.metadata.template
+        self.inner.metadata.doc_template()
     }
 
     /// Return Document Reply `Option<DocumentRef>`.
     #[must_use]
     pub fn doc_reply(&self) -> Option<DocumentRef> {
-        self.inner.metadata.reply
+        self.inner.metadata.doc_reply()
     }
 }
 
 /// Generate the COSE protected header used by Catalyst Signed Document.
 fn cose_protected_header() -> coset::Header {
     coset::HeaderBuilder::new()
-        .algorithm(coset::iana::Algorithm::EdDSA)
         .content_format(coset::iana::CoapContentFormat::Json)
         .text_value(
             CONTENT_ENCODING_KEY.to_string(),
@@ -267,10 +266,6 @@ fn metadata_from_cose_protected_header(cose: &coset::CoseSign) -> (Metadata, Con
     let expected_header = cose_protected_header();
     let mut errors = Vec::new();
 
-    if cose.protected.header.alg != expected_header.alg {
-        errors.push("Invalid COSE document protected header `algorithm` field".to_string());
-    }
-
     if cose.protected.header.content_type != expected_header.content_type {
         errors.push("Invalid COSE document protected header `content-type` field".to_string());
     }