Merge pull request #74 from fortanix/ud/version-bump-list-keys-feature

Version bump in openpgp-dsm for list-keys feature removed unwrap from KeyMetadata impl
fortanix · Feb 21, 2023 · 69eb7ab · 69eb7ab
2 parents 6307b89 + 9fc87eb
commit 69eb7ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/openpgp-dsm/Cargo.toml b/openpgp-dsm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "openpgp-dsm"
-version = "1.1.0"
+version = "1.2.0"
 authors = ["zugzwang <francisco.vialprado@fortanix.com>"]
 edition = "2018"
 

diff --git a/openpgp-dsm/src/lib.rs b/openpgp-dsm/src/lib.rs
@@ -537,8 +537,9 @@ impl KeyMetadata {
                 match serde_json::from_str(&dict[DSM_LABEL_PGP]) {
                     Ok(key_md) => Ok(key_md),
                     Err(e) => {
-                        KeyMetadata::print_metadata_for_pre_0_3_0(&dict[DSM_LABEL_PGP]).unwrap();
-                        Err(anyhow::anyhow!("failed to read metadata: {:?}", e))
+                        KeyMetadata::print_metadata_for_pre_0_3_0(&dict[DSM_LABEL_PGP])
+                            .map_err(|e| anyhow::anyhow!("Failed to read metadata: {:?}", e))?;
+                        Err(anyhow::anyhow!("Failed to parse Sobject: {:?}", e))
 
                     }
                 }