examples & projects: simplify proto crate

- truncate uuid.txt and remove build.rs
- use num_enum for conversion between enum and u32

Signed-off-by: Zehui Chen <[email protected]>
Reviewed-by: Yuan Zhuang <[email protected]>

Author: ivila

examples/acipher-rs/proto/Cargo.toml

@@ -25,6 +25,4 @@ description = "Data structures and functions shared by host and TA."
 edition = "2018"
 
 [dependencies]
-
-[build_dependencies]
-uuid = { version = "1.6.1", default-features = false }
+num_enum = { version = "0.7.3", default-features = false }

examples/acipher-rs/proto/build.rs

@@ -16,26 +16,20 @@
 // under the License.
 
 #![no_std]
+use num_enum::{FromPrimitive, IntoPrimitive};
 
+#[derive(FromPrimitive, IntoPrimitive)]
+#[repr(u32)]
 pub enum Command {
     GenKey,
     GetSize,
     Encrypt,
     Decrypt,
+    #[default]
     Unknown,
 }
 
-impl From<u32> for Command {
-    #[inline]
-    fn from(value: u32) -> Command {
-        match value {
-            0 => Command::GenKey,
-            1 => Command::GetSize,
-            2 => Command::Encrypt, 
-            3 => Command::Decrypt,
-            _ => Command::Unknown,
-        }
-    }
-}
-
-pub const UUID: &str = &include_str!(concat!(env!("OUT_DIR"), "/uuid.txt"));
+// If Uuid::parse_str() returns an InvalidLength error, there may be an extra
+// newline in your uuid.txt file. You can remove it by running 
+// `truncate -s 36 uuid.txt`.
+pub const UUID: &str = &include_str!("../../uuid.txt");

examples/acipher-rs/proto/src/lib.rs

@@ -1 +1 @@
-057f4b66-bdab-11eb-96cf-33d6e41cc849
+057f4b66-bdab-11eb-96cf-33d6e41cc849

examples/acipher-rs/uuid.txt

@@ -25,6 +25,4 @@ description = "Data structures and functions shared by host and TA."
 edition = "2018"
 
 [dependencies]
-
-[build_dependencies]
-uuid = { version = "1.6.1", default-features = false }
+num_enum = { version = "0.7.3", default-features = false }

examples/aes-rs/proto/Cargo.toml

@@ -16,79 +16,48 @@
 // under the License.
 
 #![no_std]
+use num_enum::{FromPrimitive, IntoPrimitive};
 
+#[derive(FromPrimitive, IntoPrimitive)]
+#[repr(u32)]
 pub enum Command {
     Prepare,
     SetKey,
     SetIV,
     Cipher,
+    #[default]
     Unknown,
 }
 
-impl From<u32> for Command {
-    #[inline]
-    fn from(value: u32) -> Command {
-        match value {
-            0 => Command::Prepare,
-            1 => Command::SetKey,
-            2 => Command::SetIV,
-            3 => Command::Cipher,
-            _ => Command::Unknown,
-        }
-    }
-}
-
+#[derive(FromPrimitive, IntoPrimitive)]
+#[repr(u32)]
 pub enum Algo {
     ECB,
     CBC,
     CTR,
+    #[default]
     Unknown,
 }
 
-impl From<u32> for Algo {
-    #[inline]
-    fn from(value: u32) -> Algo {
-        match value {
-            0 => Algo::ECB,
-            1 => Algo::CBC,
-            2 => Algo::CTR,
-            _ => Algo::Unknown,
-        }
-    }
-}
-
+#[derive(FromPrimitive, IntoPrimitive)]
+#[repr(u32)]
 pub enum Mode {
     Decode,
     Encode,
+    #[default]
     Unknown,
 }
 
-impl From<u32> for Mode {
-    #[inline]
-    fn from(value: u32) -> Mode {
-        match value {
-            0 => Mode::Decode,
-            1 => Mode::Encode,
-            _ => Mode::Unknown,
-        }
-    }
-}
-
+#[derive(FromPrimitive, IntoPrimitive)]
+#[repr(u32)]
 pub enum KeySize {
     Bit128 = 16,
     Bit256 = 32,
+    #[default]
     Unknown = 0,
 }
 
-impl From<u32> for KeySize {
-    #[inline]
-    fn from(value: u32) -> KeySize {
-        match value {
-            16 => KeySize::Bit128,
-            32 => KeySize::Bit256,
-            _ => KeySize::Unknown,
-        }
-    }
-}
-
-pub const UUID: &str = &include_str!(concat!(env!("OUT_DIR"), "/uuid.txt"));
+// If Uuid::parse_str() returns an InvalidLength error, there may be an extra
+// newline in your uuid.txt file. You can remove it by running 
+// `truncate -s 36 uuid.txt`.
+pub const UUID: &str = &include_str!("../../uuid.txt");

examples/aes-rs/proto/build.rs

@@ -1 +1 @@
-0864c8ec-bdab-11eb-8926-c7fa47a8c92d
+0864c8ec-bdab-11eb-8926-c7fa47a8c92d

examples/aes-rs/proto/src/lib.rs

@@ -25,6 +25,4 @@ description = "Data structures and functions shared by host and TA."
 edition = "2018"
 
 [dependencies]
-
-[build_dependencies]
-uuid = { version = "1.6.1", default-features = false }
+num_enum = { version = "0.7.3", default-features = false }

examples/aes-rs/uuid.txt

@@ -16,48 +16,34 @@
 // under the License.
 
 #![no_std]
+use num_enum::{FromPrimitive, IntoPrimitive};
 
+#[derive(FromPrimitive, IntoPrimitive)]
+#[repr(u32)]
 pub enum Command {
     Prepare,
     Update,
     EncFinal,
     DecFinal,
+    #[default]
     Unknown,
 }
 
-impl From<u32> for Command {
-    #[inline]
-    fn from(value: u32) -> Command {
-        match value {
-            0 => Command::Prepare,
-            1 => Command::Update,
-            2 => Command::EncFinal,
-            3 => Command::DecFinal,
-            _ => Command::Unknown,
-        }
-    }
-}
-
+#[derive(FromPrimitive, IntoPrimitive)]
+#[repr(u32)]
 pub enum Mode {
     Encrypt,
     Decrypt,
+    #[default]
     Unknown,
 }
 
-impl From<u32> for Mode {
-    #[inline]
-    fn from(value: u32) -> Mode {
-        match value {
-            0 => Mode::Encrypt,
-            1 => Mode::Decrypt,
-            _ => Mode::Unknown,
-        }
-    }
-}
-
 pub const BUFFER_SIZE: usize = 16;
 pub const KEY_SIZE: usize = 16;
 pub const AAD_LEN: usize = 16;
 pub const TAG_LEN: usize = 16;
 
-pub const UUID: &str = &include_str!(concat!(env!("OUT_DIR"), "/uuid.txt"));
+// If Uuid::parse_str() returns an InvalidLength error, there may be an extra
+// newline in your uuid.txt file. You can remove it by running 
+// `truncate -s 36 uuid.txt`.
+pub const UUID: &str = &include_str!("../../uuid.txt");

examples/authentication-rs/proto/Cargo.toml

@@ -1 +1 @@
-0a5a06b2-bdab-11eb-add0-77f29de31296
+0a5a06b2-bdab-11eb-add0-77f29de31296

examples/authentication-rs/proto/build.rs

@@ -25,6 +25,4 @@ description = "Data structures and functions shared by host and TA."
 edition = "2018"
 
 [dependencies]
-
-[build_dependencies]
-uuid = { version = "1.6.1", default-features = false }
+num_enum = { version = "0.7.3", default-features = false }