Minor fixes required during PR review

Small fixes. Signed-off-by: Flavio Castelli <[email protected]> Co-authored-by: Matthew James Briggs <[email protected]>
awslabs · Jan 26, 2022 · b6e4c0f · b6e4c0f
1 parent 5ad6f66
commit b6e4c0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/tough/src/schema/de.rs b/tough/src/schema/de.rs
@@ -87,6 +87,9 @@ mod tests {
         .is_err());
     }
 
+    /// Ensure that we can deserialize a root.json file that has hex-encoded ECDSA keys. This uses
+    /// sigstore's root.json file taken from here:
+    /// https://sigstore-tuf-root.storage.googleapis.com/2.root.json
     #[test]
     fn ecdsa_hex_encoded_keys() {
         assert!(serde_json::from_str::<Signed<Root>>(include_str!(

diff --git a/tough/src/schema/decoded.rs b/tough/src/schema/decoded.rs
@@ -139,11 +139,7 @@ pub struct EcdsaFlex {}
 impl Decode for EcdsaFlex {
     fn decode(s: &str) -> Result<Vec<u8>, Error> {
         if s.starts_with("-----BEGIN ") {
-            spki::decode(
-                spki::OID_EC_PUBLIC_KEY,
-                Some(spki::OID_EC_PARAM_SECP256R1),
-                s,
-            )
+            EcdsaPem::decode(s)
         } else {
             Hex::decode(s)
         }