Commit Graph

1170 Commits

Author SHA1 Message Date
Orlando Arbildo
9cd2322dc9 Merge "hwcrypto: Moving hwcrypto files out of staging" into main 2024-11-28 17:56:05 +00:00
Catherine Vlasov
9caca7e7f0 Specify the expected contents of "verifiedBootKey".
Bug: 220834466
Test: n/a, comment update
Change-Id: Idedbc41a6277dc89ed74c61ff26753ceae67606b
2024-11-28 14:44:51 +00:00
Catherine Vlasov
fe3b9bc59f Merge "Fix formatting, use consistent comment styles, and document more fields." into main 2024-11-28 13:44:46 +00:00
David Drysdale
7dcdd5b9c8 Add manifest fragments for all KeyMint versions
Make it easier for vendors to declare the Package Manager flag
that matches the version of KeyMint that their device implements.

Test: TreeHugger
Bug: 381125092
Change-Id: I13f781836b4b06c43811b315ca78da076ecd928f
2024-11-28 11:58:47 +00:00
David Drysdale
8883c4f463 Merge "Add an explicitly v4 manifest fragment" into main 2024-11-28 11:25:04 +00:00
Catherine Vlasov
bdc6bb500b Fix formatting, use consistent comment styles, and document more fields.
Changes:
1) The aidl_format pre-upload hook complains about some line wrapping.

2) ASN.1 comments begin with "--". This only makes a difference in this case
if a vendor copy-pastes the schema in these comments somewhere that
expects valid a ASN.1 schema. It's also nice to be consistent.

As a drive-by improvement, I also added comments for all the fields in
KeyDescription. The statements about how attestationSecurityLevel and
keymintSecurityLevel must match are tested in VTS (and CTS).

Bug: 381383980
Test: n/a, comment update
Change-Id: I6a331fd3ed18e4a54ff8d34e96ae7dc62e3e3a0c
2024-11-28 11:02:02 +00:00
Todd Frederick
fd051ded3d Add an explicitly v4 manifest fragment
Test: TH
Bug: 381125092
Change-Id: Id58227ceccc926423e0151a84260cbc56a218c35
2024-11-27 22:59:04 +00:00
Orlando Arbildo
7889729c73 hwcrypto: Moving hwcrypto files out of staging
Moving hwcrypto AIDL files out of staging folder. Marking
stability of files as vintf.

Bug: 284152719
Test: qemu android build
Change-Id: I57c2b618085fa1975305f2f1e5f7572d92ef97ac
2024-11-27 20:15:31 +00:00
Sean Thomas
f2946ab5c0 Perform sanity checks on generated P256 points
adds a test to VtsRemotelyProvisionedComponentTests that generates 256
P256 keypairs and adds functionality that makes sure the points (public
keys) lie on the curve, are not infinity, and are not equal to the base
point (generator).

Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Bug: 327026543
Change-Id: I4002b9e5ed5dbc366a14ff5c16e2c4cfd7d14485
2024-11-27 19:44:51 +00:00
David Drysdale
6d825fb225 Don't pass ATTEST_KEY for symmetric key generation
Bug: 379228013
Bug: 380375179
Test: VtsAidlKeyMintTargetTest
Change-Id: I6b87a8997a3b9cf0f45f362ca91707546cc953d1
2024-11-26 10:39:56 +00:00
Weston Carvalho
5a36dba491 Merge "Move SecureStorage interface out of staging" into main 2024-11-26 00:46:10 +00:00
Hasini Gunasinghe
2ec32cd4eb Merge "Define AuthMgr API for client authorization" into main 2024-11-25 16:46:29 +00:00
Weston Carvalho
c0df841989 Move SecureStorage interface out of staging
Test: mmm hardware/interfaces/security/see/storage/aidl/
Bug: 278779487
Change-Id: I81b3032f8cbbea53309f098c89cfbc3d0974ec24
2024-11-21 15:59:50 -06:00
Weston Carvalho
b7ba9a5d5c Add dirgroup for security/see
Test: none
Bug: 300673821
Change-Id: Ica3d228058f3926c03d94c9195ef7039b537f32a
2024-11-21 15:59:50 -06:00
Karuna Wadhera
224691ea66 Modify Modules documentation
Bug: 369375199
Test: n/a
Change-Id: I8992b45617de64e4cceaa8081ff03bf843095b7b
2024-11-21 18:06:16 +00:00
Hasini Gunasinghe
46df15be3d Define AuthMgr API for client authorization
Test: atest VtsAidlAuthMgrNonExistentTest
Change-Id: I584cab0039b1b41ad3136a644465aceac3e985c5
2024-11-20 02:52:11 +00:00
Karuna Wadhera
eb69354d0e Add moduleHash to attestation cert documentation
Bug: 369375199
Test: n/a
Change-Id: I28457dbe661dacfe22dfc97d1c1c9c21068af656
2024-11-19 18:34:05 +00:00
Catherine Vlasov
3ba252f1a2 Merge "Specify the use of SHA-256 for the "verifiedBootHash"." into main 2024-11-18 13:12:20 +00:00
Catherine Vlasov
501b63b0d0 Specify the use of SHA-256 for the "verifiedBootHash".
Bug: 309963984
Bug: 376832222
Test: n/a, comment update
Change-Id: Iab9e0f2d28ae4ab56d104cab6031783f605fee21
2024-11-18 09:33:30 +00:00
Catherine Vlasov
78ade929e3 Merge "Correct comment about Verified Boot key on devices with custom root of trust." into main 2024-11-15 17:01:17 +00:00
Catherine Vlasov
a5439fd7a5 Correct comment about Verified Boot key on devices with custom root of trust.
Updating the comment to match the test expectation. The attested Verified
Boot key should contain the user-set root of trust if the Verified Boot
state is "SelfSigned" (i.e. "yellow").

Bug: 376832222
Test: n/a (comment update)
Change-Id: Ie3c43157f05e40fa42b107768af561644ff5d30f
2024-11-15 15:18:49 +00:00
David Drysdale
0269d49d9a KeyMint VTS: emit values on failure
Test: VtsAidlKeyMintTargetTest
Change-Id: Iac65b379f22eb2ff9b4d1e47b652d41072eaafe9
2024-11-14 17:15:00 +00:00
David Drysdale
76418972da Merge "KeyMint VTS tests for module hash feature" into main 2024-11-14 11:49:16 +00:00
David Drysdale
b9c1291dfb Merge "Add an explicitly v3 manifest fragment" into main 2024-11-13 06:50:42 +00:00
Treehugger Robot
84646b6772 Merge "Refactor function signatures to remove mocked IRPC" into main 2024-11-13 02:15:23 +00:00
Treehugger Robot
d9c0272480 Merge "have one implementation of deviceSuffix" into main 2024-11-13 01:05:18 +00:00
Sean Thomas
afbab6080c have one implementation of deviceSuffix
Test: atest libkeymint_remote_prov_support_test
Change-Id: I2c9634dea7324a03e34c789f272248ddd720ca84
2024-11-12 23:10:31 +00:00
Sean Thomas
2d2385bca3 Refactor function signatures to remove mocked IRPC
Test: atest libkeymint_remote_prov_support_test
      atest VtsHalRemotelyProvisionedComponentTargetTest

Change-Id: I8dd47bca149bcef244c223f8e94d3965deb13f13
2024-11-12 17:42:56 +00:00
Seth Moore
8925adb102 Merge "Expose more from hwtrust for DICE chain validation" into main 2024-11-12 16:08:10 +00:00
David Drysdale
da0b04ce83 KeyMint VTS tests for module hash feature
Test: VtsAidlKeyMintTargetTest
Bug: 369375199
Bug: 373446864
Bug: 373446999
Bug: 360941058
Change-Id: Iaca508f39be4d76d07ae4f7cf6e640466af78ae4
2024-11-12 15:50:35 +00:00
David Drysdale
af23f37935 Add an explicitly v3 manifest fragment
Test: TreeHugger
Bug: 369375199
Change-Id: Ie4ebd03fd628f6ff87e711c8403b082461afbb6f
2024-11-11 10:39:19 +00:00
Sean Thomas
4eb29280d9 Expose more from hwtrust for DICE chain validation
There are a lot of upcoming requirements (see below) that place
restrictions on the CSR and the DICE chain. This is a first step to
make some of the infrastructure necessary to utilize
the already-existing functionality inside hwtrust.

Bug: 372843164
Bug: 376297620

A lot of parsing happens in `remote_prov_utils`. It would be nice to
have all parsing and validation occur in hwtrust.

Test: atest VtsHalRemotelyProvisionedComponentTargetTest
      atest libkeymint_remote_prov_support_test
Change-Id: I52383c0c62a6bb73554fd0771d2e7a8b366246c0
2024-11-08 18:55:55 +00:00
Seth Moore
d65b3820b5 Add Vikram as owner for RKP HAL and VTS
Change-Id: Icc977023adfbbfead28fd06229de7201ca2e4d4b
2024-11-08 17:23:45 +00:00
David Drysdale
c2723cdea3 Merge "keygen test not generating the key for every iteration" into main 2024-11-06 10:40:29 +00:00
Karuna Wadhera
28e04e6221 Merge "Add module info AIDL changes and bump the KeyMint version" into main 2024-11-06 07:09:01 +00:00
Catherine Vlasov
c4f2acc76d Expect SHA-256 digest for attested VBMeta digest on VSR-V+.
Bug: 309963984
Bug: 376832222
Test: atest VtsAidlKeyMintTargetTest
Change-Id: I99684cf16d84a08f607aceeb8f51d78d89e93511
2024-11-05 15:19:50 +00:00
Karuna Wadhera
866d2752a9 Add module info AIDL changes and bump the KeyMint version
Bug: 369375199
Test: Manually checked that module info is added to the attestation when
 sent via IKeyMintDevice::setModuleInfo.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ea426cbf2e0b3064adf090e4cd3d6932b02ae54d)
Merged-In: Idb11823e6b65cf17d62ae8687febffee860565e3
Change-Id: Idb11823e6b65cf17d62ae8687febffee860565e3
2024-11-01 21:42:31 +00:00
Spandan Das
db67f303f4 Do not install android.hardware.hardware_keystore.xml outside apex
`android.hardware.security.keymint-service.nonsecure` is part of
`com.android.hardware.keymint.rust_nonsecure` apex. However, listing
android.hardware.hardware_keystore.xml in `required` of the binary
installs two copies of this permission file on device - one inside the
apex, and another it the /vendor/etc/permission (outside the apex).

With  this CL, the latter will no longer be installed. This CL is
motivated by having the vendor.img building with soong as part of mk->bp
migration.

Test: m com.android.hardware.keymint.rust_nonsecure
Test: deapexer list
out/target/product/vsoc_x86_64/vendor/apex/com.android.hardware.keymint.rust_nonsecure.apex
 # verified that etc/permissions/android.hardware.hardware_keystore.xml
 is present

Bug: 374371755
Bug: 376110962
Change-Id: I15ba92c81296f869277940767ff3a76c28214c18
2024-10-31 22:33:03 +00:00
A. Cody Schuffelen
abed683f94 Reapply "Use platform security domains in keymint/gatekeeper sepolicy"
This reverts commit 82e13c4269.

Bug: b/374158137
Change-Id: I7e689444d2bd4a41e0b987e163ef0e97f161ac47
Test: with other changes in topic
2024-10-28 16:39:09 -07:00
Treehugger Robot
739d98c811 Merge "[rkp_factory_tool] enforce the presence of UDS certs" into main 2024-10-28 20:21:13 +00:00
suryaprakash.konduru
87b6dc0a88 keygen test not generating the key for every iteration
key_transform field not being reset during DeleteKey() causing
keygen test to skip the key generation.

Bug: 375151780
Test: VtsAidlKeyMintBenchmarkTest
Change-Id: I10428dc9f84831a44917fb180d16bb97e2db2257
2024-10-24 00:07:53 +05:30
Karuna Wadhera
0905f6eef4 Merge "Add versioned libkeymint_support" into main 2024-10-23 16:50:30 +00:00
Karuna Wadhera
c42a2a6862 Add versioned libkeymint_support
Bug: 369375199
Test: Treehugger
Change-Id: I5eab3a222aeba26640c3d03e52242ee5c2c2b277
2024-10-23 04:29:37 +00:00
Priyanka Advani (xWF)
6c01282b0f Merge "Revert "Use platform security domains in keymint/gatekeeper sepolicy"" into main 2024-10-23 01:01:46 +00:00
Priyanka Advani (xWF)
82e13c4269 Revert "Use platform security domains in keymint/gatekeeper sepolicy"
Revert submission 3312283-2024-10-18-schuffelen-sepolicy

Reason for revert: Droidmonitor created revert due to b/375059051. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:3312283-2024-10-18-schuffelen-sepolicy

Change-Id: Icebd34eb9e2941a6480d9943986a104cc5249729
2024-10-22 23:51:23 +00:00
Sean Thomas
e2307105fc [rkp_factory_tool] enforce the presence of UDS certs
add a flag to verifyFactoryCsr that enforces the presence
of UDS certs in the presented CSR

Bug: 366147625
Test: m rkp_factory_extraction_tool
Test: m librkp_factory_extraction_test
Test: m libkeymint_remote_prov_support_test
Test: atest system/security/provisioner
Test: atest hardware/interfaces/security/keymint/support

Change-Id: I1b6c85b858d76b1ea418400342c89553cbd4bc1d
2024-10-22 21:53:29 +00:00
Roman Kiryanov
c1136a5b92 Merge "Use platform security domains in keymint/gatekeeper sepolicy" into main 2024-10-22 20:07:34 +00:00
Treehugger Robot
094b92841f Merge "Add proposed trendy teams for VTS modules" into main 2024-10-22 16:17:21 +00:00
Seth Moore
c6f1566d93 Merge "Add UDS certificate requirements to RKP docs" into main 2024-10-21 17:05:31 +00:00
Treehugger Robot
362843c8c5 Merge "[vts] Verify RKP VM DICE chain in IRPC VTS" into main 2024-10-18 19:11:25 +00:00