commit 30bec855160e51166317cf94b907bc54a0b61eb3
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 26 23:33:11 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 26 23:33:11 2023 +0000
tree 0ef1ede0e2643c7ff9dd01b1c8f439a90608c02b
parent 20414fa7afcb1d662b86ab2b05802091964e25b5
parent d5b91adcb70c18b9f1005c186b56f81d7e04727f

Snap for 10017950 from d5b91adcb70c18b9f1005c186b56f81d7e04727f to udc-release

Change-Id: I06ed38e6fb42716e8d365fc704c6d15734925871

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 {