Migrate to coset and ciborium

.github/workflows/ci.yaml

@@ -18,6 +18,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: setup Rust
+        uses: dtolnay/rust-toolchain@stable
+        if: ${{ github.event.act }}
+        with:
+          toolchain: stable
+          components: rustfmt, clippy
+
       - name: Build
         run: cargo build --all-targets
 

.github/workflows/event.json

@@ -0,0 +1,3 @@
+{
+  "act": true
+}

Cargo.toml

@@ -17,8 +17,8 @@ p256 = { version = "0.13.0", features = ["serde", "ecdh"] }
 p384 = { version = "0.13.0", features = ["serde", "ecdh"] }
 rand = { version = "0.8.5", features = ["getrandom"] }
 serde = { version = "1.0", features = ["derive"] }
-serde_cbor = { version = "0.11.2", features = ["tags"] }
 serde_json = "1.0"
+serde_bytes = "0.11.0"
 sha2 = "0.10.6"
 thiserror = "1.0"
 elliptic-curve = "0.13.1"
@@ -46,9 +46,9 @@ clap-stdin = "0.2.1"
 strum = "0.24"
 strum_macros = "0.24"
 
-[dependencies.cose-rs]
-git = "https://github.com/spruceid/cose-rs"
-rev = "4104505"
+coset = "0.3.8"
+ciborium = "0.2.2"
+digest = "0.10.7"
 
 [dev-dependencies]
 hex = "0.4.3"

README.md

@@ -131,3 +131,4 @@ stateDiagram
 
 You can see the full example in [simulated_device_and_reader](tests/simulated_device_and_reader.rs) and a version that
 uses `State` pattern, `Arc` and `Mutex` [simulated_device_and_reader](tests/simulated_device_and_reader_state.rs).
+

macros/src/to_cbor.rs

@@ -86,7 +86,7 @@ fn named_fields(isomdl_path: Ident, ident: Ident, input: FieldsNamed) -> TokenSt
 
     let output = quote! {
         mod #mod_name {
-            use serde_cbor::Value;
+            use ciborium::Value;
             use super::*;
             use #isomdl_path::definitions::traits::{ToCbor, ToNamespaceMap};
             impl ToNamespaceMap for #ident {
@@ -102,7 +102,7 @@ fn named_fields(isomdl_path: Ident, ident: Ident, input: FieldsNamed) -> TokenSt
                 fn to_cbor(self) -> Value {
                     let map = self.to_ns_map()
                         .into_iter()
-                        .map(|(k, v)| (Value::Text(k), v))
+                        .map(|(k, v)| (Value::Text(k), v.try_into().unwrap()))
                         .collect();
                     Value::Map(map)
                 }
@@ -140,9 +140,8 @@ fn unnamed_fields(isomdl_path: Ident, ident: Ident, mut input: FieldsUnnamed) ->
         mod #mod_name {
             use super::*;
             use #isomdl_path::definitions::traits::{ToCbor, ToCborError};
-            use serde_cbor::Value;
             impl ToCbor for #ident {
-                fn to_cbor(self) -> Value {
+                fn to_cbor(self) -> ciborium::Value {
                     <#field_type as ToCbor>::to_cbor(self)
                 }
             }

src/cbor.rs

@@ -0,0 +1,67 @@
+use std::io::Cursor;
+
+use ciborium::Value;
+use coset::{cbor, CoseError};
+use serde::{de, Serialize};
+use std::error::Error;
+use std::fmt;
+
+pub fn to_vec<T>(value: &T) -> Result<Vec<u8>, CborError>
+where
+    T: serde::Serialize,
+{
+    let mut buf = Vec::new();
+    ciborium::into_writer(value, &mut buf).map_err(|_| CborError(CoseError::EncodeFailed))?;
+    Ok(buf)
+}
+
+pub fn from_slice<T>(slice: &[u8]) -> Result<T, CborError>
+where
+    T: de::DeserializeOwned,
+{
+    ciborium::from_reader(Cursor::new(&slice)).map_err(|e| {
+        CborError(CoseError::DecodeFailed(ciborium::de::Error::Semantic(
+            None,
+            e.to_string(),
+        )))
+    })
+}
+
+/// Convert a `ciborium::Value` into a type `T`
+#[allow(clippy::needless_pass_by_value)]
+pub fn from_value<T>(value: Value) -> Result<T, CoseError>
+where
+    T: de::DeserializeOwned,
+{
+    Value::deserialized(&value).map_err(|_| {
+        CoseError::DecodeFailed(cbor::de::Error::Semantic(
+            None,
+            "cannot deserialize".to_string(),
+        ))
+    })
+}
+
+pub fn into_value<S>(v: S) -> Result<Value, CoseError>
+where
+    S: Serialize,
+{
+    Value::serialized(&v).map_err(|_| CoseError::EncodeFailed)
+}
+
+// Wrapper struct to implement Error for CoseError
+#[derive(Debug)]
+pub struct CborError(pub CoseError);
+
+impl From<CoseError> for CborError {
+    fn from(err: CoseError) -> CborError {
+        CborError(err)
+    }
+}
+
+impl fmt::Display for CborError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}", self.0)
+    }
+}
+
+impl Error for CborError {}

src/cose.rs

@@ -0,0 +1,127 @@
+use std::borrow::{Borrow, BorrowMut};
+use std::ops::{Deref, DerefMut};
+
+use coset::{iana, AsCborValue, TaggedCborSerializable};
+
+use crate::cose::serialized_as_cbor_value::SerializedAsCborValue;
+
+pub mod mac0;
+mod serialized_as_cbor_value;
+pub mod sign1;
+
+/// Trait to represent the signature algorithm of a signer or verifier.
+pub trait SignatureAlgorithm {
+    fn algorithm(&self) -> iana::Algorithm;
+}
+
+#[derive(Debug, Clone)]
+pub struct MaybeTagged<T>
+where
+    T: AsCborValue + TaggedCborSerializable + Clone,
+{
+    pub tagged: bool,
+    pub inner: T,
+}
+
+impl<T> MaybeTagged<T>
+where
+    T: AsCborValue + TaggedCborSerializable + Clone,
+{
+    pub fn new(tagged: bool, inner: T) -> Self {
+        Self { tagged, inner }
+    }
+
+    /// If we are serialized as tagged.
+    pub fn is_tagged(&self) -> bool {
+        self.tagged
+    }
+
+    /// Set serialization to tagged.
+    pub fn set_tagged(&mut self) {
+        self.tagged = true;
+    }
+}
+
+impl<T> Deref for MaybeTagged<T>
+where
+    T: AsCborValue + TaggedCborSerializable + Clone,
+{
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl<T> DerefMut for MaybeTagged<T>
+where
+    T: AsCborValue + TaggedCborSerializable + Clone,
+{
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.inner
+    }
+}
+
+impl<T> Borrow<T> for MaybeTagged<T>
+where
+    T: AsCborValue + TaggedCborSerializable + Clone,
+{
+    fn borrow(&self) -> &T {
+        &self.inner
+    }
+}
+
+impl<T> BorrowMut<T> for MaybeTagged<T>
+where
+    T: AsCborValue + TaggedCborSerializable + Clone,
+{
+    fn borrow_mut(&mut self) -> &mut T {
+        &mut self.inner
+    }
+}
+
+impl<T> AsRef<T> for MaybeTagged<T>
+where
+    T: AsCborValue + TaggedCborSerializable + Clone,
+{
+    fn as_ref(&self) -> &T {
+        &self.inner
+    }
+}
+
+/// Serialize manually using `ciborium::tag::Captured`, putting the tag if
+/// necessary.
+impl<T> serde::Serialize for MaybeTagged<T>
+where
+    T: AsCborValue + TaggedCborSerializable + Clone,
+{
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let tag = if self.tagged { Some(T::TAG) } else { None };
+
+        ciborium::tag::Captured(tag, SerializedAsCborValue(&self.inner)).serialize(serializer)
+    }
+}
+
+/// Deserialize manually using `ciborium::tag::Captured`, checking the tag.
+impl<'de, T> serde::Deserialize<'de> for MaybeTagged<T>
+where
+    T: AsCborValue + TaggedCborSerializable + Clone,
+{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let ciborium::tag::Captured(tag, SerializedAsCborValue(inner)) =
+            ciborium::tag::Captured::deserialize(deserializer)?;
+        let tagged = match tag {
+            Some(tag) if tag == T::TAG => true,
+            Some(_) => return Err(serde::de::Error::custom("unexpected tag")),
+            None => false,
+        };
+
+        Ok(Self { tagged, inner })
+    }
+}