commit 6eeb70dcb67c4b5e170a4f520467bb2c608e8c52
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 26 23:34:55 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 26 23:34:55 2023 +0000
tree 0ef1ede0e2643c7ff9dd01b1c8f439a90608c02b
parent b28af9d848f20915a13406142d001ebbe89b3cfc
parent 889099a3d640077f33d7e647ad6de38a3301af4e

Snap for 10018787 from 889099a3d640077f33d7e647ad6de38a3301af4e to udc-d1-release

Change-Id: I8cee87d3f2b756f55490fd573c9f36cf873ae06e

ta/src/rkp.rs

diff --git a/ta/src/rkp.rs b/ta/src/rkp.rs
index fbad5e0..5424463 100644
--- a/ta/src/rkp.rs
+++ b/ta/src/rkp.rs
@@ -134,6 +134,13 @@
         &mut self,
         test_mode: rpc::TestMode,
     ) -> Result<(MacedPublicKey, Vec<u8>), Error> {
+        if self.rpc_info.get_version() > IRPC_V2 && test_mode == rpc::TestMode(true) {
+            return Err(rpc_err!(
+                Removed,
+                "generate_ecdsa_p256_keypair does not support test mode in IRPC V3+ HAL."
+            ));
+        }
+
         let (key_material, chars) = self.generate_key_material(&RPC_P256_KEYGEN_PARAMS)?;
 
         let pub_cose_key = match key_material {