Jiyong Park
7faedf81a0
Merge changes from topic "aidl_freeze_tm" into tm-dev
...
* changes:
Implement getInterfaceHash/Version for SoundTrigger
Add -Wno-missing-permission-annotation for soundtrigger3
V3 is the latest version of keymaster HAL interface
Freeze AIDL APIs for TM
2022-04-02 00:15:20 +00:00
Eran Messeri
f9b12ac72a
Merge "KeyMint: Device IDs attestation based on verion." am: 1b7abc43b6 am: d8fdf0b804 am: 8adaed5f62
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2028224
Change-Id: I2937358195e0218cf7337b989686f649b7e82d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-31 14:53:49 +00:00
Jiyong Park
703e97920e
Freeze AIDL APIs for TM
...
Bug: 225941299
Test: m
Change-Id: Ie41cc0797710f813f92c65c387f247c7806d8394
2022-03-31 12:01:39 +09:00
Prashant Patil
88ad189036
KeyMint: Device IDs attestation based on verion.
...
Updated VTS testcases where Device IDs Attestation expected as optional
and made it mandatory if KeyMint version >= 2 or device first shipped
with api_level 33.
Bug: 221190197
Test: run vts -m VtsAidlKeyMintTargetTest
Change-Id: I8870a9301d36abdc4fa6585b9f8d62cc1cfd3d96
2022-03-25 12:16:11 +00:00
Treehugger Robot
d31d3b8554
Merge "Updated the vts attestation tests for strongbox implementations which do not support factory attestation." am: 950b7b8026 am: cc399cf7b0 am: af1490f3f7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2027803
Change-Id: I07f19f0c03955d3931842688d8a2ee31dbf174cf
2022-03-24 17:59:41 +00: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
0286ec5699
Merge "Fix CDDL for signatures." am: 1edd38d6ee am: 3303e97603 am: 08835aaa3d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2036743
Change-Id: Iaf829618dc93488ac3db71e6c7bab37830295ea7
2022-03-22 17:41:54 +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
895ae687e6
Merge "KeyMint VTS: strict test only for v2+" am: d057fc0cb6 am: 1f0d75f1f8 am: 3056221f7c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2033925
Change-Id: I2783a11812212640bbca13a8fd0faadba57e7103
2022-03-22 10:25:29 +00:00
David Drysdale
f371c5eac7
Merge "KeyMint HAL: clarify ATTEST_KEY is like SIGN" am: afa73442b7 am: bbbc278300 am: be65672ee4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2033928
Change-Id: I49d1939007b771ad90fed66b475d3034272ff291
2022-03-22 10:25:12 +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
Max Bires
c8d296af83
Merge "More canonicalization checks and canonicalize before signing" am: cf02e97946 am: 8daddefc18 am: 59624afdce
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2029343
Change-Id: Ia1ceaa34fdbcf2d20690e1cc447321bdf3b40856
2022-03-21 17:35:21 +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
Tri Vo
06d5f095be
Merge "KeyMint VTS: Expect empty key if boot state unverfied" am: a26f8cb316 am: 39f920bae3 am: c18ed24712
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2014678
Change-Id: I877572dcb311c4c83f4effb4e0dbdec38ebee5bc
2022-03-18 18:56:57 +00:00
Tri Vo
a26f8cb316
Merge "KeyMint VTS: Expect empty key if boot state unverfied"
2022-03-18 18:14:31 +00:00
Janis Danisevskis
500f3e0436
Merge changes from topic "default_dice_hal" am: 49a1688f5e am: 0b05aae7dc am: 2c90fb249d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1896435
Change-Id: Ic00ebe42a30cfa7bff9e229d07f91bb2ec4c3698
2022-03-16 21:17:13 +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
c2387a1d5a
Merge "Revert "KeyMint VTS: add TEST_MAPPING"" am: 83e3bffe66 am: 0918368cf8 am: 85b06d9590
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2028363
Change-Id: Ife7fefb8c11e694a0a36340ddab12851e34ce09d
2022-03-16 12:54:23 +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
c477499208
Merge "KeyMint VTS: add TEST_MAPPING" am: 7f366ab5dd am: 4c1b6dfb23 am: 36f58e6c98
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1879916
Change-Id: Ic2d9051445575fce6e451d9919d07a4fd42d3211
2022-03-16 08:06:38 +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
David Drysdale
836e79fb72
Merge "Prevent test crashes if device sets invalid curve" am: ceedbb0d1a am: cd2af34d63 am: 590665c1b9
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2020155
Change-Id: I21eff3e3f3af55b2041b739dc7e0d8342df25599
2022-03-15 08:53:59 +00:00
David Drysdale
ceedbb0d1a
Merge "Prevent test crashes if device sets invalid curve"
2022-03-15 07:35:02 +00:00
David Drysdale
79972e7645
Merge "Key{Mint,Master} VTS: fix incremental AES tags" am: e5c2bf01fc am: 523b300da7 am: a219992eef
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2020421
Change-Id: I771b72b5f4f439c8b6eea264010b90f0efa876a8
2022-03-14 17:02:36 +00:00
David Drysdale
e5c2bf01fc
Merge "Key{Mint,Master} VTS: fix incremental AES tags"
2022-03-14 15:45:28 +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
0b549805f9
Merge "remote_prov_utils: Add instance name in the JSON output" am: 3192a09b11 am: a91e17ed66 am: 6cc8d07a64
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2017795
Change-Id: I3d2764f804934140791824c2a747aced9b0199f8
2022-03-11 14:23:18 +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
059a030d48
Merge "Update the default KeyMint version" am: 7fc756ee1a am: e3e82c9d53 am: d6ef5852b5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2020439
Change-Id: I667fba98f44d4f2b6d8e7d7487c83fd83e78e2a9
2022-03-11 00:26:17 +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
David Drysdale
824f48e621
KeyMint VTS: check for relevant devices am: 1585fdceb5 am: 4e3b4590c9 am: b96f3a4099
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2013077
Change-Id: I593e54aff83abc22b3749075b114595363af8e4d
2022-03-09 11:24:52 +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
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
Treehugger Robot
04fc0c4fb2
Merge "Split AESincremental VTS test into 4 Tests(For blockmodes-ECB,CBC,GCM,CTR)" am: 90019d46c2 am: bfdd991c76 am: 8be10ddce6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2007030
Change-Id: Iffe169fcff0a11478672bf8f5895a93fcdcc9003
2022-03-04 18:50:47 +00:00
anil.hiranniah
19a4ca17ea
Split AESincremental VTS test into 4 Tests(For blockmodes-ECB,CBC,GCM,CTR)
...
Change mentioned above is done in VTS for Keymaster4.0
and Keymint
Test: VTS tests with tradefed
Change-Id: Id62fdce65131ee00c88e5849955a937f1c171748
2022-03-03 18:02:04 +05:30
Treehugger Robot
4553efd422
Merge "Support for P256 curve in RKP for Strongbox Test: Run Rkp Vts tests." am: 55419fd935 am: 3b6c35b95e am: df05e41148
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1969799
Change-Id: I7a8bc93b7f4d8a391c86c1b9cc6f4bd88a9ee759
2022-03-02 12:53:20 +00:00
Treehugger Robot
55419fd935
Merge "Support for P256 curve in RKP for Strongbox Test: Run Rkp Vts tests."
2022-03-02 11:45:05 +00:00
David Drysdale
92ffa6384e
KeyMint VTS: fix fixture setup name am: 795f758780 am: 85ce9e2530 am: 77a0eb6d63
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2003891
Change-Id: I10373d673da1d3d2e24cff7d28551b9f60eb0605
2022-03-01 17:05:16 +00:00
David Drysdale
7e71fcf852
KeyMint VTS: add TEST_MAPPING
...
Test: TreeHugger
Change-Id: If4e19f189a3cd58e143672a562837365d78da69d
2022-03-01 16:41:52 +00:00