Commit Graph

36304 Commits

Author SHA1 Message Date
Sarah Chin
42b57166ab Add JavaDerive toString to AIDL classes
Test: manually verify logcat
Bug: 223230764
Change-Id: If6d459823d3d6ceb0d7c49ba00f01268482128f6
Merged-In: If6d459823d3d6ceb0d7c49ba00f01268482128f6
2022-03-29 11:46:52 -07:00
Treehugger Robot
950b7b8026 Merge "Updated the vts attestation tests for strongbox implementations which do not support factory attestation." 2022-03-24 16:35:47 +00:00
subrahmanyaman
7d9bc46f6f Updated the vts attestation tests for strongbox implementations which
do not support factory attestation.

Bug: b/219962281
Test: Run vts tests.
Change-Id: Ie3f3f33f773227d879e11f11e2ef0eaee33db648
2022-03-23 22:27:05 +00:00
Treehugger Robot
1edd38d6ee Merge "Fix CDDL for signatures." 2022-03-22 16:50:39 +00:00
Alan Stokes
ba9f55ee69 Fix CDDL for signatures.
The signature is not CBOR-encoded, it's the raw bytes of the signature
encoded as specified for the specific algorithm.

I've made the references to PureEd25519() / ECDSA() into comments,
since I believe they're not actually legal CDDL but are aimed at
humans. And I've made the two occurrences consistent with each other.

Test: N/A
Change-Id: Ia42362ff3d0ce5458322663256cbd34d258afe76
2022-03-22 15:23:13 +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
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
cf02e97946 Merge "More canonicalization checks and canonicalize before signing" 2022-03-21 16:33: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
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
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
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
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
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
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
8673f8c28f Merge "SpatialAudio: fix crashes in BluetoothAudioSession" 2022-03-15 17:32:37 +00:00
Steven Moreland
5ceed8997b Merge "Fuzzer for default vibrator service." 2022-03-15 16:02:35 +00:00
David Drysdale
ceedbb0d1a Merge "Prevent test crashes if device sets invalid curve" 2022-03-15 07:35:02 +00:00
Steven Moreland
2e96b9dce1 Fuzzer for default vibrator service.
As an example for a fuzzer of an AIDL service.

Bug: 224646709
Test: run fuzzer for a few minutes (doesn't get very
    deep in the fuzzer - will follow-up with a dictionary
    or a corpus if the fuzzer can't get past the header
    and interface token)
Change-Id: Iac02a1f02500a0098d67823ac22de1706778927b
2022-03-15 01:48:16 +00:00
Chen Chen
3b46c05d95 SpatialAudio: fix crashes in BluetoothAudioSession
Bug: 224578221
Bug: 214615268
Test: build
Change-Id: I0fd7e0887200e39dc996b0d84de421ec13897e94
2022-03-14 18:04:27 -07:00
Mikhail Naganov
f325a1756c Merge "audio: Add OWNERS to aidl folder" 2022-03-15 00:18:17 +00:00
Mikhail Naganov
b62f1ebb19 audio: Add OWNERS to aidl folder
Bug: 205884982
Test: N/A
Change-Id: I9f49d2a9c670c7bbf45dd00d262eff6d445679ea
2022-03-14 22:10:48 +00:00
Tom Pratt
9d268857c8 Add vintf fragment for default broadcastradio
Bug: b/145694104
Test: Build and boot emulator locally. Observe
that CarRadio app shows static data provided by
default broadcast radio.

Change-Id: Ia70e8a040cb281f3d0e8fc7f3a8dd25bcd6d09bd
Merged-In: Ia70e8a040cb281f3d0e8fc7f3a8dd25bcd6d09bd
2022-03-14 21:46:12 +00:00
David Drysdale
d3e783be43 Merge "Add OWNER for keymaster VTS" 2022-03-14 16:04:31 +00:00
David Drysdale
e5c2bf01fc Merge "Key{Mint,Master} VTS: fix incremental AES tags" 2022-03-14 15:45:28 +00:00
David Drysdale
f06d5d3978 Add OWNER for keymaster VTS
Test: TreeHugger
Change-Id: I2ff243a2cadbfcc9bedf634f9a9327b2fa8ccd63
2022-03-14 14:28:27 +00:00
David Drysdale
1a637199e4 Key{Mint,Master} VTS: fix incremental AES tags
Change Id62fdce65131ee00c88e5849955a937f1c171748 split up the AES
incremental encryption tests into individual tests for each encryption
mode.  This meant that each generated key is only valid for a single
mode, which in turn means that for non-GCM mode keys it is not valid
to specify MIN_MAC_LENGTH.

Bug: 223934835
Test: VtsAidlKeyMintTargetTest
Change-Id: I38f34f60116bde3d23f203365d62e5b25d7b254b
2022-03-14 09:23:29 +00:00
Treehugger Robot
3192a09b11 Merge "remote_prov_utils: Add instance name in the JSON output" 2022-03-11 12:48:19 +00:00
Eran Messeri
7fc756ee1a Merge "Update the default KeyMint version" 2022-03-10 23:23:45 +00:00
Treehugger Robot
83e8d8178a Merge "Update VtsHalEvsV1_1TargetTest" 2022-03-10 21:35:22 +00:00
Treehugger Robot
1f6ecfbab0 Merge "Update VtsHalEvsV1_*TargetTest" 2022-03-10 21:34:55 +00:00
Janis Danisevskis
86124738cd Dice HAL: Added default implementation.
Test: ... one ...
Bug: 198197213
Change-Id: If855e2a4a0150d80e7cecce0a078cdeca00bdb50
2022-03-10 12:23:59 -08:00
Eran Messeri
bf89c797d0 Update the default KeyMint version
As the current KeyMint version is 2 (200), reflect that in the default
XML.

Devices that ship with older KeyMint/KeyMaster version should override
the default android.hardware.hardware_keystore.xml file with the
version they support.

Test: android.keystore.cts.KeyAttestationTest#testAttestationKmVersionMatchesFeatureVersion
Bug: 222406513
Bug: 216543583
Change-Id: I6f2229019929cff747cec3907fc2a9b8ebebdcf4
2022-03-10 19:16:39 +00:00
David Drysdale
08696a7543 Prevent test crashes if device sets invalid curve
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Ib623b3dcdd5a496b34314c1e0d1a310c8beeb18d
2022-03-10 10:54:37 +00:00
Tommy Chiu
cb7d3d0759 remote_prov_utils: Add instance name in the JSON output
Bug: 223509807
Test: libkeymint_remote_prov_support_test
Change-Id: I45d2ee46f6fe3c8a7da55c7cc0b04fc007ddea43
2022-03-10 12:17:39 +08:00
Treehugger Robot
5ee0d1534e Merge "Add ApnType.ENTERPRISE" 2022-03-09 17:17:40 +00:00
Tri Vo
af2914162f KeyMint VTS: Expect empty key if boot state unverfied
Bug: 221128605
Test: VtsAidlKeyMintTargetTest
Change-Id: Icbf0ccf57245b2eef559a119087e15cd883239f5
2022-03-08 10:06:06 -08:00
Treehugger Robot
26423c74aa Merge "SpatialAudio: Export LatencyMode functions to BluetoothAudioSession" 2022-03-08 17:57:24 +00:00
David Drysdale
1585fdceb5 KeyMint VTS: check for relevant devices
Don't run tests if the appropriate KeyMint device is not available (e.g.
on something that only has Keymaster).  Move to use GTEST_SKIP
consistently.

Bug: 221909227
Test: VtsAidlKeyMintTargetTest
Change-Id: I5dab238519e57e6752b795f3a983681cf4337bdd
2022-03-08 08:07:02 +00:00
Cheney Ni
6ecbc76603 SpatialAudio: Export LatencyMode functions to BluetoothAudioSession
BluetoothAudioSession utility supports latency control functions, so
audio_bluetooth_hw can get / set the LatencyMode easily.

Bug: 214615268
Bug: 218708371
Test: build
Tag: #feature
Change-Id: Ia85581c74fc91f406309539755d60d36c173f5e0
2022-03-08 11:55:41 +08:00
Xin Li
cbc6a3305e Merge Android 12L
Bug: 222710654
Merged-In: Ib7ed106fb09dcfa246bd0a31515fbbb358259de0
Change-Id: Ifb4059c9c03a8a1ff6a1efd952dd088f0e5a8a9d
2022-03-08 00:18:37 +00:00