commit b0960df89064e3058199539f664f647ec0c5cb16
author Andrew Scull <ascull@google.com> Wed Apr 26 14:22:36 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 26 14:22:36 2023 +0000
tree 0ef1ede0e2643c7ff9dd01b1c8f439a90608c02b
parent a4e1958548269ca088817d03a50a0dd607d1ec62
parent d5b91adcb70c18b9f1005c186b56f81d7e04727f

Error on IRPC v3 requests for test mode keys am: d5b91adcb7

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymint/+/22851938

Change-Id: I49f119dd9f4d719c8028dc4a451175c802e2716f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 {