Merge pull request #723 from tgonzalezorlandoarm/tg/tpm-testing-fix

e2e_tests/wrong_permitted_algorithm: Change used sha for hw compatibi…
parallaxsecond · Oct 19, 2023 · 85e4370 · 85e4370
2 parents e987290 + 3c4ea26
commit 85e4370
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/e2e_tests/Cargo.lock b/e2e_tests/Cargo.lock
diff --git a/e2e_tests/src/lib.rs b/e2e_tests/src/lib.rs
@@ -522,6 +522,17 @@ impl TestClient {
         )
     }
 
+    /// Signs a short digest with an RSA key.
+    pub fn sign_with_rsa_sha384(&mut self, key_name: String, hash: Vec<u8>) -> Result<Vec<u8>> {
+        self.sign(
+            key_name,
+            AsymmetricSignature::RsaPkcs1v15Sign {
+                hash_alg: Hash::Sha384.into(),
+            },
+            hash,
+        )
+    }
+
     /// Signs a short digest with an ECDSA key.
     pub fn sign_with_ecdsa_sha256(&mut self, key_name: String, hash: Vec<u8>) -> Result<Vec<u8>> {
         self.sign(

diff --git a/e2e_tests/tests/per_provider/normal_tests/key_attributes.rs b/e2e_tests/tests/per_provider/normal_tests/key_attributes.rs
@@ -134,7 +134,7 @@ fn wrong_permitted_algorithm() {
     // Do not permit RSA PKCS 1v15 signing algorithm with SHA-256.
     let permitted_algorithm =
         Algorithm::AsymmetricSignature(AsymmetricSignature::RsaPkcs1v15Sign {
-            hash_alg: Hash::Sha512.into(),
+            hash_alg: Hash::Sha256.into(),
         });
     let mut usage_flags: UsageFlags = Default::default();
     let _ = usage_flags.set_sign_hash();
@@ -159,7 +159,7 @@ fn wrong_permitted_algorithm() {
         .unwrap();
 
     let status = client
-        .sign_with_rsa_sha256(key_name, vec![0xDE; 32])
+        .sign_with_rsa_sha384(key_name, vec![0xDE; 32])
         .unwrap_err();
 
     assert_eq!(status, ResponseStatus::PsaErrorNotPermitted);