| commit | 4c5ab8db99ab10622b1ac34eaa1ae01b259fd02d | [log] [tgz] |
|---|---|---|
| author | Orlando Arbildo <oarbildo@google.com> | Tue Dec 03 17:23:06 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Dec 03 17:23:06 2024 +0000 |
| tree | 66ca3da0932e93bcae2030ce0be886f5accc1535 | |
| parent | fb8040a8adfe4bbbb09f532de21d0cec5dc37a1b [diff] | |
| parent | 20ad88b4c52195de450b9d14c73c95c1f3eb5c3d [diff] |
Merge "hwcrypto: Removing batch key definition" into main
diff --git a/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl b/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl index 83b8496..b31a06c 100644 --- a/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl +++ b/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see.hwcrypto/current/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl
@@ -44,7 +44,6 @@ android.hardware.security.see.hwcrypto.IOpaqueKey getKeyslotData(android.hardware.security.see.hwcrypto.IHwCryptoKey.KeySlot slotId); enum DeviceKeyId { DEVICE_BOUND_KEY, - BATCH_KEY, } enum KeySlot { KEYMINT_SHARED_HMAC_KEY,
diff --git a/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl b/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl index 44ec32f..97a4c37 100644 --- a/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl +++ b/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl
@@ -35,10 +35,6 @@ * This is a key unique to the device. */ DEVICE_BOUND_KEY, - /* - * This is a shared by a set of devices. - */ - BATCH_KEY, } /*