Move checkquote to abstractions/no_tpm

Signed-off-by: Simon Brand <[email protected]>

Author: brandsimon

tss-esapi/src/abstraction/mod.rs

@@ -4,6 +4,7 @@
 pub mod ak;
 pub mod cipher;
 pub mod ek;
+pub mod no_tpm;
 pub mod nv;
 pub mod pcr;
 pub mod public;

tss-esapi/src/abstraction/no_tpm/mod.rs

@@ -0,0 +1,10 @@
+#[cfg(all(
+    any(feature = "p224", feature = "p256", feature = "p384", feature = "rsa"),
+    any(feature = "sha1", feature = "sha2",)
+))]
+mod quote;
+#[cfg(all(
+    any(feature = "p224", feature = "p256", feature = "p384", feature = "rsa"),
+    any(feature = "sha1", feature = "sha2",)
+))]
+pub use quote::checkquote;

tss-esapi/src/utils/quote.rs renamed to tss-esapi/src/abstraction/no_tpm/quote.rs

@@ -210,7 +210,7 @@ fn checkquote_pcr_digests(
 /// # use std::convert::TryFrom;
 /// # use tss_esapi::{
 /// #     attributes::SessionAttributes,
-/// #     abstraction::{ak, ek, AsymmetricAlgorithmSelection},
+/// #     abstraction::{ak, ek, AsymmetricAlgorithmSelection, no_tpm},
 /// #     constants::SessionType, Context,
 /// #     interface_types::{
 /// #         algorithm::{HashingAlgorithm, SignatureSchemeAlgorithm},
@@ -221,7 +221,6 @@ fn checkquote_pcr_digests(
 /// #         SignatureScheme, SymmetricDefinition,
 /// #     },
 /// #     TctiNameConf,
-/// #     utils,
 /// # };
 /// # let mut context =
 /// #     Context::new(
@@ -286,7 +285,7 @@ fn checkquote_pcr_digests(
 ///     .execute_without_session(|ctx| ctx.pcr_read(pcr_selection_list))
 ///     .unwrap();
 /// let public = ak_res.out_public;
-/// utils::checkquote(
+/// no_tpm::checkquote(
 ///     &attest,
 ///     &signature,
 ///     &public,

tss-esapi/src/utils/mod.rs

@@ -23,17 +23,6 @@ use crate::{Context, Error, Result, WrapperErrorKind};
 use std::convert::TryFrom;
 use zeroize::Zeroize;
 
-#[cfg(all(
-    any(feature = "p224", feature = "p256", feature = "p384", feature = "rsa"),
-    any(feature = "sha1", feature = "sha2",)
-))]
-mod quote;
-#[cfg(all(
-    any(feature = "p224", feature = "p256", feature = "p384", feature = "rsa"),
-    any(feature = "sha1", feature = "sha2",)
-))]
-pub use quote::checkquote;
-
 /// Create the [Public] structure for a restricted decryption key.
 ///
 /// * `symmetric` - Cipher to be used for decrypting children of the key

tss-esapi/tests/integration_tests/abstraction_tests/mod.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 mod ak_tests;
 mod ek_tests;
+mod no_tpm;
 mod nv_tests;
 mod pcr_data_tests;
 mod pcr_tests;

tss-esapi/tests/integration_tests/abstraction_tests/no_tpm/mod.rs

@@ -0,0 +1 @@
+mod quote_test;

tss-esapi/tests/integration_tests/utils_tests/quote_test.rs renamed to tss-esapi/tests/integration_tests/abstraction_tests/no_tpm/quote_test.rs

@@ -5,7 +5,7 @@ mod test_quote {
     use crate::common::create_ctx_with_session;
     use std::convert::TryFrom;
     use tss_esapi::{
-        abstraction::{ak, ek, AsymmetricAlgorithmSelection},
+        abstraction::{ak, ek, no_tpm, AsymmetricAlgorithmSelection},
         handles::PcrHandle,
         interface_types::{
             algorithm::{HashingAlgorithm, SignatureSchemeAlgorithm},
@@ -16,7 +16,6 @@ mod test_quote {
             Auth, Data, Digest, DigestList, DigestValues, EccSignature, PcrSelectionListBuilder,
             PcrSlot, Signature, SignatureScheme,
         },
-        utils,
     };
 
     fn checkquote_ecc(hash_alg: HashingAlgorithm) {
@@ -79,7 +78,7 @@ mod test_quote {
             .unwrap();
 
         let public = ak_res.out_public;
-        assert!(utils::checkquote(
+        assert!(no_tpm::checkquote(
             &attest,
             &signature,
             &public,
@@ -88,10 +87,10 @@ mod test_quote {
         )
         .unwrap());
         // Test without pcrs
-        assert!(utils::checkquote(&attest, &signature, &public, &None, &qualifying_data).unwrap());
+        assert!(no_tpm::checkquote(&attest, &signature, &public, &None, &qualifying_data).unwrap());
 
         let wrong_nonce = vec![5, 2, 3, 8, 1, 4, 8];
-        assert!(!utils::checkquote(&attest, &signature, &public, &None, &wrong_nonce).unwrap());
+        assert!(!no_tpm::checkquote(&attest, &signature, &public, &None, &wrong_nonce).unwrap());
 
         let wrong_ak_res = ak::create_ak(
             &mut context,
@@ -103,7 +102,7 @@ mod test_quote {
             None,
         )
         .unwrap();
-        assert!(!utils::checkquote(
+        assert!(!no_tpm::checkquote(
             &attest,
             &signature,
             &wrong_ak_res.out_public,
@@ -117,7 +116,7 @@ mod test_quote {
             .with_selection(HashingAlgorithm::Sha256, &[PcrSlot::Slot2])
             .build()
             .expect("Failed to create PcrSelectionList");
-        assert!(!utils::checkquote(
+        assert!(!no_tpm::checkquote(
             &attest,
             &signature,
             &public,
@@ -131,7 +130,7 @@ mod test_quote {
             wrong_pcr_data.add(pcr_data.value()[i].clone()).unwrap();
         }
         wrong_pcr_data.add(pcr_data.value()[0].clone()).unwrap();
-        assert!(!utils::checkquote(
+        assert!(!no_tpm::checkquote(
             &attest,
             &signature,
             &public,
@@ -152,7 +151,7 @@ mod test_quote {
             ecc.signature_r().clone(),
         )
         .unwrap();
-        assert!(!utils::checkquote(
+        assert!(!no_tpm::checkquote(
             &attest,
             &Signature::EcDsa(wrong_signature),
             &public,
@@ -226,7 +225,7 @@ mod test_quote {
             .execute_without_session(|ctx| ctx.pcr_read(pcr_selection_list))
             .unwrap();
 
-        assert!(utils::checkquote(
+        assert!(no_tpm::checkquote(
             &attest,
             &signature,
             &ak_rsa.out_public,

tss-esapi/tests/integration_tests/utils_tests/mod.rs

@@ -1,4 +1,3 @@
 // Copyright 2021 Contributors to the Parsec project.
 // SPDX-License-Identifier: Apache-2.0
 mod get_tpm_vendor_test;
-mod quote_test;