Commit Graph

1116 Commits

Author SHA1 Message Date
Treehugger Robot
78b668e4a9 Merge "Add frozen: true|false to all AOSP HALs that don't have frozen" into main 2024-10-14 22:55:12 +00:00
David Drysdale
7b05efd13f KeyMint: coalesce device ID failure code
Test: VtsAidlKeyMintTargetTest
Change-Id: I7c94af96010f5c5f708f54bf02e0f85a96cece3f
2024-10-10 18:19:51 +01:00
Treehugger Robot
876f8b4392 Merge "Explicitly include libhardware_header for vendors" into main 2024-09-30 09:25:16 +00:00
Abdelrahman Daim
7c60a7a0cb Explicitly include libhardware_header for vendors
Summary: This seems to  be not implicit when building vendor, so it's now necessary to explicitly include.

Test: Succesful build on master

Change-Id: Ie9720a3ae4c9f94210bc34c60d14756c7d0cf56f
Signed-off-by: Abdelrahman Daim <adaim@meta.com>
2024-09-27 07:47:17 -07:00
Seth Moore
95b0e8beac Replace "UDS_Public" with "UDS_Pub" for consistency
Change-Id: I0d331abb7e538ac4c7e8cc966653aac38c0190d6
2024-09-18 16:24:00 +00:00
Devin Moore
33ae251c82 Add frozen: true|false to all AOSP HALs that don't have frozen
This is to prepare for enforcing a requirement of always having frozen
specified.

Test: m
Bug: 366292468

Change-Id: I2f26eb96a3a5a4ac279f665b9866bbfddbd8c496
2024-09-16 22:15:45 +00:00
Treehugger Robot
fd6b994b9d Merge "Remove trong@ from OWNERS" into main 2024-09-12 17:22:47 +00:00
Max Bires
6347dd5742 Remove trong@ from OWNERS
Cleaning up the OWNERS file for those who are no longer on the team.

Test: The ghost of trong@'s account cannot approve changes in this
repository
Change-Id: Ib777c16b53691f82de5bea33bd3cc363a8720982

Change-Id: I6c2bcdbfc6177b5d8e9416a5b93edf7e5e8a2b5b
2024-09-12 15:23:31 +00:00
Karuna Wadhera
e2346b7a13 Merge "Revert "Revert "Optionally (dis)allow degenerate DICE chains in ..."" into main 2024-09-11 13:06:14 +00:00
Karuna Wadhera
6a0dd7014d Revert "Revert "Optionally (dis)allow degenerate DICE chains in ..."
Revert submission 3260534-revert-3254876-disallow_degenerate_chains-RZRFZAKDEJ

Reason for revert: Breakage fixed

Reverted changes: /q/submissionid:3260534-revert-3254876-disallow_degenerate_chains-RZRFZAKDEJ

Change-Id: I972b9b0cae932cc39be3f8d44ac59f82e878ca53
2024-09-10 22:41:53 +00:00
Tommy Chiu
b501642820 Correct the UDS_pub source
The UDS_pub is supposed to be the first element of DiceCertChain
according to generateCertificateRequestV2.cddl.

Bug: 365711214
Test: rkp_factory_extraction_tool
Change-Id: I454a99058d92ce9743810a9334c7ccacccc694e0
2024-09-10 10:15:47 +00:00
Priyanka Advani (xWF)
704df56108 Merge "Revert "Optionally (dis)allow degenerate DICE chains in verifyCsr"" into main 2024-09-09 20:57:18 +00:00
Priyanka Advani (xWF)
ebc265f0bc Revert "Optionally (dis)allow degenerate DICE chains in verifyCsr"
Revert submission 3254876-disallow_degenerate_chains

Reason for revert: Droidmonitor created revert due to b/365592588.

Reverted changes: /q/submissionid:3254876-disallow_degenerate_chains

Change-Id: I31f78d6c708f34f0a6fe9f54daef82981a91ac8f
2024-09-09 20:44:24 +00:00
Karuna Wadhera
f3d44a7bac Merge "Optionally (dis)allow degenerate DICE chains in verifyCsr" into main 2024-09-09 18:18:27 +00:00
Karuna Wadhera
39de0cb35b Optionally (dis)allow degenerate DICE chains in verifyCsr
Bug: 323246910
Test: atest libkeymint_remote_prov_support_test & manual testing of
 `rkp_factory_extraction_tool` with/without `allow_degenerate=false` on a
 device with a degenerate DICE chain
Change-Id: Ia1833c0bb6a895ae5b8aefea24850a41cf956f38
2024-09-06 19:10:04 +00:00
Kiyoung Kim
4a518d2e1e Reapply "Define vintf_fragments as modules"
Previous commit was reverted as it removed wifi vintf fragment from
devices, which was caused by 'no_full_install' property from
vintf_fragment module. This change relands the change, with removing
no_full_install property from the vintf_fragment module

Bug: 322089980
Test: aosp_cf_x86_64_phone build succeeded
Test: mokey_go32 build contains
/vendor/etc/vintf/manifest/android.hardware.wifi.supplicant.xml file

Change-Id: I523ce570068b180805b65f984a0d6def0612db87
2024-09-04 15:55:29 +09:00
Treehugger Robot
bee59e3b47 Merge "Revert "Define vintf_fragments as modules"" into main 2024-08-30 15:58:23 +00:00
Greg Kaiser
3892274102 Revert "Define vintf_fragments as modules"
This reverts commit cf0a2dd5b0.

Reason for revert: b/363215494, breaks WiFi for at least some devices

Change-Id: I5137957087dde51c0049416404f410f53dd912f3
2024-08-30 14:07:37 +00:00
Kiyoung Kim
71af7d2bfe Merge "Define vintf_fragments as modules" into main 2024-08-30 08:26:49 +00:00
Karuna Wadhera
69a761318f Merge "Pass in allow_any_mode when verifying DICE chains" into main 2024-08-28 14:03:19 +00:00
Pranav Garg (xWF)
f74d274807 Fixing isDeviceIdAttestationRequired to require both cases instead of just one
Bug: 356536705

Change-Id: I15326e68fc2ea1ce9a2dfbe7498790900ebb43e4
2024-08-27 18:36:15 +00:00
Karuna Wadhera
eabdb6edf0 Update getDiceChainKind for VSR >15
Bug: 346861728
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I8698663c29c8d91e7b39ca02e588b87377356363
2024-08-26 12:25:04 +00:00
Karuna Wadhera
ca6d8cce51 Pass in allow_any_mode when verifying DICE chains
1. allow_any_mode is set as true when the VM RKP instance is being
   tested (since the bootloader is unlocked for VTS tests and therefore
   the VM DICE chain will necessarily have at least one non-normal
   mode.)
2. allow_any_mode is set as true for non-user type builds.

Bug: 318483637
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: I15ec3ad32f08eecd8478df14f8efa71fdb0b5d08
2024-08-22 18:48:58 +00:00
Yi Kong
99df7ced5d security: Remove unnecessary std::move
Moving a temporary object prevents copy elision, and could reduce
performance.

This fixes -Wpessimizing-move compiler warning.

Test: presubmit
Bug: 154270751
Change-Id: I378f1b9029f1a0711728ff14e4071263ad330504
2024-08-14 01:56:18 +08:00
Kiyoung Kim
cf0a2dd5b0 Define vintf_fragments as modules
Define vintf_fragments as modules if the file is shared among multiple
modules to avoid any conflicts.

Bug: 322089980
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: I1d00623e3e6da6bb787a152d81eb94822153388f
2024-08-12 15:31:10 +09:00
Tommy Chiu
2027a9b597 Update the UdsCertChain comment to reflect the latest recommendation.
Bug: 331136391
Test: comment update only
Change-Id: I72f45c85d106d87fcd4c56d4c4fa86eb1af8f5a7
2024-08-07 07:10:57 +08:00
Karuna Wadhera
550caafbfd Merge "Amend tests on GSI that rely on RKP-only props" into main 2024-07-17 14:28:45 +00:00
Karuna Wadhera
0c5b6503ed Amend tests on GSI that rely on RKP-only props
GSI replaces the values for remote_prov_prop properties (since they’re
system_internal_prop properties), so on GSI the properties are not
reliable indicators of whether StrongBox/TEE are RKP-only or not.

Also included is the removal of the helper skipAttestKeyTestIfNeeded()
so the skipping can happen in the tests directly.

Bug: 348159232
Test: VtsAidlKeyMintTargetTest
Change-Id: I2075e1f76ddd0f87620a212e1aa389803139a117
2024-07-17 12:41:51 +00:00
Akhilesh Sanikop
aae715f927 Updated fuzz_config in Android.bp file
Added fuzz_config and its fields like - cc, componentid,
hotlists, description, vector, service_privilege,
users & fuzzed_code_usage.

Bug: 306435930
Test: Build the updated fuzz targets

Change-Id: Ib537f4c4c98860de431e33dedbd106930cf8e45a
2024-07-16 16:17:20 +05:30
Akhilesh Sanikop
ee2196d155 Added keymint_rkpsupport_fuzzer
exec/s: 30
Test: ./keymint_rkpsupport_fuzzer
Bug: 337985606

Change-Id: Ib6955d188351ce3fc598a0f27ad626f718d542b8
2024-07-03 15:07:54 +05:30
Akhilesh Sanikop
ddbaa66bbc Added keymint_remote_prov_fuzzer
exec/s: 12
Test: ./keymint_remote_prov_fuzzer
Bug: 337985606

Change-Id: Ifaa5c32616904c1aa5b6d8a21c566a014ed882cf
2024-07-03 15:07:33 +05:30
Treehugger Robot
6435b744d7 Merge "Add NID_secp384r1 support on parsing UDS public key" into main 2024-07-02 03:01:51 +00:00
Tommy Chiu
10ee304f01 Add NID_secp384r1 support on parsing UDS public key
It used to be hard coded to secp256.

Bug: 330791928
Test rkp_factory_extraction_tool64

Change-Id: I759d94a7112bb9fb50906b8e0d45b851f82c898f
2024-07-02 02:01:29 +00:00
Treehugger Robot
af7df71799 Merge "Fix invalid access on nullptr" into main 2024-07-01 21:29:05 +00:00
Tommy Chiu
2165de0046 Fix invalid access on nullptr
Should return when there's no content be parsed.

Bug: 330791928
Test: rkp_factory_extraction_tool64
Change-Id: I45302ec20a0a931d2f44a7e36f613858c10fe21e
2024-07-01 06:43:30 +00:00
Shikha Panwar
578eae1d52 Merge "Vts: New dice_policy_builder api with TargetEntry." into main am: adad97cb79
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3127995

Change-Id: If79596e0661aad7485ce3dee42f7f5067d94c83b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 08:59:55 +00:00
Shikha Panwar
adad97cb79 Merge "Vts: New dice_policy_builder api with TargetEntry." into main 2024-06-14 08:54:39 +00:00
Shikha Panwar
d530f7e39b Vts: New dice_policy_builder api with TargetEntry.
The policy building library changes in aosp/3125493, accordingly change
the function call. This does not change the behaviour or test coverage
of VTS.

Test: atest VtsSecretkeeperTargetTest
Bug: 291245237
Change-Id: I21a7b0abe5bf186893ec9a68bb080b41778d3313
2024-06-13 14:55:51 +00:00
David Drysdale
e10b12929c Merge "KeyMint: version gate attestation of IMEI2" into main am: 54db6b2214
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3125954

Change-Id: I0f73da5fbf1274e8555f493d3b408f9b29fbb963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 10:19:30 +00:00
David Drysdale
e9dcae53e4 KeyMint: version gate attestation of IMEI2
aosp/3106417 added extra tests with for device ID attestation, but
didn't include a version gate for attesting to the second IMEI value,
which is only present in KeyMint v3+.

Test: VtsAidlKeyMintTargetTest
Change-Id: I95f47942058781709efe96d38442e0518e39705d
2024-06-11 15:43:12 +01:00
David Drysdale
acb80cfdf2 KeyMint: add VTS test with all IDs am: ef1123b24e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3106417

Change-Id: Icfc31847731c3ca48492234751033d4be8ada033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 12:19:59 +00:00
David Drysdale
ef1123b24e KeyMint: add VTS test with all IDs
Add a test that includes all of the device IDs for attestation, which
helps to check whether the emitted extension is including everything in
the correct order.

(This is already tested in CTS since aosp/2650044)

Also fix test of first API level to use `get_vsr_api_level` helper.

Test: VtsAidlKeyMintTargetTest
Test: with/without KeyMint hacked to emit tags in wrong order
Change-Id: Ic6e489aa99c773d794ad8cbddbe5153b1a145ea5
2024-05-31 12:05:04 +01:00
Treehugger Robot
14ae5a614b Merge "Added keymint_authSet_fuzzer" into main am: 7884619140
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3066744

Change-Id: I9e5ef4c4fabd7025f49829dcc6d1982342685920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 08:41:50 +00:00
Treehugger Robot
7884619140 Merge "Added keymint_authSet_fuzzer" into main 2024-05-28 08:24:05 +00:00
Treehugger Robot
6707c6716b Merge "Added keymint_attestation_fuzzer" into main am: 02a086bdaa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3066743

Change-Id: Id5c46cf92626e9f9ee13c3644b0128306dc09281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 07:02:14 +00:00
Treehugger Robot
02a086bdaa Merge "Added keymint_attestation_fuzzer" into main 2024-05-28 06:45:29 +00:00
Xin Li
64e598ce2b Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I53a278f1317f5307441103dc42dc5be6f20d7075
Change-Id: I3a53ebf7339cdb886d3c1b733b8eee1847f8832a
2024-05-24 08:28:04 -07:00
David Drysdale
fd7119ea67 Merge "Delete standard output in VtsAidlKeyMintTargetTest" into main 2024-05-17 05:59:57 +00:00
Alice Wang
46ff286f6d Run VtsHalRemotelyProvisionedComponentTargetTest only on V+ devices
Bug: 340188780
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Id20a01b23324eb46620d96bd29c30b8cf9acd162
2024-05-15 15:27:26 +00:00
Huang Rui
ca3ea117ef Delete standard output in VtsAidlKeyMintTargetTest
The Done flag of VtsAidlKeyMintTargetTest is false during running
the module with ‘--collect-tests-only’ because it uses standard
output to print logs.

Bug: 340576534
Test: run vts -m VtsAidlKeyMintTargetTest --collect-tests-only

Change-Id: I3d81f7e59b6189fab1b146320263509f2694c11e
Signed-off-by: Huang Rui <rui1.huang@intel.com>
Signed-off-by: Liu Kai <kai1.liu@intel.com>
2024-05-15 11:42:59 +01:00