Commit graph

36625 commits

Author SHA1 Message Date
David Drysdale
3056221f7c Merge "KeyMint VTS: strict test only for v2+" am: d057fc0cb6 am: 1f0d75f1f8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2033925

Change-Id: Ie7a8d0a90d1572752b1d0458c9e115a089d96390
2022-03-22 10:05:41 +00:00
David Drysdale
be65672ee4 Merge "KeyMint HAL: clarify ATTEST_KEY is like SIGN" am: afa73442b7 am: bbbc278300
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2033928

Change-Id: Ibbab83f50f2f1956006341e68e9ffc57884444e6
2022-03-22 10:05:32 +00:00
David Drysdale
1f0d75f1f8 Merge "KeyMint VTS: strict test only for v2+" am: d057fc0cb6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2033925

Change-Id: I18f6f997439f31ea4d2a95deffe318d07f9048b9
2022-03-22 09:50:54 +00:00
David Drysdale
bbbc278300 Merge "KeyMint HAL: clarify ATTEST_KEY is like SIGN" am: afa73442b7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2033928

Change-Id: I2519c3a8525d4196b8a3969d6bdb0a0d73df3f8d
2022-03-22 09:50:14 +00:00
David Drysdale
d057fc0cb6 Merge "KeyMint VTS: strict test only for v2+" 2022-03-22 09:28:52 +00:00
David Drysdale
afa73442b7 Merge "KeyMint HAL: clarify ATTEST_KEY is like SIGN" 2022-03-22 09:26:41 +00:00
Sarah Chin
9cad82c4b7 Merge "Enable IRadio AIDL VTS tests" am: 1b51643add am: 9257a65735
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032264

Change-Id: I64e2fa79b11fea3e895a99b30e7f38b093597723
2022-03-21 18:30:14 +00:00
Sarah Chin
9257a65735 Merge "Enable IRadio AIDL VTS tests" am: 1b51643add
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032264

Change-Id: I17f6aae46cd3a5687b938009a6060abd29c5ecc2
2022-03-21 18:10:36 +00:00
Sarah Chin
1b51643add Merge "Enable IRadio AIDL VTS tests" 2022-03-21 17:55:44 +00:00
David Drysdale
bcb2f73475 KeyMint HAL: clarify ATTEST_KEY is like SIGN
Bug: 221280929
Test: None, comment change only (already assumed by VTS tests)
Change-Id: Ifc077c6ce1a89164b0d7c70c6e3353d941eee670
2022-03-21 17:14:59 +00:00
Max Bires
59624afdce Merge "More canonicalization checks and canonicalize before signing" am: cf02e97946 am: 8daddefc18
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2029343

Change-Id: I077bddf029ce6a5d2a6532575f6d3e798cc831bc
2022-03-21 17:04:21 +00:00
Sarah Chin
19af813e7d Fix AIDL VTS setup am: eaf2660625 am: a6dcde47d3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032528

Change-Id: I8f9a230da3a8337421d6ab139728531e419e925f
2022-03-21 17:02:18 +00:00
Max Bires
8daddefc18 Merge "More canonicalization checks and canonicalize before signing" am: cf02e97946
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2029343

Change-Id: Iab4fc8bfc9737bfdb1dfd23dfbadd38ac2fd6a5a
2022-03-21 16:44:04 +00:00
Max Bires
cf02e97946 Merge "More canonicalization checks and canonicalize before signing" 2022-03-21 16:33:20 +00:00
Sarah Chin
a6dcde47d3 Fix AIDL VTS setup am: eaf2660625
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032528

Change-Id: Ic05cf2551212388a6f572874627cfc6695175393
2022-03-21 16:26:20 +00:00
David Drysdale
50a66b8f79 KeyMint VTS: strict test only for v2+
Bug: 223537775
Bug: 197096139
Test: VtsAidlKeyMintTargetTest
Change-Id: Ib77d52e4a91233c936b3a44f5eac71f53b2af450
2022-03-21 15:29:00 +00:00
Max Bires
e74f0bc950 More canonicalization checks and canonicalize before signing
This change makes sure the DeviceInfo CBOR map is canonicalized before
the signature check instead of just separately checking the
canonicalization in a separate call. Additionally, some ASSERTs have
been changed to EXPECTs in validation of the DeviceInfo map more
generally, where it makes sense to avoid failing immediately.

Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I69806c887656772ea6b5e2e3f0af50957e6b05e3
2022-03-21 05:19:15 +00:00
Sarah Chin
eaf2660625 Fix AIDL VTS setup
Setup code was causing all tests to be ignored on devices with AIDL HAL.
Fix the setup code and increase GTEST timeout to prevent the test suite
from crashing.

Test: atest VtsHalRadioTargetTest
Bug: 225032427
Change-Id: Ice60f7fae313863e97e425994bee5ad1d703c807
Merged-In: Ice60f7fae313863e97e425994bee5ad1d703c807
2022-03-20 19:56:26 -07:00
Sarah Chin
a8c4c173a8 Merge "Update compatibility matrices for IRadio AIDL" am: 2983842651 am: a1ae953b4e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032266

Change-Id: Ifc66d3998472c9ebaef989f24726347d35631ca0
2022-03-18 21:55:51 +00:00
Sarah Chin
a1ae953b4e Merge "Update compatibility matrices for IRadio AIDL" am: 2983842651
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032266

Change-Id: Ia06cae6174194fa293c0addbd32c59b90741b2ec
2022-03-18 21:40:31 +00:00
Sarah Chin
2983842651 Merge "Update compatibility matrices for IRadio AIDL" 2022-03-18 21:22:13 +00:00
Sarah Chin
9101327a27 Update compatibility matrices for IRadio AIDL
Test: build
Bug: 205355625
Change-Id: I5fb37f2e05a1b6697eb27e1f3340c7d6b3f409b5
Merged-In: I5fb37f2e05a1b6697eb27e1f3340c7d6b3f409b5
2022-03-18 13:10:45 -07:00
Tri Vo
c18ed24712 Merge "KeyMint VTS: Expect empty key if boot state unverfied" am: a26f8cb316 am: 39f920bae3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2014678

Change-Id: I09c96b1e9df172a76e1747f4b6687bd4211146ea
2022-03-18 18:44:50 +00:00
Tri Vo
39f920bae3 Merge "KeyMint VTS: Expect empty key if boot state unverfied" am: a26f8cb316
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2014678

Change-Id: Ib537d307ffe6e764cc0737c8fab0b8944808f4ef
2022-03-18 18:30:36 +00:00
Sarah Chin
e555400a9d Enable IRadio AIDL VTS tests
Fix failing SIM tests so test suite can be enabled

Test: atest VtsHalRadioTargetTest passes
Bug: 217574863
Change-Id: Id7ac87ca6da799df4af983cd295a4234e75565d2
Merged-In: Id7ac87ca6da799df4af983cd295a4234e75565d2
2022-03-18 11:28:40 -07:00
Tri Vo
a26f8cb316 Merge "KeyMint VTS: Expect empty key if boot state unverfied" 2022-03-18 18:14:31 +00:00
Gary Jian
4315111833 Merge "Fix type conversion from aidl::AccessNetworks to hidl::RadioAccessNetworks" am: b9fbe11dfe am: 96d037bf93
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2026284

Change-Id: Ie6f611ef4cf0f7aab76a1b8f19dc0e211a85eb56
2022-03-18 04:24:57 +00:00
Gary Jian
96d037bf93 Merge "Fix type conversion from aidl::AccessNetworks to hidl::RadioAccessNetworks" am: b9fbe11dfe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2026284

Change-Id: I87a3ac1796b0ee80643571bad46108643a655478
2022-03-18 04:09:55 +00:00
Gary Jian
b9fbe11dfe Merge "Fix type conversion from aidl::AccessNetworks to hidl::RadioAccessNetworks" 2022-03-18 03:51:42 +00:00
Gary Jian
b611de7c3a Fix type conversion from aidl::AccessNetworks to hidl::RadioAccessNetworks
aidl::AccessNetworks and hidl::RadioAccessNetworks has a different enum

Bug: 223770908
Test: manual
Change-Id: Idd20d77c0090567a4e88334061ecd44415500000
2022-03-17 10:48:30 +08:00
Janis Danisevskis
2c90fb249d Merge changes from topic "default_dice_hal" am: 49a1688f5e am: 0b05aae7dc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1896435

Change-Id: I5a40a95d8ef0dadac167385d1e0331001ce1dd6b
2022-03-16 21:02:05 +00:00
Janis Danisevskis
0b05aae7dc Merge changes from topic "default_dice_hal" am: 49a1688f5e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1896435

Change-Id: I7f49feb6649e95aee8365fc84a7159246576a43a
2022-03-16 20:42:14 +00:00
Janis Danisevskis
49a1688f5e Merge changes from topic "default_dice_hal"
* changes:
  Dice HAL: Add VTS Test.
  Dice HAL: Added default implementation.
2022-03-16 20:16:15 +00:00
David Drysdale
85b06d9590 Merge "Revert "KeyMint VTS: add TEST_MAPPING"" am: 83e3bffe66 am: 0918368cf8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2028363

Change-Id: I9c4320af65a01073a49fb18e042f4d7b055ef790
2022-03-16 12:31:33 +00:00
David Drysdale
0918368cf8 Merge "Revert "KeyMint VTS: add TEST_MAPPING"" am: 83e3bffe66
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2028363

Change-Id: Ibb0b9575a5c863ce7c206d7bb187a8a207e493ee
2022-03-16 12:06:27 +00:00
David Drysdale
83e3bffe66 Merge "Revert "KeyMint VTS: add TEST_MAPPING"" 2022-03-16 11:43:55 +00:00
David Drysdale
6288f4bbb9 Revert "KeyMint VTS: add TEST_MAPPING"
This reverts commit 7e71fcf852.

Reason for revert: failing tests on git_master on aosp_x86_64-userdebug

Bug: 224951152
Bug: 224951969
Bug: 224950581
Change-Id: I86ae5e8d73cefd6d9d923138384cf98ec80a42df
2022-03-16 11:34:44 +00:00
David Drysdale
36f58e6c98 Merge "KeyMint VTS: add TEST_MAPPING" am: 7f366ab5dd am: 4c1b6dfb23
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1879916

Change-Id: I6dc8fc384d74f18d2970a8f7ad7b106408393ea6
2022-03-16 07:42:14 +00:00
David Drysdale
4c1b6dfb23 Merge "KeyMint VTS: add TEST_MAPPING" am: 7f366ab5dd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1879916

Change-Id: I067aebeff0f1c730594812af451a7d24ea7b3b22
2022-03-16 07:17:22 +00:00
David Drysdale
7f366ab5dd Merge "KeyMint VTS: add TEST_MAPPING" 2022-03-16 06:49:19 +00:00
Janis Danisevskis
21244fc192 Dice HAL: Add VTS Test.
This CL adds a VTS test for the DICE HAL, and a test specific for
demotion testing. Demotion testing leaves the device in a permanently
modified state untill the next reboot, which is why it needs a special
test config. The current test config restarts the device before testing,
in a followup the device also has to reboot after the test.

Bug: 198197213
Test: atest VtsAidlDiceTargetTest
      atest VtsAidlDiceDemoteTargetTest
Change-Id: I4278a1352df749da50dc8e5d118fc37336026061
2022-03-15 12:39:22 -07:00
Chen Chen
a16a0ece1a Merge "SpatialAudio: fix crashes in BluetoothAudioSession" am: 8673f8c28f am: 81edd99b87
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2025663

Change-Id: I25913e948f137e057899e30b5e665e0673e3207b
2022-03-15 18:28:11 +00:00
Chen Chen
81edd99b87 Merge "SpatialAudio: fix crashes in BluetoothAudioSession" am: 8673f8c28f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2025663

Change-Id: Ieaf742d1f7b76289b4e7b3b759ecad319d441b12
2022-03-15 18:00:49 +00:00
Chen Chen
8673f8c28f Merge "SpatialAudio: fix crashes in BluetoothAudioSession" 2022-03-15 17:32:37 +00:00
Steven Moreland
650468afcc Merge "Fuzzer for default vibrator service." am: 5ceed8997b am: 4b572a4d5a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2025684

Change-Id: I7797831e18ac7af54a61587fd23925a98deccf55
2022-03-15 16:57:57 +00:00
Steven Moreland
4b572a4d5a Merge "Fuzzer for default vibrator service." am: 5ceed8997b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2025684

Change-Id: I423b532bdb05e6b5c780aa9fd73f3c17a4b515bc
2022-03-15 16:29:30 +00:00
Steven Moreland
5ceed8997b Merge "Fuzzer for default vibrator service." 2022-03-15 16:02:35 +00:00
David Drysdale
590665c1b9 Merge "Prevent test crashes if device sets invalid curve" am: ceedbb0d1a am: cd2af34d63
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2020155

Change-Id: I96e5bdd31b81b0284ccea45a7c6adbe67c5e6c0c
2022-03-15 08:32:20 +00:00
David Drysdale
cd2af34d63 Merge "Prevent test crashes if device sets invalid curve" am: ceedbb0d1a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2020155

Change-Id: I8ca787e6f309d430b3859909d9c951a6511cc242
2022-03-15 08:06:22 +00:00
David Drysdale
ceedbb0d1a Merge "Prevent test crashes if device sets invalid curve" 2022-03-15 07:35:02 +00:00