Merge pull request #318 from Superhepper/dependencies

Updates depedencies

Author: ionut-arm

tss-esapi/Cargo.toml

@@ -14,9 +14,9 @@ documentation = "https://docs.rs/crate/tss-esapi"
 [dependencies]
 bitfield = "0.13.2"
 serde = { version = "1.0.115", features = ["derive"] }
-mbox = "0.5.0"
+mbox = "0.6.0"
 log = "0.4.11"
-enumflags2 = "0.6.4"
+enumflags2 = "0.7.1"
 num-derive = "0.3.2"
 num-traits = "0.2.12"
 hostname-validator = "1.1.0"
@@ -26,8 +26,8 @@ tss-esapi-sys = { path = "../tss-esapi-sys", version = "0.2.0" }
 primal = "0.3.0"
 
 [dev-dependencies]
-env_logger = "0.7.1"
-sha2 = "0.9.8"
+env_logger = "0.9.0"
+sha2 = "0.10.1"
 
 [features]
 generate-bindings = ["tss-esapi-sys/generate-bindings"]

tss-esapi/src/context.rs

@@ -382,7 +382,10 @@ impl Context {
 
     /// Returns a mutable reference to the native ESYS context handle.
     fn mut_context(&mut self) -> *mut ESYS_CONTEXT {
-        self.esys_context.as_mut().unwrap().as_mut_ptr() // will only fail if called from Drop after .take()
+        self.esys_context
+            .as_mut()
+            .map(MBox::<ESYS_CONTEXT>::as_mut_ptr)
+            .unwrap() // will only fail if called from Drop after .take()
     }
 
     /// Internal function for retrieving the ESYS session handle for
@@ -455,10 +458,16 @@ impl Drop for Context {
             error!("Not all handles have had their resources successfully released");
         }
 
-        let esys_context = self.esys_context.take().unwrap(); // should not fail based on how the context is initialised/used
-
         // Close the context.
-        unsafe { Esys_Finalize(&mut esys_context.into_raw()) };
+        unsafe {
+            Esys_Finalize(
+                &mut self
+                    .esys_context
+                    .take()
+                    .map(MBox::<ESYS_CONTEXT>::into_raw)
+                    .unwrap(), // should not fail based on how the context is initialised/used
+            )
+        };
         info!("Context closed.");
     }
 }

tss-esapi/src/structures/pcr/slot.rs

@@ -1,17 +1,16 @@
 // Copyright 2022 Contributors to the Parsec project.
 // SPDX-License-Identifier: Apache-2.0
 use crate::{tss2_esys::TPM2_PCR_SELECT_MAX, Error, Result, WrapperErrorKind};
-use enumflags2::{BitFlags, _internal::RawBitFlags};
+use enumflags2::bitflags;
 use log::error;
 use num_derive::{FromPrimitive, ToPrimitive};
-use num_traits::FromPrimitive;
+use num_traits::{FromPrimitive, ToPrimitive};
 use std::convert::TryFrom;
 
 /// Enum with the bit flag for each PCR slot.
-#[derive(
-    FromPrimitive, ToPrimitive, BitFlags, Hash, Debug, Eq, PartialEq, Ord, PartialOrd, Clone, Copy,
-)]
+#[bitflags]
 #[repr(u32)]
+#[derive(FromPrimitive, ToPrimitive, Hash, Debug, Eq, PartialEq, Ord, PartialOrd, Clone, Copy)]
 pub enum PcrSlot {
     Slot0 = 0x0000_0001,
     Slot1 = 0x0000_0002,
@@ -49,7 +48,7 @@ pub enum PcrSlot {
 
 impl From<PcrSlot> for u32 {
     fn from(pcr_slot: PcrSlot) -> u32 {
-        pcr_slot.bits()
+        pcr_slot.to_u32().unwrap()
     }
 }