[opentitantool] Eliminate use of min_specialization

Update serde_annotate to 0.0.12 and change all uses of `dyn Annotate` to `dyn erased_serde::Serialize`. Signed-off-by: Chris Frantz <cfrantz@google.com>
lowRISC · Jan 23, 2025 · 46ddf12 · 46ddf12
1 parent ddf9115
commit 46ddf12
Show file tree

Hide file tree

Showing 77 changed files with 185 additions and 240 deletions.
diff --git a/sw/host/hsmtool/BUILD b/sw/host/hsmtool/BUILD
@@ -75,6 +75,7 @@ rust_library(
         "@crate_index//:der",
         "@crate_index//:directories",
         "@crate_index//:ecdsa",
+        "@crate_index//:erased-serde",
         "@crate_index//:hex",
         "@crate_index//:indexmap",
         "@crate_index//:log",

diff --git a/sw/host/hsmtool/src/commands/ecdsa/export.rs b/sw/host/hsmtool/src/commands/ecdsa/export.rs
@@ -7,7 +7,6 @@ use cryptoki::object::{Attribute, ObjectHandle};
 use cryptoki::session::Session;
 use p256::ecdsa::{SigningKey, VerifyingKey};
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::path::PathBuf;
 
@@ -74,7 +73,7 @@ impl Dispatch for Export {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let mut attrs = helper::search_spec(self.id.as_deref(), self.label.as_deref())?;
         attrs.push(Attribute::KeyType(KeyType::Ec.try_into()?));

diff --git a/sw/host/hsmtool/src/commands/ecdsa/generate.rs b/sw/host/hsmtool/src/commands/ecdsa/generate.rs
@@ -8,7 +8,6 @@ use cryptoki::session::Session;
 use p256::elliptic_curve::pkcs8;
 use p256::elliptic_curve::pkcs8::der::Encode;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::str::FromStr;
 
@@ -64,7 +63,7 @@ impl Dispatch for Generate {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         helper::no_object_exists(session, self.id.as_deref(), self.label.as_deref())?;
         let id = AttrData::Str(self.id.as_ref().cloned().unwrap_or_else(helper::random_id));

diff --git a/sw/host/hsmtool/src/commands/ecdsa/import.rs b/sw/host/hsmtool/src/commands/ecdsa/import.rs
@@ -6,7 +6,6 @@ use anyhow::{bail, Context, Result};
 use cryptoki::object::Attribute;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -76,7 +75,7 @@ impl Dispatch for Import {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         helper::no_object_exists(session, self.id.as_deref(), self.label.as_deref())?;
         let mut public_attrs =

diff --git a/sw/host/hsmtool/src/commands/ecdsa/mod.rs b/sw/host/hsmtool/src/commands/ecdsa/mod.rs
@@ -5,7 +5,6 @@
 use anyhow::Result;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 
 use crate::commands::Dispatch;
@@ -33,7 +32,7 @@ impl Dispatch for Ecdsa {
         context: &dyn Any,
         hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         match self {
             Ecdsa::Generate(x) => x.run(context, hsm, session),
             Ecdsa::Export(x) => x.run(context, hsm, session),

diff --git a/sw/host/hsmtool/src/commands/ecdsa/sign.rs b/sw/host/hsmtool/src/commands/ecdsa/sign.rs
@@ -6,7 +6,6 @@ use anyhow::{anyhow, Result};
 use cryptoki::object::Attribute;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::ops::Range;
 use std::path::PathBuf;
@@ -44,7 +43,7 @@ impl Dispatch for Sign {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let mut attrs = helper::search_spec(self.id.as_deref(), self.label.as_deref())?;
         attrs.push(Attribute::KeyType(KeyType::Ec.try_into()?));

diff --git a/sw/host/hsmtool/src/commands/ecdsa/verify.rs b/sw/host/hsmtool/src/commands/ecdsa/verify.rs
@@ -6,7 +6,6 @@ use anyhow::{anyhow, Result};
 use cryptoki::object::Attribute;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::ops::Range;
 use std::path::PathBuf;
@@ -44,7 +43,7 @@ impl Dispatch for Verify {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let mut attrs = helper::search_spec(self.id.as_deref(), self.label.as_deref())?;
         attrs.push(Attribute::KeyType(KeyType::Ec.try_into()?));

diff --git a/sw/host/hsmtool/src/commands/exec.rs b/sw/host/hsmtool/src/commands/exec.rs
@@ -5,7 +5,7 @@
 use anyhow::Result;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::{Annotate, Document};
+use serde_annotate::Document;
 use std::any::Any;
 use std::path::PathBuf;
 use thiserror::Error;
@@ -18,10 +18,10 @@ pub struct Exec {
     file: PathBuf,
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Serialize)]
 pub struct ExecResult {
     pub command: String,
-    pub result: Box<dyn Annotate>,
+    pub result: Box<dyn erased_serde::Serialize>,
 }
 
 #[derive(Debug, Error)]
@@ -38,7 +38,7 @@ impl Dispatch for Exec {
         context: &dyn Any,
         hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let commands = std::fs::read_to_string(&self.file)?;
         let commands = serde_annotate::from_str::<Vec<Box<dyn Dispatch>>>(&commands)?;
 

diff --git a/sw/host/hsmtool/src/commands/mod.rs b/sw/host/hsmtool/src/commands/mod.rs
@@ -26,7 +26,7 @@ pub trait Dispatch {
         context: &dyn Any,
         hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>>;
+    ) -> Result<Box<dyn erased_serde::Serialize>>;
 
     fn leaf(&self) -> &dyn Dispatch
     where
@@ -58,7 +58,7 @@ impl Dispatch for Commands {
         context: &dyn Any,
         hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         match self {
             Commands::Ecdsa(x) => x.run(context, hsm, session),
             Commands::Exec(x) => x.run(context, hsm, session),
@@ -122,7 +122,7 @@ impl Default for BasicResult {
 }
 
 impl BasicResult {
-    pub fn from_error(e: &anyhow::Error) -> Box<dyn Annotate> {
+    pub fn from_error(e: &anyhow::Error) -> Box<dyn erased_serde::Serialize> {
         Box::new(BasicResult {
             success: false,
             id: AttrData::None,
@@ -145,7 +145,7 @@ pub fn print_result(
     format: Format,
     color: Option<bool>,
     quiet: bool,
-    result: Result<Box<dyn Annotate>>,
+    result: Result<Box<dyn erased_serde::Serialize>>,
 ) -> Result<()> {
     let (doc, result) = match result {
         Ok(value) => {

diff --git a/sw/host/hsmtool/src/commands/object/destroy.rs b/sw/host/hsmtool/src/commands/object/destroy.rs
@@ -5,7 +5,6 @@
 use anyhow::Result;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 
 use crate::commands::{BasicResult, Dispatch};
@@ -28,7 +27,7 @@ impl Dispatch for Destroy {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let attr = helper::search_spec(self.id.as_deref(), self.label.as_deref())?;
         let objects = session.find_objects(&attr)?;

diff --git a/sw/host/hsmtool/src/commands/object/list.rs b/sw/host/hsmtool/src/commands/object/list.rs
@@ -5,7 +5,6 @@
 use anyhow::Result;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::str::FromStr;
 
@@ -38,7 +37,7 @@ impl Dispatch for List {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let search = self
             .search

diff --git a/sw/host/hsmtool/src/commands/object/mod.rs b/sw/host/hsmtool/src/commands/object/mod.rs
@@ -5,7 +5,6 @@
 use anyhow::Result;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 
 use crate::commands::Dispatch;
@@ -35,7 +34,7 @@ impl Dispatch for Object {
         context: &dyn Any,
         hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         match self {
             Object::Destroy(x) => x.run(context, hsm, session),
             Object::List(x) => x.run(context, hsm, session),

diff --git a/sw/host/hsmtool/src/commands/object/read.rs b/sw/host/hsmtool/src/commands/object/read.rs
@@ -5,7 +5,6 @@
 use anyhow::Result;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::path::PathBuf;
 
@@ -35,7 +34,7 @@ impl Dispatch for Read {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let attr = helper::search_spec_ex(
             self.id.as_deref(),

diff --git a/sw/host/hsmtool/src/commands/object/show.rs b/sw/host/hsmtool/src/commands/object/show.rs
@@ -5,7 +5,6 @@
 use anyhow::Result;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::collections::HashSet;
 
@@ -53,7 +52,7 @@ impl Dispatch for Show {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let attr = helper::search_spec(self.id.as_deref(), self.label.as_deref())?;
         let objects = session.find_objects(&attr)?;

diff --git a/sw/host/hsmtool/src/commands/object/update.rs b/sw/host/hsmtool/src/commands/object/update.rs
@@ -5,7 +5,6 @@
 use anyhow::{bail, Result};
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 
 use crate::commands::Dispatch;
@@ -31,7 +30,7 @@ impl Dispatch for Update {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let attr = helper::search_spec(self.id.as_deref(), self.label.as_deref())?;
         let objects = session.find_objects(&attr)?;

diff --git a/sw/host/hsmtool/src/commands/object/write.rs b/sw/host/hsmtool/src/commands/object/write.rs
@@ -5,7 +5,6 @@
 use anyhow::Result;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::path::PathBuf;
 
@@ -37,7 +36,7 @@ impl Dispatch for Write {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
 
         let mut attr = AttributeMap::default();

diff --git a/sw/host/hsmtool/src/commands/rsa/decrypt.rs b/sw/host/hsmtool/src/commands/rsa/decrypt.rs
@@ -7,7 +7,6 @@ use cryptoki::mechanism::Mechanism;
 use cryptoki::object::Attribute;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::path::PathBuf;
 
@@ -35,7 +34,7 @@ impl Dispatch for Decrypt {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let mut attrs = helper::search_spec(self.id.as_deref(), self.label.as_deref())?;
         attrs.push(Attribute::KeyType(KeyType::Rsa.try_into()?));

diff --git a/sw/host/hsmtool/src/commands/rsa/encrypt.rs b/sw/host/hsmtool/src/commands/rsa/encrypt.rs
@@ -7,7 +7,6 @@ use cryptoki::mechanism::Mechanism;
 use cryptoki::object::Attribute;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::path::PathBuf;
 
@@ -35,7 +34,7 @@ impl Dispatch for Encrypt {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let mut attrs = helper::search_spec(self.id.as_deref(), self.label.as_deref())?;
         attrs.push(Attribute::KeyType(KeyType::Rsa.try_into()?));

diff --git a/sw/host/hsmtool/src/commands/rsa/export.rs b/sw/host/hsmtool/src/commands/rsa/export.rs
@@ -7,7 +7,6 @@ use cryptoki::object::{Attribute, ObjectHandle};
 use cryptoki::session::Session;
 use rsa::{RsaPrivateKey, RsaPublicKey};
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::path::PathBuf;
 
@@ -74,7 +73,7 @@ impl Dispatch for Export {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         let mut attrs = helper::search_spec(self.id.as_deref(), self.label.as_deref())?;
         attrs.push(Attribute::KeyType(KeyType::Rsa.try_into()?));

diff --git a/sw/host/hsmtool/src/commands/rsa/generate.rs b/sw/host/hsmtool/src/commands/rsa/generate.rs
@@ -6,7 +6,6 @@ use anyhow::Result;
 use cryptoki::mechanism::Mechanism;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::str::FromStr;
 
@@ -65,7 +64,7 @@ impl Dispatch for Generate {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         helper::no_object_exists(session, self.id.as_deref(), self.label.as_deref())?;
         let id = AttrData::Str(self.id.as_ref().cloned().unwrap_or_else(helper::random_id));

diff --git a/sw/host/hsmtool/src/commands/rsa/import.rs b/sw/host/hsmtool/src/commands/rsa/import.rs
@@ -6,7 +6,6 @@ use anyhow::{bail, Context, Result};
 use cryptoki::object::Attribute;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -78,7 +77,7 @@ impl Dispatch for Import {
         _context: &dyn Any,
         _hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         let session = session.ok_or(HsmError::SessionRequired)?;
         helper::no_object_exists(session, self.id.as_deref(), self.label.as_deref())?;
         let mut public_attrs =

diff --git a/sw/host/hsmtool/src/commands/rsa/mod.rs b/sw/host/hsmtool/src/commands/rsa/mod.rs
@@ -5,7 +5,6 @@
 use anyhow::Result;
 use cryptoki::session::Session;
 use serde::{Deserialize, Serialize};
-use serde_annotate::Annotate;
 use std::any::Any;
 
 use crate::commands::Dispatch;
@@ -37,7 +36,7 @@ impl Dispatch for Rsa {
         context: &dyn Any,
         hsm: &Module,
         session: Option<&Session>,
-    ) -> Result<Box<dyn Annotate>> {
+    ) -> Result<Box<dyn erased_serde::Serialize>> {
         match self {
             Rsa::Decrypt(x) => x.run(context, hsm, session),
             Rsa::Encrypt(x) => x.run(context, hsm, session),