Merge pull request #93 from Freax13/enhancement/apis

small improvements for the mushroom library API

common/loader/src/input.rs

@@ -8,6 +8,7 @@ use x86_64::structures::paging::PhysFrame;
 
 use crate::{LoadCommand, LoadCommandPayload};
 
+#[derive(Clone)]
 pub struct Input<T> {
     pub bytes: T,
     pub hash_type: HashType,

host/mushroom-verify/src/lib.rs

@@ -2,13 +2,13 @@ use std::fmt::{self, Display};
 
 use io::input::{Header, MAX_HASH_SIZE};
 use sha2::{Digest, Sha256};
-#[cfg(feature = "snp")]
-use snp_types::{attestation::TcbVersion, guest_policy::GuestPolicy};
-#[cfg(feature = "tdx")]
-use tdx_types::td_quote::TeeTcbSvn;
+use thiserror::Error;
 
 pub use loader::{HashType, Input};
-use thiserror::Error;
+#[cfg(feature = "snp")]
+pub use snp_types::{attestation::TcbVersion, guest_policy::GuestPolicy};
+#[cfg(feature = "tdx")]
+pub use tdx_types::td_quote::TeeTcbSvn;
 
 #[cfg(feature = "serde")]
 mod hex;
@@ -204,6 +204,11 @@ impl OutputHash {
             len: output.len() as u64,
         }
     }
+
+    /// Verify that the hash matches the byte slice.
+    pub fn verify(&self, output: &[u8]) -> bool {
+        *self == Self::new(output)
+    }
 }
 
 impl From<OutputHash> for HashedInput {

host/mushroom/src/snp.rs

@@ -18,9 +18,8 @@ use constants::{
 };
 use loader::Input;
 use nix::sys::pthread::pthread_kill;
-use snp_types::{guest_policy::GuestPolicy, PageType};
+use snp_types::PageType;
 use tracing::{debug, info};
-use vcek_kds::Vcek;
 use volatile::map_field;
 use x86_64::{
     structures::paging::{PageSize, PhysFrame, Size2MiB, Size4KiB},
@@ -40,6 +39,9 @@ use crate::{
     MushroomResult, SIG_KICK,
 };
 
+pub use snp_types::guest_policy::GuestPolicy;
+pub use vcek_kds::Vcek;
+
 #[allow(clippy::too_many_arguments)]
 pub fn main(
     kvm_handle: &KvmHandle,