Merge pull request #387 from ionut-arm/v4

Superhepper · web-flow · commit a0d39dd72d10 · 2023-01-31T16:10:35.000+01:00
Allow use with v4 of tpm2-tss
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Build the container
         run: docker build -t ubuntucontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-ubuntu
       - name: Run the container
-        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --env RUST_TOOLCHAIN_VERSION=1.53.0 ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/all-ubuntu.sh
+        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --env RUST_TOOLCHAIN_VERSION=1.56.0 ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/all-ubuntu.sh
   # All in one job as I think it is a big overhead to build and run the Docker
   # container?
   tests-ubuntu:
@@ -70,6 +70,17 @@ jobs:
       - name: Run the tests
         run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi fedoracontainer dbus-run-session -- /tmp/rust-tss-esapi/tss-esapi/tests/all-fedora.sh
 
+  tests-fedora-rawhide:
+    name: Fedora rawhide tests
+    # We just build a container... GitHub doesn't like Fedora :(
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build the container
+        run: docker build -t fedoracontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-fedora-rawhide
+      - name: Run the tests
+        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --security-opt seccomp=unconfined fedoracontainer dbus-run-session -- /tmp/rust-tss-esapi/tss-esapi/tests/all-fedora.sh
+
   tests-valgrind:
     name: Valgrind test run
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ At the moment we test (via CI) and support the following Rust compiler versions:
 
 * On Ubuntu we test with:
     - The latest stable compiler version, as accessible through `rustup`.
-    - The 1.53 compiler version.
+    - The 1.56 compiler version.
 * On Fedora we test with the compiler version included with the Fedora 35 release.
 
 If you need support for other versions of the compiler, get in touch with us to see what we can do!
diff --git a/tss-esapi-sys/build.rs b/tss-esapi-sys/build.rs
@@ -57,6 +57,7 @@ fn main() {
     }
 }
 
+#[allow(clippy::uninlined_format_args)]
 #[cfg(feature = "generate-bindings")]
 pub fn generate_from_system(esapi_out: PathBuf) {
     pkg_config::Config::new()
diff --git a/tss-esapi/build.rs b/tss-esapi/build.rs
@@ -6,6 +6,7 @@ fn main() {
         match tss2_esys_version.chars().next().unwrap() {
             '2' => println!("cargo:rustc-cfg=tpm2_tss_version=\"2\""),
             '3' => println!("cargo:rustc-cfg=tpm2_tss_version=\"3\""),
+            '4' => println!("cargo:rustc-cfg=tpm2_tss_version=\"4\""),
             major => panic!("Unsupported TSS version: {}", major),
         }
     }
diff --git a/tss-esapi/src/constants/response_code.rs b/tss-esapi/src/constants/response_code.rs
@@ -16,7 +16,7 @@ bitfield! {
 }
 
 bitfield! {
-    #[derive(PartialEq, Copy, Clone)]
+    #[derive(PartialEq, Eq, Copy, Clone)]
     pub struct FormatZeroResponseCode(TSS2_RC);
     impl Debug;
     error_number, _: 6, 0;
@@ -36,7 +36,7 @@ impl std::fmt::Display for FormatZeroResponseCode {
 impl std::error::Error for FormatZeroResponseCode {}
 
 bitfield! {
-    #[derive(PartialEq, Copy, Clone)]
+    #[derive(PartialEq, Eq, Copy, Clone)]
     pub struct FormatOneResponseCode(TSS2_RC);
     impl Debug;
     error_number, _: 5, 0;
@@ -56,7 +56,7 @@ impl std::error::Error for FormatOneResponseCode {}
 
 /// Rust native representation of the TSS2 response codes as defined in the spec.
 #[allow(clippy::module_name_repetitions)]
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Tss2ResponseCode {
     Success,
     FormatZero(FormatZeroResponseCode),
@@ -234,7 +234,7 @@ impl Tss2ResponseCode {
 }
 
 /// Rust enum representation of TSS 2 error codes.
-#[derive(PartialEq, Copy, Clone, Debug)]
+#[derive(PartialEq, Eq, Copy, Clone, Debug)]
 pub enum Tss2ResponseCodeKind {
     // FormatZero errors
     Success,
diff --git a/tss-esapi/src/context/tpm_commands/enhanced_authorization_ea_commands.rs b/tss-esapi/src/context/tpm_commands/enhanced_authorization_ea_commands.rs
@@ -430,7 +430,7 @@ impl Context {
                 self.optional_session_3(),
                 &object_name.into(),
                 &new_parent_name.into(),
-                if include_object { 1 } else { 0 },
+                u8::from(include_object),
             )
         };
         let ret = Error::from_tss_rc(ret);
diff --git a/tss-esapi/src/context/tpm_commands/object_commands.rs b/tss-esapi/src/context/tpm_commands/object_commands.rs
@@ -153,10 +153,10 @@ impl Context {
                 self.optional_session_3(),
                 &private.try_into()?,
                 &public.try_into()?,
-                if cfg!(tpm2_tss_version = "3") {
-                    ObjectHandle::from(hierarchy).into()
-                } else {
+                if cfg!(tpm2_tss_version = "2") {
                     TpmHandle::from(hierarchy).into()
+                } else {
+                    ObjectHandle::from(hierarchy).into()
                 },
                 &mut object_handle,
             )
@@ -190,10 +190,10 @@ impl Context {
                 self.optional_session_3(),
                 null(),
                 &public.try_into()?,
-                if cfg!(tpm2_tss_version = "3") {
-                    ObjectHandle::from(hierarchy).into()
-                } else {
+                if cfg!(tpm2_tss_version = "2") {
                     TpmHandle::from(hierarchy).into()
+                } else {
+                    ObjectHandle::from(hierarchy).into()
                 },
                 &mut object_handle,
             )
diff --git a/tss-esapi/src/context/tpm_commands/symmetric_primitives.rs b/tss-esapi/src/context/tpm_commands/symmetric_primitives.rs
@@ -279,10 +279,10 @@ impl Context {
                 self.optional_session_3(),
                 &data.into(),
                 hashing_algorithm.into(),
-                if cfg!(tpm2_tss_version = "3") {
-                    ObjectHandle::from(hierarchy).into()
-                } else {
+                if cfg!(tpm2_tss_version = "2") {
                     TpmHandle::from(hierarchy).into()
+                } else {
+                    ObjectHandle::from(hierarchy).into()
                 },
                 &mut out_hash_ptr,
                 &mut validation_ptr,
diff --git a/tss-esapi/src/error.rs b/tss-esapi/src/error.rs
@@ -7,7 +7,7 @@ use crate::tss2_esys::TSS2_RC;
 /// layer.
 pub type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum Error {
     WrapperError(WrapperErrorKind),
     Tss2Error(Tss2ResponseCode),
@@ -51,7 +51,7 @@ impl std::error::Error for Error {
 }
 
 /// List of error types that might occur in the wrapper.
-#[derive(Copy, Clone, PartialEq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
 pub enum WrapperErrorKind {
     /// Returned when a size or length-defined parameter does not conform with the size
     /// restrictions for it.
diff --git a/tss-esapi/src/lib.rs b/tss-esapi/src/lib.rs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 #![deny(
     nonstandard_style,
-    const_err,
     dead_code,
     improper_ctypes,
     non_shorthand_field_patterns,
diff --git a/tss-esapi/src/structures/lists/ecc_curves.rs b/tss-esapi/src/structures/lists/ecc_curves.rs
@@ -11,7 +11,7 @@ use std::ops::Deref;
 ///
 /// # Details
 /// This corresponds to `TPML_ECC_CURVE`.
-#[derive(Debug, Clone, Default, PartialEq)]
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub struct EccCurveList {
     ecc_curves: Vec<EccCurveIdentifier>,
 }
diff --git a/tss-esapi/src/structures/lists/handles.rs b/tss-esapi/src/structures/lists/handles.rs
@@ -11,7 +11,7 @@ use std::ops::Deref;
 ///
 /// # Details
 /// This corresponds to `TPML_HANDLE`.
-#[derive(Debug, Clone, Default, PartialEq)]
+#[derive(Debug, Clone, Default, PartialEq, Eq)]
 pub struct HandleList {
     handles: Vec<TpmHandle>,
 }
diff --git a/tss-esapi/src/tcti_ldr.rs b/tss-esapi/src/tcti_ldr.rs
@@ -126,7 +126,7 @@ impl Drop for TctiInfo {
 
 /// Placeholder TCTI types that can be used when initialising a `Context` to determine which
 /// interface will be used to communicate with the TPM.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum TctiNameConf {
     /// Connect to a TPM available as a device node on the system
     ///
@@ -166,6 +166,7 @@ impl TctiNameConf {
     }
 }
 
+#[allow(clippy::uninlined_format_args)]
 impl TryFrom<TctiNameConf> for CString {
     type Error = Error;
 
@@ -314,7 +315,7 @@ fn validate_from_str_tcti() {
 ///
 /// The default configuration uses the library default of
 /// `/dev/tpm0`.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct DeviceConfig {
     /// Path to the device node to connect to
     ///
@@ -356,7 +357,7 @@ fn validate_from_str_device_config() {
 /// Configuration for an Mssim TCTI context
 ///
 /// The default configuration will point to `localhost:2321`
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct NetworkTPMConfig {
     /// Address of the server to connect to
     ///
@@ -456,7 +457,7 @@ fn validate_from_str_networktpm_config() {
 /// Address of a TPM server
 ///
 /// The default value is `localhost`
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum ServerAddress {
     /// IPv4 or IPv6 address
     Ip(IpAddr),
@@ -499,7 +500,7 @@ impl Default for ServerAddress {
 }
 
 /// Configuration for a TABRMD TCTI context
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct TabrmdConfig {
     /// Bus name to be used by TABRMD
     ///
@@ -556,7 +557,7 @@ impl FromStr for TabrmdConfig {
 }
 
 /// DBus type for usage with TABRMD
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum BusType {
     System,
     Session,
diff --git a/tss-esapi/tests/Dockerfile-fedora-rawhide b/tss-esapi/tests/Dockerfile-fedora-rawhide
@@ -0,0 +1,8 @@
+FROM fedora:rawhide
+
+RUN dnf install -y \
+	tpm2-tss-devel tpm2-abrmd tpm2-tools \
+	swtpm swtpm-tools \
+	rust clippy cargo \
+	llvm llvm-devel clang pkg-config \
+	dbus-daemon
diff --git a/tss-esapi/tests/integration_tests/abstraction_tests/ek_tests.rs b/tss-esapi/tests/integration_tests/abstraction_tests/ek_tests.rs
@@ -10,6 +10,7 @@ use tss_esapi::{
 
 use crate::common::create_ctx_without_session;
 
+#[cfg_attr(tpm2_tss_version = "4", ignore = "issues with tpm2-tss")]
 #[test]
 fn test_retrieve_ek_pubcert() {
     let mut context = create_ctx_without_session();
diff --git a/tss-esapi/tests/integration_tests/abstraction_tests/nv_tests.rs b/tss-esapi/tests/integration_tests/abstraction_tests/nv_tests.rs
@@ -60,6 +60,7 @@ fn write_nv_index(context: &mut Context, nv_index: NvIndexTpmHandle) -> NvIndexH
     owner_nv_index_handle
 }
 
+#[cfg_attr(tpm2_tss_version = "4", ignore = "issues with tpm2-tss")]
 #[test]
 fn list() {
     let mut context = create_ctx_with_session();
@@ -85,6 +86,7 @@ fn list() {
         .expect("Call to nv_undefine_space failed");
 }
 
+#[cfg_attr(tpm2_tss_version = "4", ignore = "issues with tpm2-tss")]
 #[test]
 fn read_full() {
     let mut context = create_ctx_with_session();
diff --git a/tss-esapi/tests/integration_tests/main.rs b/tss-esapi/tests/integration_tests/main.rs
@@ -1,5 +1,6 @@
 // Copyright 2021 Contributors to the Parsec project.
 // SPDX-License-Identifier: Apache-2.0
+#![allow(clippy::uninlined_format_args)]
 #[path = "common/mod.rs"]
 mod common;
 

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ fn main() {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
	`60`	`+#[allow(clippy::uninlined_format_args)]`
`60`	`61`	`#[cfg(feature = "generate-bindings")]`
`61`	`62`	`pub fn generate_from_system(esapi_out: PathBuf) {`
`62`	`63`	`pkg_config::Config::new()`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ fn main() {`
`6`	`6`	`match tss2_esys_version.chars().next().unwrap() {`
`7`	`7`	`'2' => println!("cargo:rustc-cfg=tpm2_tss_version=\"2\""),`
`8`	`8`	`'3' => println!("cargo:rustc-cfg=tpm2_tss_version=\"3\""),`
	`9`	`+ '4' => println!("cargo:rustc-cfg=tpm2_tss_version=\"4\""),`
`9`	`10`	`major => panic!("Unsupported TSS version: {}", major),`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ impl Context {`
`430`	`430`	`self.optional_session_3(),`
`431`	`431`	`&object_name.into(),`
`432`	`432`	`&new_parent_name.into(),`
`433`		`- if include_object { 1 } else { 0 },`
	`433`	`+ u8::from(include_object),`
`434`	`434`	`)`
`435`	`435`	`};`
`436`	`436`	`let ret = Error::from_tss_rc(ret);`