Treehugger Robot
6bae1ffa05
Merge "Only require RKP on T+ chipsets" into main am: 7bed173e4c am: ba6ec44f84
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727994
Change-Id: Iaf4ad7c57cb2737c09e7b6dc6f37835fc7fd3784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 20:32:25 +00:00
Treehugger Robot
7bed173e4c
Merge "Only require RKP on T+ chipsets" into main
2023-08-25 19:08:06 +00:00
Seth Moore
8be875e0d0
Only require RKP on T+ chipsets
...
It turns out we had a bug (b/263844771) in how RKP support was
detected, and that was fixed. However, due to this bug, some S chipests
shipped without RKP support which is now required by the tests.
This change drops the RKP requirement from S chipsets. There should be
no new S chipsets, so this effectively grandfathers in the previous
ones that were skipped by the RKP VTS tests.
T+ tests (both VTS and other suites) will verify that RKP support is
there, so there is no gap introduced by this change.
Bug: 297139913
Test: VtsAidlKeyMintTargetTest
Change-Id: I387e5f058ada698747aac103c1745682291f2d1c
2023-08-25 11:13:41 -07:00
Treehugger Robot
9c2906faf8
Merge "Fix typo in CDDL" into main am: ee6590ef2d am: 0e9c13a879
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727733
Change-Id: Id744ce35431075fbfa1adee5cfb0134245faab1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 10:49:03 +00:00
David Drysdale
ae86813c5e
Merge "KeyMint: fix auth test HAT" into main am: 41bbc573f7 am: 41580971d5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2727633
Change-Id: I36438eacdb76c98f5b7dfd68a4900117023a2154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-25 10:48:11 +00:00
Treehugger Robot
ee6590ef2d
Merge "Fix typo in CDDL" into main
2023-08-25 09:52:42 +00:00
David Drysdale
41bbc573f7
Merge "KeyMint: fix auth test HAT" into main
2023-08-25 09:45:42 +00:00
Alan Stokes
5004b8b5ae
Fix typo in CDDL
...
Test: N/A
Change-Id: Iba25acb24306d36c97be07987857237363654bb5
2023-08-25 09:34:35 +01:00
David Drysdale
97272d8d5f
KeyMint: fix auth test HAT
...
The test case for an auth-per-operation HAT with an invalid HMAC
is wrong -- it is re-using the previous HAT, which fails for a
different reason (has an old challenge).
Fix the test to use the HAT that's wrong in the intended way.
Bug: 297333975
Test: VtsAidlKeyMintTargetTest
Change-Id: I15fe9b0c1b53452df0f67dd44534fdb80a6c2a9c
2023-08-25 07:30:12 +01:00
Treehugger Robot
4cffb7d5bc
Merge "Use String8/16 c_str [security]" into main am: f646832675 am: 7eb27056c0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723317
Change-Id: I29ec101adb3a8ed93ee3ae16bf5e3ba471381c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-23 21:56:35 +00:00
Tomasz Wasilczyk
5c8abe9cc2
Use String8/16 c_str [security]
...
Bug: 295394788
Test: make checkbuild
Change-Id: I4dd1a43c314af087c4f8ecad3570613ed841589c
2023-08-23 18:51:57 +00:00
Andrew Scull
978ac4c851
Reference definition of the Android Profile for DICE am: 2332583ad1 am: 1be573a2d6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2717193
Change-Id: Ib7ffeb3951c25ef8299fe540fc51e3bd4e319c2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-18 16:06:24 +00:00
Andrew Scull
2332583ad1
Reference definition of the Android Profile for DICE
...
Remove the inline definition of the Android Profile for DICE and instead
reference the definition that exists alongside the Open Profile for DICE
and is now the source of truth for the profile.
Test: n/a
Change-Id: Ia71a674234be13542ad0ce4db0b764e8ee0c7a62
2023-08-18 12:39:39 +00:00
David Drysdale
b5de35ceeb
Merge "KeyMint: allow extra error code" into main am: ae8c281824 am: 338d8e99e7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2700713
Change-Id: Ic31040a372b06a08c6b6a95a11515e34a2b4c103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-16 12:02:04 +00:00
David Drysdale
ae8c281824
Merge "KeyMint: allow extra error code" into main
2023-08-16 10:20:21 +00:00
Treehugger Robot
9352d1a7c8
Merge "Add VSR annotation to KeyMint tests" into main am: a2441d9090 am: dfa27bbd75
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2690468
Change-Id: I41ab88583a326e7c9b6ef9423e64fda97fa1aff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-15 15:55:14 +00:00
Treehugger Robot
a2441d9090
Merge "Add VSR annotation to KeyMint tests" into main
2023-08-15 14:17:24 +00:00
Treehugger Robot
659f14d50e
Merge "Whenever generateKey fails updated AttestKeyTests to abort instead of continuing the execution of the test." into main am: 1452142a46 am: 28fa789357
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2676503
Change-Id: Ic07e88ca45d1a9d097e41ab80287c9db51ba43f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-15 12:59:59 +00:00
Treehugger Robot
1452142a46
Merge "Whenever generateKey fails updated AttestKeyTests to abort instead of continuing the execution of the test." into main
2023-08-15 11:30:45 +00:00
David Drysdale
84b685adf5
KeyMint: allow extra error code
...
Bug: 295055603
Test: VtsAidlKeyMintTargetTest
Change-Id: Ifbd4a899364c38bb6ad63bb5b5a683c69edfb5b7
2023-08-11 16:00:32 +01:00
Treehugger Robot
bd532381bb
Merge "Update the TimeoutAuthenticationMultiSid test" into main am: d99d7730b8 am: 96a5d15232
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2676695
Change-Id: I054264f3f5920397d66326b5f2dbedce48378a7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 15:36:12 +00:00
Treehugger Robot
d99d7730b8
Merge "Update the TimeoutAuthenticationMultiSid test" into main
2023-08-09 14:25:05 +00:00
Subrahmanya Manikanta Venkateswarlu Bhamidipati Kameswara Sri
07c7d28a84
Update the TimeoutAuthenticationMultiSid test
...
Update TimeoutAuthenticationMultiSid test to support
generateKey for Strongbox implementations without
factory attestation.
Bug: 293211157
Test: run vts -m VtsAidlKeyMintTarget
Change-Id: I27bf08d2fd2d9e0217a90ee8ccb789adfd9d5f7f
2023-08-08 22:33:37 +00:00
David Drysdale
b8749b670e
Merge "KeyMint: use a smaller invalid IMEI value" into main am: 955fb9e5fc am: da606360cc
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2694950
Change-Id: Ic4f38db75b5c07bb2652b18995559f9ecc6cb099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 11:36:32 +00:00
David Drysdale
0215cb3d3e
KeyMint: use a smaller invalid IMEI value
...
The invalid value used for the second IMEI attestation test is
potentially wrong in two ways:
- It doesn't match the provisioned value.
- It's not a valid IMEI, not least because it is longer than 16 bytes.
Make the test value shorter so the second failure doesn't apply and
the test can reliably expect CANNOT_ATTEST_IDS.
Bug: 292959871
Test: VtsAidlKeyMintTargetTest
Change-Id: If8c6b9e08b48e6caf5c767578e1ac43964214619
2023-08-07 11:53:46 +01:00
Eran Messeri
5fe06ea215
Add VSR annotation to KeyMint tests
...
Add VSR annotations for the KeyMint v2 and KeyMint v3 requirements.
Bug: 251242992
Test: N/a
Change-Id: I0cf5eff86fe18df6f567b30d697af01bc8cdbb4e
2023-08-02 22:34:24 +01:00
Rajesh Nyamagoud
45b478f32e
Whenever generateKey fails updated AttestKeyTests to abort instead of
...
continuing the execution of the test.
If generateKey fails and execution continues then it leads to issues
while verifying the attest records and causing the crash.
Test: atest VtsAidlKeyMintTargetTest
Bug: 292300030
Change-Id: I66bd650423e9e5bbbfe8411a1455c4ea5846f1ff
2023-07-26 04:49:36 +00:00
Max Bires
a7aadcfbb0
Merge "Slight documentation tweak" into main am: fe9355f3c6 am: 514ecb0613
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2663916
Change-Id: Ib71aab2e9d2f87bf79dcc13fc5f3fc21c95fd1d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-19 22:07:39 +00:00
Max Bires
fe9355f3c6
Merge "Slight documentation tweak" into main
2023-07-19 20:52:56 +00:00
Max Bires
5c0f7234b6
Slight documentation tweak
...
Specify that DICE-based RKP implementations may also allow a ROM
extension to manage the UDS public key.
Test: The words are semantically parseable
Change-Id: I8f9c6efb01fc76318220cf1bc4a0eb3a3ad42f87
2023-07-18 20:26:33 -07:00
Treehugger Robot
b0a7128cf4
Merge "Enabled attest-id tests to run on GSI builds as well." into main am: 03b140d2fb am: 07d682714b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654740
Change-Id: I81822197f2362e22b485d8b1691e29c0a75752f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-18 18:14:13 +00:00
Treehugger Robot
03b140d2fb
Merge "Enabled attest-id tests to run on GSI builds as well." into main
2023-07-18 16:39:32 +00:00
Rajesh Nyamagoud
c41ed964f0
Enabled attest-id tests to run on GSI builds as well.
...
Removed the check to skip the attest-id tests on GSI, modified the
attest-id tests to support this.
Bug: 290643623
Test: atest VtsAidlKeyMintTargetTest
Change-Id: Id79d7fb4c70ed94ed76bc57f3d66ce47e9b67b48
2023-07-12 00:12:38 +00:00
David Drysdale
5fa61b6df6
Allow extra ID attestation error codes am: c68dc93788 am: c67f8ef755 am: caaedb0a79
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646791
Change-Id: I5bbde92b1b5c8b4896cfa418200d3608080a4269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-06 12:31:59 +00:00
David Drysdale
c68dc93788
Allow extra ID attestation error codes
...
When deliberately testing invalid ID attestation, use the helper
function (which checks the error return code is correct) in one more
place.
Test: VtsAidlKeyMintTargetTest
Bug: 286733800
Change-Id: I6ea5bd7ee19b3b172330117bfde1b16745debba7
2023-07-06 10:23:55 +01:00
David Drysdale
e13d20b746
Merge "Fix attestation error checks" am: 82f86a1d4b am: 18283b6ca8 am: 286d2f7ea6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648423
Change-Id: I2a602430efb68876909246f1704a8f470f8232dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-05 07:27:36 +00:00
David Drysdale
82f86a1d4b
Merge "Fix attestation error checks"
2023-07-05 05:20:29 +00:00
David Drysdale
809a1a0205
Skip ATTEST_KEY using variant on waivered devices am: c3de1caf43 am: f2c3944f9f am: ab73150eb7
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2583373
Change-Id: Iad85e0fd9382c51d7cfa1ad997d184d14b425170
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-04 16:03:51 +00:00
David Drysdale
c3de1caf43
Skip ATTEST_KEY using variant on waivered devices
...
Bug: 281452355
Bug: 289451966
Test: VtsAidlKeyMintTargetTest
Change-Id: Id448edae88569518deb2db4ab7bf50d16f33709a
2023-07-04 13:23:04 +01:00
David Drysdale
810fbcffed
Fix attestation error checks
...
Avoid the ADD_FAILURE at the end if attestion ID failure uses an allowed
return code.
Test: VtsAidlKeyMintTargetTest
Bug: 286733800
Change-Id: I0dcac312ac4516a078b2742721e3a19074da52b1
2023-07-04 13:14:12 +01:00
Treehugger Robot
8623f8eef1
Merge "Validating key characteristics of generated/imported keys." am: 2e46e91864 am: 5250f6dc10 am: a7eae920f4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2566036
Change-Id: Ic95cbb9b4639ae993f0c877e2ce3c608c7d8b489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 19:54:17 +00:00
Eran Messeri
e743381ae8
Merge "Update default KeyMint version to 3" am: 4a7c3810fc am: e7a36fadae am: 7b1f23fe51
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2633329
Change-Id: Icfae835c4b6ed7472e7b24a780acbbcc2e568598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-29 18:42:16 +00:00
Treehugger Robot
2e46e91864
Merge "Validating key characteristics of generated/imported keys."
2023-06-29 17:34:26 +00:00
Eran Messeri
4a7c3810fc
Merge "Update default KeyMint version to 3"
2023-06-29 16:37:48 +00:00
Treehugger Robot
c8307ef9bb
Merge "Check for MGF1 digests in key characteristics." am: efb4b9397a am: 44502769e4 am: 0557be7193
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2552043
Change-Id: If43d94585c91dfe541a72c36af802d5850c9cdcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-26 19:33:46 +00:00
Rajesh Nyamagoud
7b9ae3c485
Validating key characteristics of generated/imported keys.
...
Updated VTS tests to verify mgf-digests in key characteristics of
RSA-OAEP keys. Added new tests to import RSA-OAEP keys with
mgf-digests and verified imported key characteristics.
Bug: 279721313
Test: atest VtsAidlKeyMintTargetTest
Change-Id: I06474a85c9e77fded264031ff5636f2c35bee6b4
2023-06-26 18:40:53 +00:00
Treehugger Robot
efb4b9397a
Merge "Check for MGF1 digests in key characteristics."
2023-06-26 17:22:09 +00:00
David Drysdale
5f7d0654be
Merge "Allow extra error code in device ID attestation" am: 1d7447e5d3 am: 013030d9a4 am: 36a30021e6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2627969
Change-Id: I7b6fffac2ada0e039f79bad8cc9b4d954e9c3460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-22 08:08:43 +00:00
David Drysdale
1d7447e5d3
Merge "Allow extra error code in device ID attestation"
2023-06-22 05:58:57 +00:00
Eran Messeri
8417708fe4
Update default KeyMint version to 3
...
Update the default KeyMint version to v3.
Note this affects the pure software implementation of KeyMint that is
not used for anything that tests currently run against.
Bug: 275982952
Test: m (that it builds)
Change-Id: I6ab10329af590bd2a045710dfff47c6e78740464
2023-06-21 16:11:25 +01:00