Re-exported the 'json' crate from this crate, because it is used in the public interface.

Author: danieltrick

.github/workflows/cargo-workflow.yaml

@@ -109,7 +109,7 @@ jobs:
           packages: libtss2-dev uuid-dev libjson-c-dev libcurl4-openssl-dev
       - run: |
           make docker.swtpm DETACH=1
-          make tests RUST_LOG=info TSS2_LOG=all+none FAPI_RS_TEST_PROF=${{ matrix.profile }}
+          make tests FAPI_RS_TEST_PROF=${{ matrix.profile }}
           make docker.down
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [0.8.1] - 2026-01-15
+
+### Added
+
+- Re-exported the `json` crate from this crate, because it is used in the public interface.
+
+### Changed
+
+- Simplified some public data types by using `#[non_exhaustive]` attribute where applicable.
+- Various improvements to the validation of "flag" parameters.
+
 ## [0.8.0] - 2026-01-15
 
 ### Added

Makefile

@@ -17,8 +17,7 @@ fixup: check
 	cargo clippy --all-features --all-targets
 
 tests:
-	CARGO_PROFILE_RELEASE_DEBUG=true \
-	RUST_BACKTRACE=1 \
+	CARGO_PROFILE_RELEASE_DEBUG=true RUST_BACKTRACE=1 RUST_LOG=info TSS2_LOG="all+none" \
 	cargo test --release --tests --locked -- --test-threads=1
 
 build:

src/context.rs

@@ -21,7 +21,7 @@ use crate::{
         self, FAPI_CONTEXT, TPM2_RC, TSS2_RC,
         constants::{self, TSS2_RC_SUCCESS},
     },
-    flags::flags_to_string,
+    flags::Flags,
     json::{self, JsonValue},
     locking::LockGuard,
     marshal::u64_from_be,
@@ -276,7 +276,7 @@ impl FapiContext {
         fail_if_opt_empty!(key_type);
 
         let cstr_path = CStringHolder::try_from(key_path)?;
-        let cstr_type = CStringHolder::try_from(flags_to_string(key_type)?)?;
+        let cstr_type = CStringHolder::try_from(Flags::as_string(key_type)?)?;
         let cstr_poli = CStringHolder::try_from(pol_path)?;
         let cstr_auth = CStringHolder::try_from(auth_val)?;
 
@@ -394,7 +394,7 @@ impl FapiContext {
         fail_if_opt_empty!(nvi_type);
 
         let cstr_path = CStringHolder::try_from(nv_path)?;
-        let cstr_type = CStringHolder::try_from(flags_to_string(nvi_type)?)?;
+        let cstr_type = CStringHolder::try_from(Flags::as_string(nvi_type)?)?;
         let cstr_poli = CStringHolder::try_from(pol_path)?;
         let cstr_auth = CStringHolder::try_from(auth_val)?;
 
@@ -541,7 +541,7 @@ impl FapiContext {
         fail_if_opt_empty!(quote_type, qualifying_data);
 
         let cstr_path = CStringHolder::try_from(key_path)?;
-        let cstr_type = CStringHolder::try_from(flags_to_string(quote_type)?)?;
+        let cstr_type = CStringHolder::try_from(Flags::as_string(quote_type)?)?;
 
         let mut quote_info: *mut c_char = ptr::null_mut();
         let mut signature_data: *mut u8 = ptr::null_mut();
@@ -672,7 +672,7 @@ impl FapiContext {
         fail_if_empty!(digest);
 
         let cstr_path = CStringHolder::try_from(key_path)?;
-        let cstr_algo = CStringHolder::try_from(flags_to_string(pad_algo)?)?;
+        let cstr_algo = CStringHolder::try_from(Flags::as_string(pad_algo)?)?;
 
         let mut signature_data: *mut u8 = ptr::null_mut();
         let mut signature_size: usize = 0;
@@ -739,7 +739,7 @@ impl FapiContext {
         fail_if_opt_empty!(data);
 
         let cstr_path = CStringHolder::try_from(path)?;
-        let cstr_type = CStringHolder::try_from(flags_to_string(seal_type)?)?;
+        let cstr_type = CStringHolder::try_from(Flags::as_string(seal_type)?)?;
         let cstr_poli = CStringHolder::try_from(pol_path)?;
         let cstr_auth = CStringHolder::try_from(auth_val)?;
 

src/error.rs

@@ -9,7 +9,8 @@ use crate::fapi_sys::{TSS2_RC, constants};
 const LAYER_BIT_MASK: u32 = 0x0000FFFF;
 
 /// The error type for FAPI operations, used by the [`FapiContext`](crate::FapiContext) struct.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum ErrorCode {
     TpmError(Tpm2ErrorCode),
     FapiError(BaseErrorCode),
@@ -24,7 +25,8 @@ pub enum ErrorCode {
 }
 
 /// Generic TSS2 error codes.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum BaseErrorCode {
     GeneralFailure,
     NotImplemented,
@@ -84,7 +86,8 @@ pub enum BaseErrorCode {
 }
 
 /// TPM 2.0 response code wrapper.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum Tpm2ErrorCode {
     Tpm2ErrFmt0(Tpm2ErrFmt0),
     Tpm2ErrFmt1(Tpm2ErrFmt1),
@@ -93,7 +96,8 @@ pub enum Tpm2ErrorCode {
 }
 
 /// TPM 2.0 "format zero" response codes.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum Tpm2ErrFmt0 {
     Initialize,
     Failure,
@@ -133,7 +137,8 @@ pub enum Tpm2ErrFmt0 {
 }
 
 /// TPM 2.0 "format one" response codes.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum Tpm2ErrFmt1 {
     Asymmetric,
     Attributes,
@@ -172,7 +177,8 @@ pub enum Tpm2ErrFmt1 {
 }
 
 /// TPM 2.0 "warning" response codes.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum Tpm2Warning {
     ContextGap,
     ObjectMemory,
@@ -206,7 +212,8 @@ pub enum Tpm2Warning {
 }
 
 /// Internal error codes.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
 pub enum InternalError {
     NoResultData,
     InvalidArguments,