Commit graph

28546 commits

Author SHA1 Message Date
Andy Hung
6660615822 Merge "StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED" am: 66ffc5b99a am: 1e1514be04
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692490

Change-Id: I97c94630cd48b9a0354c9b76e593ea0205a633b4
2021-05-04 21:37:16 +00:00
Andy Hung
1e1514be04 Merge "StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED" am: 66ffc5b99a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692490

Change-Id: I8da5b65e922c3fae06d29f4e4a990d66dacfe5d0
2021-05-04 21:13:54 +00:00
Andy Hung
66ffc5b99a Merge "StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED" 2021-05-04 20:49:44 +00:00
Shawn Willden
a8a4cb0028 Merge changes Ic8949e22,Ia3a6363d am: da2b9ae9f8 am: 8226694fcf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1694706

Change-Id: I1e13b6c6ca3a8a1dac8e1e89f9ceaa03986a0900
2021-05-04 20:24:33 +00:00
Shawn Willden
8226694fcf Merge changes Ic8949e22,Ia3a6363d am: da2b9ae9f8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1694706

Change-Id: Ie1a7951c7b3a6fc5d7978ece75c1791efac95029
2021-05-04 20:09:27 +00:00
Shawn Willden
da2b9ae9f8 Merge changes Ic8949e22,Ia3a6363d
* changes:
  Update DeviceUniqueAttestationTest to match spec
  Make AttestKeyTest not crash if no cert is returned.
2021-05-04 19:50:41 +00:00
David Drysdale
f15bc0f935 Merge "More KeyMint VTS testcases" am: 3368b3c6b0 am: f8991afa01
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1676298

Change-Id: Ie69fd95c64e89360757e889ae4819c0ac5b275d9
2021-05-04 08:42:10 +00:00
David Drysdale
f8991afa01 Merge "More KeyMint VTS testcases" am: 3368b3c6b0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1676298

Change-Id: Iaeae2f4fc574defd77ead2f8c0a14523eeabfde4
2021-05-04 08:28:26 +00:00
David Drysdale
3368b3c6b0 Merge "More KeyMint VTS testcases" 2021-05-04 08:00:41 +00:00
Shawn Willden
ced5c2c23a Update DeviceUniqueAttestationTest to match spec
Test: VtsAidlKeyMintTargetTest
Change-Id: Ic8949e223eb7ba2445d4738dcd9b31a1d244bb46
2021-05-03 16:36:49 -06:00
Shawn Willden
c410f6fb44 Make AttestKeyTest not crash if no cert is returned.
Test: VtsAidlKeyMintTargetTest
Change-Id: Ia3a6363d854742681f684ff989b98b7cfda30746
2021-05-03 16:36:33 -06:00
Marco Nelissen
2b180742ae Merge "Expand Gatekeeper test" am: a3645d38e9 am: 3a17b7adf6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1609723

Change-Id: I82cbb49766e02b006d47e4b49081a8f946392f7a
2021-05-03 22:14:58 +00:00
Marco Nelissen
3a17b7adf6 Merge "Expand Gatekeeper test" am: a3645d38e9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1609723

Change-Id: I170873fb500893c1f4c88da948eed2bafe3e3e8d
2021-05-03 21:51:51 +00:00
Marco Nelissen
a3645d38e9 Merge "Expand Gatekeeper test" 2021-05-03 21:32:08 +00:00
Shawn Willden
e7d8a2a19a Make keymaster optional. am: cc68516bd2 am: d82de97ccf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1693845

Change-Id: I724a512370c15c4eeae63e70d1b48ea929bb64da
2021-05-03 17:24:51 +00:00
Shawn Willden
d82de97ccf Make keymaster optional. am: cc68516bd2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1693845

Change-Id: I4a2a70dca56f50cfcf383639e5fa6a8ef0349bd7
2021-05-03 17:05:55 +00:00
Shawn Willden
237ecec162 Merge "AttestationKey documentation" am: c46f9da49f am: 5df02652c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1674665

Change-Id: Ib101ab91f951977138ea019d449440439cfccce5
2021-05-03 15:48:56 +00:00
Shawn Willden
5df02652c1 Merge "AttestationKey documentation" am: c46f9da49f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1674665

Change-Id: Icaf7e68d2ee5871dda88a7615cebd6bee7e71d00
2021-05-03 15:32:18 +00:00
Shawn Willden
cc68516bd2 Make keymaster optional.
Keymaster is now optional because KeyMint can be used instead.  This
CL makes this change retroactively back to compatibility matrix v3,
per discussion with the Treble team.

Test: Replace Keymaster with KeyMint & build
Change-Id: Id26d5bac326c494e1810516582fdd56a42c04e0d
2021-05-03 09:08:12 -06:00
Shawn Willden
c46f9da49f Merge "AttestationKey documentation" 2021-05-03 15:07:38 +00:00
Andy Hung
e6e3a17126 StreamOut: Fix STREAM_EVENT_CBK_TYPE_CODEC_FORMAT_CHANGED
Use audio_metadata_byte_string_len method in asyncEventCallback.

Test: atest metadata_tests
Bug: 186894288
Change-Id: I04914bc5b2c778002b53b8f8da5bf29fff5c80f8
2021-04-30 21:07:33 -07:00
Alisher Alikhodjaev
57fc648599 Merge "Out of bounds read in hal_core_initialized" into rvc-qpr-dev am: 14162741e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14204915

Change-Id: I0027d2ed9350a1dd159a922e5922ae63449eceb9
2021-05-01 00:15:12 +00:00
Alisher Alikhodjaev
14162741e7 Merge "Out of bounds read in hal_core_initialized" into rvc-qpr-dev 2021-04-30 23:55:46 +00:00
Paul Crowley
c45edf9eb4 Merge "Add getKeyCharacteristics method to KeyMint" am: 8b25958b75 am: 08e40ff4cc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690690

Change-Id: If3f6752a1b7fa175f8bd4d882974e005fc3fe41c
2021-04-30 21:35:45 +00:00
Andy Hung
dd1756f22b Merge changes from topics "dra", "dts_uhd", "earc" am: b76d8e27fb am: 0b58fe1496
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692146

Change-Id: Ia8f84c5c03dbf91fafc822ce2b1ef8480f104b7d
2021-04-30 21:28:36 +00:00
Andy Hung
ebb8be17c4 audio: Add device constants for HDMI EARC am: 1f90e1fbf8 am: a21b9b5d4e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690703

Change-Id: I3b2bc500ca14d75ba1d0a6cc04ae6dc8784ae241
2021-04-30 21:28:35 +00:00
Andy Hung
6edb870022 Audio: Add AUDIO_FORMAT_DTS_UHD am: 3c5fcc51f5 am: 24556f0dfe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692125

Change-Id: Iee1f48feeb4e067daef3e46a94145c60a34a33af
2021-04-30 21:28:33 +00:00
Paul Crowley
08e40ff4cc Merge "Add getKeyCharacteristics method to KeyMint" am: 8b25958b75
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690690

Change-Id: Ica0fbedf8332f3af13ee78c9275e01c4108ee1e0
2021-04-30 21:13:48 +00:00
Paul Crowley
8b25958b75 Merge "Add getKeyCharacteristics method to KeyMint" 2021-04-30 21:06:14 +00:00
Andy Hung
0b58fe1496 Merge changes from topics "dra", "dts_uhd", "earc" am: b76d8e27fb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692146

Change-Id: Iab845c4dacfda0ad2cf7ee09f5ba11cb27bdad8c
2021-04-30 20:52:45 +00:00
Andy Hung
a21b9b5d4e audio: Add device constants for HDMI EARC am: 1f90e1fbf8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690703

Change-Id: I6864929c56bfa777773e1388e75a68e2f30b7a68
2021-04-30 20:52:06 +00:00
Andy Hung
24556f0dfe Audio: Add AUDIO_FORMAT_DTS_UHD am: 3c5fcc51f5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1692125

Change-Id: Iaf2ae912dbae320ebaa8953b9fee0c8d2bae31f9
2021-04-30 20:51:24 +00:00
Andy Hung
b76d8e27fb Merge changes from topics "dra", "dts_uhd", "earc"
* changes:
  Audio: Add AUDIO_FORMAT_DRA
  audio: Add device constants for HDMI EARC
  Audio: Add AUDIO_FORMAT_DTS_UHD
2021-04-30 20:29:48 +00:00
David Drysdale
d2cc8c2c5e More KeyMint VTS testcases
Tests for:
 - non-prime RSA exponent (fails with CF KeyMint)
 - RSA exponent value of 3
 - key size > 512 for `STRONGBOX`
 - unknown tag inclusion
 - CBC input size not block size multiple
 - challenge omitted for attestation (fails with CF KeyMint)
 - import RSA key with implicit params
 - vestigial upgradeKey test
 - importWrappedKey errors
 - importWrappedKey sids ignored
 - duplicate/missing params on begin()
 - more tests for incompatible params on begin()
 - HMAC size not multiple of 8 (fails with CF KeyMint)
 - wrong size caller IV for 3DES rejected
 - too large MIN_MAC_LENGTH for HMAC
 - invalid AES-GCM minimum MAC length values
 - check failed updateAad() cancels operation
 - check that auto-generated nonces are distinct
 - (DISABLED_) invoke destroyAttestationIds()
 - omitting optional RSA keygen tags

Also add commenting to illustrate the ASN.1 structure of hex data.

Test: VtsKeyMintAidlTargetTest
Change-Id: I4663c42671cbb094ffe8d603e0352ffa9f1dbf2e
2021-04-30 19:15:39 +01:00
Paul Crowley
dadb18dd29 Add getKeyCharacteristics method to KeyMint
(cherry picked from commit 402d62f7be)

Bug: 186685601
Test: Treehugger
Merged-In: Ie72d865a37e2b6834fe6a86bf843d30286384aa5
Change-Id: Ie72d865a37e2b6834fe6a86bf843d30286384aa5
2021-04-30 10:58:31 -07:00
David Drysdale
e89f9b8e30 Merge "Test for patchlevels and too much entropy" am: b5ee70f125 am: fac02e6354
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673208

Change-Id: I94218d8a6f289a646b8f0fdc637282365f1e2f6a
2021-04-30 17:00:30 +00:00
Treehugger Robot
6ac16ced07 Merge "Add more symmetric KeyMint tests" am: 3b2b180a29 am: 232fe7792f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621103

Change-Id: I73ba552a6365e6a0807019ce4d54a3e36e079e81
2021-04-30 17:00:18 +00:00
Amy Zhang
fdeac2b2aa Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" am: ddafbe597c am: 19746b1629
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690329

Change-Id: I433eb641c0e0b97874494a7a993076c31a0d7497
2021-04-30 17:00:07 +00:00
David Drysdale
fac02e6354 Merge "Test for patchlevels and too much entropy" am: b5ee70f125
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1673208

Change-Id: I94118fa43ccaf13d87908c37eefc38a1171d8569
2021-04-30 16:44:28 +00:00
David Drysdale
b5ee70f125 Merge "Test for patchlevels and too much entropy" 2021-04-30 16:38:38 +00:00
Treehugger Robot
232fe7792f Merge "Add more symmetric KeyMint tests" am: 3b2b180a29
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621103

Change-Id: Ib3b45cf827c4eb98c008187207febe1994ba7dba
2021-04-30 16:38:15 +00:00
Amy Zhang
19746b1629 Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" am: ddafbe597c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690329

Change-Id: I45d9552ba11342b78813375cf39fd2b79df45217
2021-04-30 16:37:32 +00:00
Treehugger Robot
3b2b180a29 Merge "Add more symmetric KeyMint tests" 2021-04-30 16:30:49 +00:00
Amy Zhang
ddafbe597c Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" 2021-04-30 16:21:57 +00:00
David Drysdale
7958c3128f Merge "KeyMint AIDL tweaks" am: 07045b7e83 am: 0951649aaf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621102

Change-Id: I0f32ef2d43046e70e478d7fdea130d7f354f5bd0
2021-04-30 15:20:31 +00:00
David Drysdale
0951649aaf Merge "KeyMint AIDL tweaks" am: 07045b7e83
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621102

Change-Id: If28d092cc322392b118e5b9cf9de968b8432cc80
2021-04-30 14:58:40 +00:00
David Drysdale
07045b7e83 Merge "KeyMint AIDL tweaks" 2021-04-30 14:44:35 +00:00
David Drysdale
bb3d85eaa4 Test for patchlevels and too much entropy
Add tests for:
 - Too much entropy should be rejected with INVALID_INPUT_LENGTH
 - All authorization lists should include a vendor and boot patchlevel.

These requirements are in both the KeyMint and the KeyMaster 4.0 AIDL
specificications, but have never been policed before.

Currently disabled with a command-line flag because CF does not have
the patchlevels and so fails lots of tests.

Test: VtsKeyMintAidlTargetTest
Change-Id: Ic9622ef3f1b80e013a34059218e3e029f392eb72
2021-04-30 14:50:14 +01:00
David Drysdale
7de9febd17 Add more symmetric KeyMint tests
Also fix some test name comments along the way.

Test: VtsKeyMintAidlTargetTest
Change-Id: I828acfaa676e1b9fa2e3c6f184f9dafb936b0e82
2021-04-30 14:50:12 +01:00
David Drysdale
40eb8f53ea KeyMint AIDL tweaks
- Describe 3DES requirements
- Remove references to non-existent getKeyCharacteristics() entrypoint
- Remove references to non-existent attestKey() entrypoint
- Remove mention of asymmetric verification operations
- Remove text describing incomplete update()
- Remove text discussing padding for ECDSA
- EC keys can't encrypt/decrypt
- Force use of curve not key size for EC keys
- Drop TODO re: CBOR encoding of wrapped key
- Indicate caller-provided nonces must have correct size
- Add more reference to IKeyMintOperation
- Align parameter names with signatures
- Correct MIN_MAC_LENGTH error code
- Make CREATION_DATETIME consistently optional
- Describe use of MGF1 digest option
- Fix typos

Test: VtsKeyMintAidlTargetTest (CF)
Change-Id: Ie01b99d33be7336e872bf24a7761a3ac5b1d584c
2021-04-30 14:19:31 +01:00