schema: use pushdown-driven Veriform decoder

Updates the handwritten decoder fields to use the new pushdown
automaton-based `Decoder` API which landed in:
iqlusioninc/veriform#117

client/src/armistice.rs

@@ -1,7 +1,7 @@
 //! Armistice client
 
 use crate::error::Error;
-use armistice_schema::{Message, Request, Response};
+use armistice_schema::{veriform::Decoder, Message, Request, Response};
 
 #[cfg(feature = "usbarmory")]
 use crate::usbarmory;
@@ -27,6 +27,8 @@ impl Armistice {
 
         let mut buf = vec![0; self.usb.in_max_packet_size().into()];
         let response = self.usb.read(&mut buf)?;
-        Ok(Response::decode(response)?)
+
+        let mut decoder = Decoder::new();
+        Ok(Response::decode(&mut decoder, response)?)
     }
 }

core/src/root.rs

@@ -5,7 +5,7 @@
 //!
 //! <https://github.com/theupdateframework/specification/blob/master/tuf-spec.md#4-document-formats>
 
-use crate::{crypto::PublicKey, error::Error, schema::provision::Uuid};
+use crate::{crypto::PublicKey, error::Error, schema::Uuid};
 use heapless::Vec;
 
 /// Maximum number of keys allowed for root role
@@ -61,9 +61,6 @@ impl Config {
     /// Get a UUID which represents this root configuration
     pub fn uuid(&self) -> Uuid {
         // TODO(tarcieri): stub!
-        let mut uuid = Uuid::new();
-        uuid.push_str("00000000-0000-0000-0000-000000000000")
-            .unwrap();
-        uuid
+        Uuid::parse_str("00000000-0000-0000-0000-000000000000").unwrap()
     }
 }

core/tests/provision.rs

@@ -2,7 +2,7 @@
 
 use aes::{block_cipher_trait::BlockCipher, Aes128};
 use armistice_core::Vec;
-use armistice_schema::{provision, public_key::PublicKey};
+use armistice_schema::{provision, public_key::PublicKey, Uuid};
 
 type Armistice = armistice_core::Armistice<Aes128>;
 
@@ -42,6 +42,6 @@ fn provisioning_happy_path() {
     // TODO(tarcieri): stub!
     assert_eq!(
         response.provision().unwrap().uuid,
-        "00000000-0000-0000-0000-000000000000"
+        Uuid::parse_str("00000000-0000-0000-0000-000000000000").unwrap()
     );
 }

schema/Cargo.toml

@@ -13,7 +13,11 @@ keywords   = ["bls", "ed25519", "ecdsa", "hsm"]
 
 [dependencies]
 heapless = "0.5"
-veriform = { version = "0", default-features = false }
+veriform = { version = "0", default-features = false, features = ["builtins"] }
+
+[dev-dependencies]
+veriform = { version = "0", default-features = false, features = ["builtins", "log"] }
+env_logger = "0.7"
 
 [package.metadata.docs.rs]
 all-features = true

schema/src/lib.rs

@@ -11,4 +11,4 @@ pub mod request;
 pub mod response;
 
 pub use self::{public_key::PublicKey, request::Request, response::Response};
-pub use veriform::Message;
+pub use veriform::{self, builtins::Uuid, Message};