Treehugger Robot
d87f909dc3
Merge "Support to get EC public key from the UdsCertchain." am: 1acca5c139 am: 8426045977 am: 7bfabde3fc
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2615472
Change-Id: I4416b43432519db134e1f26e759bfc74e566c1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 20:04:25 +00:00
Treehugger Robot
1acca5c139
Merge "Support to get EC public key from the UdsCertchain."
2023-06-14 17:38:22 +00:00
Subrahmanyaman
a18883a58c
Support to get EC public key from the UdsCertchain.
...
Bug: 285896470
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I7f829b1346feeab0fd429ad7b9714181b6668b34
2023-06-12 17:29:38 +00:00
David Drysdale
6a7f8f3320
Merge "Use RAII to ensure KeyMint keyblobs deleted" am: 462eccaa3b am: 15bc932a09 am: 8eac8ba511
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2617612
Change-Id: I70a7a9ddfd5e62cd674f9d202dbb098224a439e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-08 12:02:16 +00:00
David Drysdale
1b9febc5ca
Use RAII to ensure KeyMint keyblobs deleted
...
If some check in a VTS test case fails, the test function may exit early
and not call CheckedDeleteKey(&some_keyblob), thus "leaking" a key blob.
This isn't normally an issue, but if the key blob happens to use a
feature that uses some secure storage (e.g. ROLLBACK_RESISTANCE or
USAGE_COUNT_LIMIT=1) then this may leak some scarse resource.
To avoid the chance of this, use an RAII holder to ensure that
manually-managed keyblobs (i.e. key blobs that are not held in the
key_blob_ member of the base test class) are always deleted.
Bug: 262212842
Test: VtsAidlKeyMintTargetTest
Change-Id: Ie8806095e249870484b9875eb660070607f339a3
2023-06-07 15:46:42 +01:00
David Drysdale
3aff152024
Merge "KeyMint: more authentication tests" am: 130e32ad5f am: 524f7607df am: b32416e8c8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2615470
Change-Id: Id07e2638aed619eee8037c6852b9c4785d4de69d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-06 11:55:39 +00:00
David Drysdale
de2a493b9a
KeyMint: more authentication tests
...
- Test key with multiple allowed SIDs
- Test invalid timestamp token
Test: VtsAidlKeyMintTargetTest
Change-Id: Ieb18d43d8c2db821d32857a332a0a68917b1eba4
2023-06-05 15:02:30 +01:00
Treehugger Robot
74634c2db5
Merge "Extend QC SPU waiver to VSR-S devices." am: 3258884207 am: f25e3b2bcb am: 2415be97e3
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2609268
Change-Id: I41cbb8d74e4fb5e3a09fce966b63a63c0da4625a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 21:59:04 +00:00
Treehugger Robot
7589384303
Merge "Rewrite RKP readme in terms of DICE" am: 139b663e38 am: e8821b0fd6 am: aae23ac225
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2597060
Change-Id: I18230a5dc04380215a65db99f49ca8ce8ba3b26e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-01 21:57:56 +00:00
Treehugger Robot
3258884207
Merge "Extend QC SPU waiver to VSR-S devices."
2023-06-01 19:39:19 +00:00
Shawn Willden
0f1b257f96
Extend QC SPU waiver to VSR-S devices.
...
Bug: 281452355
Test: VtsAidlKeyMintTargetTest
Change-Id: I9fc1d1f9a3b5b29cfee3ad325bc1c4ef72c44c13
2023-05-31 10:22:54 -06:00
Andrew Scull
99cba0640d
Rewrite RKP readme in terms of DICE
...
Update the RKP readme to match contemporary philosophy about the design.
This includes replacing discussion if the obsolete term `BCC` with a
description of the Android Profile for DICE.
The privacy concerns are relaxed to match updates to the HAL which
remove the superencryption of the DICE chain.
Test: n/a
Fix: 281755202
Change-Id: I3a6fd2cd12599c5843b5dce0044eb16c2afbffa2
2023-05-23 21:08:29 +00:00
Andrew Scull
d49d16a7f3
Merge "Require the config hash" am: 122b4986d4 am: a45d765922 am: e204f73890
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2587808
Change-Id: Ib06a2441034b42f2126bf282856331729aa8eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-17 00:18:28 +00:00
Andrew Scull
122b4986d4
Merge "Require the config hash"
2023-05-16 21:19:24 +00:00
Andrew Scull
790b5d23dd
Merge "Add security version to config descriptor" am: 1d23120bad am: abf2969751 am: 411d1dcc5d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2587032
Change-Id: I90070b3a444e6d25b45e4362b45240da6cd5669c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 00:20:41 +00:00
Andrew Scull
1d23120bad
Merge "Add security version to config descriptor"
2023-05-15 22:43:39 +00:00
Treehugger Robot
f7ca2c881d
Merge "VTS: Test specifying --expect_upgrade {yes,no}" am: 434a0cc160 am: 9715eb7117 am: 239b468f30
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2588687
Change-Id: I0d2c43aaf6ac295f7f1f824efe5045c886b29beb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 11:19:42 +00:00
Treehugger Robot
434a0cc160
Merge "VTS: Test specifying --expect_upgrade {yes,no}"
2023-05-15 09:11:41 +00:00
Tommy Chiu
025f3c5acd
VTS: Test specifying --expect_upgrade {yes,no}
...
It should definitely be the case that a different SPL triggers key
requires upgrade, but the converse isn't true -- if no SPL change, it's
OK for the device to request upgrade anyhow.
Bug: 281604435
Change-Id: Ic03ce51fb4b18ff669595ab430f9fccd1da48997
2023-05-15 07:23:27 +00:00
Andrew Scull
b804354851
Require the config hash
...
Align with the Open Profile for DICE by requiring that the configuration
hash be included because the configuration input is a hash of the
specified configuration desscriptor.
Test: n/a
Change-Id: I9d2ef560dc8e6f567b5b8d1a244f5138c45ae420
2023-05-14 23:24:25 +00:00
Andrew Scull
0d520e8e17
Add security version to config descriptor
...
Introduce a field to the configuration descriptor that provides a
standard semantically-defined version number rather than the
vendor-defined component version which acts more like a build ID.
Test: n/a
Bug: 282205139
Change-Id: Idb0c991ab12ae75687236f2489e639e4422a0225
2023-05-13 21:17:07 +00:00
Treehugger Robot
6b9a329637
Merge "Remove recommentation of non-normal mode" am: a0f28846c4 am: fbc43248ed am: 763b04373a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2586968
Change-Id: I1af977dfb7a19222bfbb6b1729ad07f84f6b2a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:03:19 +00:00
Treehugger Robot
a0f28846c4
Merge "Remove recommentation of non-normal mode"
2023-05-12 22:21:51 +00:00
Andrew Scull
9da6cf1319
Remove recommentation of non-normal mode
...
Only specify the requirements for `normal` DICE mode and allow vendors
to choose the non-normal mode that fits their need per the ope-dice
specification.
Add a note that RKP required `normal` mode in the DICE chain in order to
trust the device.
Test: n/a
Bug: 263144485
Change-Id: Iaaa3799c53234de61a51ebc855822b93ab3e5bb8
2023-05-12 19:36:22 +00:00
Treehugger Robot
ef1d68d6b1
Merge "KM VTS test fix - handled "null" value for imei." am: 95ec2cdd2f am: 6b4a8807a5 am: 64369644bb
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2584850
Change-Id: Ic35998f7b4ed7e445012d4ed71cd377bb5a95724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 04:18:02 +00:00
Treehugger Robot
95ec2cdd2f
Merge "KM VTS test fix - handled "null" value for imei."
2023-05-12 02:44:22 +00:00
Andrew Scull
464f6fba31
Merge "Document expectations of DICE mode" am: ebcdcdbc03 am: ad2adbcb6f am: c71526cd1c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2583537
Change-Id: I38cd7ee77039cd53e6f5ea448ecdcea28fb3ad99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 03:00:53 +00:00
Andrew Scull
ebcdcdbc03
Merge "Document expectations of DICE mode"
2023-05-10 00:53:08 +00:00
Andrew Scull
ed74a681eb
Document expectations of DICE mode
...
The Open Profile for DICE give possible guidelines on the requirements
for the DICE mode but Android needs those to be strictly specified.
Fix: 263144485
Test: n/a
Change-Id: Ia5fc937654504199cabf4709f1c15484242e0161
2023-05-09 18:34:11 +00:00
Rajesh Nyamagoud
71d19b21c3
KM VTS test fix - handled "null" value for imei.
...
Added a check to make sure IMEI is not "null".
Bug: 281676499
Test: atest VtsAidlKeyMintTargetTest
Change-Id: Ia1569a30412d633eee4d4de8cd00dea077d1c23d
2023-05-09 17:23:02 +00:00
Tri Vo
9aad35fa97
Merge "Test cases for attested Root-of-Trust" am: 67567baf94 am: de5d2be299 am: a483e7bd70
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2576910
Change-Id: Id0a3de5ac79f2947c756ff8a9c36bc56d09082c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 19:11:54 +00:00
Tri Vo
67567baf94
Merge "Test cases for attested Root-of-Trust"
2023-05-05 17:07:39 +00:00
Tri Vo
520a95bc31
Test cases for attested Root-of-Trust
...
Add tests for verfied boot state and VBMeta digest.
Bug: 255344624
Test: VtsKeyMintAidlTargetTest
Change-Id: I4f0697e1a7cb83ca87150b6683cac3084a593864
2023-05-05 10:04:39 -07:00
Hasini Gunasinghe
4d14f24928
Merge "Challenge is expected in timestamp token in case 2" am: 51471dcfce am: aa54976ba4 am: 86a83243ec
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2574790
Change-Id: I36b53c635b8c3a288c20fd16e31df808ce837e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-04 17:32:03 +00:00
Hasini Gunasinghe
51471dcfce
Merge "Challenge is expected in timestamp token in case 2"
2023-05-04 15:21:15 +00:00
Hasini Gunasinghe
77819bb988
Challenge is expected in timestamp token in case 2
...
In the second case out of the two cases of authorization enforcement
described for update(), it seems like the challenge is expected in
the timestamp token.
Test: N/A
Change-Id: I33e1b84bf8218335665b31ca144b3b4ecb342328
2023-05-03 22:33:30 +00:00
Max Bires
929c88fd70
Merge "Support for non-factory attestation in Strongbox." am: c4f05e81e0 am: 41f750ff37 am: 0ca0cd5c87
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2553970
Change-Id: I680f41959d83d5569b60b5f74930b8c85505bd73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-03 18:22:49 +00:00
Max Bires
c4f05e81e0
Merge "Support for non-factory attestation in Strongbox."
2023-05-03 16:05:49 +00:00
Treehugger Robot
7f17abc28a
Merge "Strongbox may not support 1024 bit key size for RSA." am: 453ec12115 am: cde000ed4b am: 9949e31f36
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2573531
Change-Id: I47e0856e0ab557075abaa8be335fef728a6092f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-02 17:48:09 +00:00
Treehugger Robot
453ec12115
Merge "Strongbox may not support 1024 bit key size for RSA."
2023-05-02 15:39:50 +00:00
Subrahmanyaman
ce2bebdd79
Strongbox may not support 1024 bit key size for RSA.
...
Strongbox may not support 1024 bit key size for RSA.
So in NoUserConfirmation test updated the key size to
2048 so that the test works for both TEE and Strongbox.
Bug: 280117495
Test: run VtsAidlKeyMintTarget
Change-Id: I32bb28001aca9b69eedb1bd3d0bcff43052d06e4
2023-04-28 23:37:02 +00:00
Seth Moore
82c8f1f895
Merge "Add VSR annotations for RKP DICE" am: 5fc0168163 am: 68af3d71f8 am: 802a456489
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2568770
Change-Id: I25f29ea8963f558924da0d84f38d2cfd6971049d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-28 00:56:57 +00:00
Seth Moore
5fc0168163
Merge "Add VSR annotations for RKP DICE"
2023-04-27 22:05:36 +00:00
Seth Moore
ac1639f227
Add VSR annotations for RKP DICE
...
Bug: 277965670
Test: n/a (comment changes only)
Change-Id: I64e34c1f9865811f0967148cad914f7ef77f9448
2023-04-27 11:15:28 -07:00
Subrahmanyaman
50fcf7d066
Support for non-factory attestation in Strongbox.
...
Updated the BootLoaderStateTest for strongbox implementations which
do not support factory attestation.
Test: vts -m VtsAidlKeyMintTarget
Change-Id: I8fe176a18fc0b9e2b2d0b012b7b63124d15c9e2f
2023-04-26 18:58:03 +00:00
Andrew Scull
d029c3cc70
Merge "Strictly deprecate IRPC test mode key generation" am: 29b1d626ba am: 67b98a3a24 am: 6a4ab98db1
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2559010
Change-Id: I6806f9c75ee1a0378d9a43379745e188f08dfb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-25 14:41:50 +00:00
Andrew Scull
f2ae193680
Strictly deprecate IRPC test mode key generation
...
It's already documented that IRPC v3 doesn't make use of test mode keys
however VTS still required support for their generation. Fix this and
simplify implementation of the v3 HAL by expecting an error in all cases
that the deprecated test mode keys are seen.
IRPC v3 also fully deprecated the EEK meaning a v3 implementation must
unconditionally report CURVE_NONE for supportedEekCurve.
The VTS tests are enhanced with contextual version constants rather than
reusing constants with seemingly unrelated names.
Bug: 278013975
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I5709a0b1cd77eb28e677f64bb781fad58d91570a
2023-04-24 20:23:48 +00:00
Treehugger Robot
3e925253ad
Merge "Add checks for different size of challenge" am: a95f69da2e am: 15ffcaf669 am: 6b32036b41
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2495456
Change-Id: Iab818789f86cf498e40a4e6fb2f592b7be7d9822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 05:43:33 +00:00
Treehugger Robot
a95f69da2e
Merge "Add checks for different size of challenge"
2023-04-17 04:20:54 +00:00
Treehugger Robot
9d9af1049a
Merge "Allow uninstantiated BootloaderStateTest" am: d83eed2fe3 am: cfc708d3ef am: d5663b9625
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2535086
Change-Id: I43e8c83658920718a9a7588ea8ab195cdd6d6f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 23:04:26 +00:00