hwcrypto: Removing batch key definition am: 4cbd659ed8
Original change: https://android-review.googlesource.com/c/trusty/app/sample/+/3388984
Change-Id: I8e44e58b20d50f90ace681f98a9e44218a0a1817
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/hwcryptohal/server/hwcrypto_device_key.rs b/hwcryptohal/server/hwcrypto_device_key.rs
index 1241880..cd3ed21 100644
--- a/hwcryptohal/server/hwcrypto_device_key.rs
+++ b/hwcryptohal/server/hwcrypto_device_key.rs
@@ -240,7 +240,6 @@
DeviceKeyId::DEVICE_BOUND_KEY => {
Ok(hwkey_session.derive_key_req().unique_key())
}
- DeviceKeyId::BATCH_KEY => Ok(hwkey_session.derive_key_req().shared_key()),
_ => Err(hwcrypto_err!(UNSUPPORTED, "unknown key id {:?}", key_id)),
}?;
@@ -600,7 +599,7 @@
expect!(key.is_some(), "should have received a key");
expect!(current_policy, "policy should have been current");
- let derivation_key = DiceBoundDerivationKey::KeyId(DeviceKeyId::BATCH_KEY);
+ let derivation_key = DiceBoundDerivationKey::KeyId(DeviceKeyId::DEVICE_BOUND_KEY);
let key_and_policy =
assert_ok!(hw_device_key.deriveCurrentDicePolicyBoundKey(&derivation_key));
let DiceCurrentBoundKeyResult { diceBoundKey: key, dicePolicyForKeyVersion: policy } =
