Commit graph

9102 commits

Author SHA1 Message Date
Treehugger Robot
6163cfb24c Merge "Grant SYS_NICE for odsign" into main am: 94646d7d19
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2978554

Change-Id: I3a048996462d0cff6073b709d68a88d4b00c0c33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-27 16:48:25 +00:00
Treehugger Robot
94646d7d19 Merge "Grant SYS_NICE for odsign" into main 2024-02-27 15:50:00 +00:00
David Dai
c8e0cac014 Grant SYS_NICE for odsign
Grant sys_nice capabilities to odsign so that it can spawn
VMs with sys_nice enabled which is used by compos_verify.

Bug:326557850
Test: atest odsign_e2e_tests_full
Change-Id: I9f502b997123faf9bc5a8e04f416726ea8001e41
Signed-off-by: David Dai <davidai@google.com>
2024-02-26 15:58:02 -08:00
Ronish Kalia
0bd02381ce Merge "Migrate Test Targets to New Android Ownership Model" into main am: cbae97c988
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2945375

Change-Id: I36c59bd1f847852537f4f0b59400e02c41e53d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21 10:57:22 +00:00
Ronish Kalia
cbae97c988 Merge "Migrate Test Targets to New Android Ownership Model" into main 2024-02-21 10:22:33 +00:00
Treehugger Robot
4a45b25beb Merge "Fixes for the issues found while running Keystore2 client tests on a device with keymaster implementation." into main am: 3dfac14787
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2942748

Change-Id: I2f6ff524e35991966684d63696b860593eed46f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-20 13:53:51 +00:00
Treehugger Robot
3dfac14787 Merge "Fixes for the issues found while running Keystore2 client tests on a device with keymaster implementation." into main 2024-02-20 13:16:46 +00:00
Rajesh Nyamagoud
7620921a7f Fixes for the issues found while running Keystore2 client tests on a
device with keymaster implementation.

- Ignore INVALID tag in generated key characteristics if keymaster
  implementation is present.
- RSA_OAEP_MGF_DIGEST, ATTEST_KEY, USAGE_COUNT_LIMIT are not expected in
  generated key characteristics if keymaster implementation is present.
- Corrected device attest ids names.
- Skip device id attestation on device with GSI image and device
  first_api_level is less than 34.
- When the DEVICE_UNIQUE_ATTESTATION tag is used in key generation,
  root certificate signature verification is ignored during cert-chain
  verification.

Bug: 322118247
Test: atest keystore2_client_tests
Change-Id: I42d339a7797114d9139c64bc4d397889b965cb48
2024-02-19 20:24:47 +00:00
Shaquille Johnson
c81370b5cc Merge "Update typo and add blob id to log" into main am: ea9fe60bf5
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2960905

Change-Id: I017b7d478829aa746655f55a45db899616571f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-17 20:17:17 +00:00
Shaquille Johnson
ea9fe60bf5 Merge "Update typo and add blob id to log" into main 2024-02-17 19:35:20 +00:00
Treehugger Robot
1ce40098c8 Merge "Prefer .first() to .get(0)" into main am: b4e19af8c7
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2956141

Change-Id: I52d1d4cef2f2b5db1badd22b479107ab29dcbff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13 22:22:52 +00:00
Treehugger Robot
b4e19af8c7 Merge "Prefer .first() to .get(0)" into main 2024-02-13 21:41:07 +00:00
Shaquille Johnson
f23fc9489b Update typo and add blob id to log
The logs were missing a word and also this will
add the blob id into the logs when a query fails
to delete the blob.

Test: atest keystore2_test
Change-Id: Ieff6e9266837744d16633c93df0b6da27871eca7
2024-02-13 17:01:29 +00:00
Aditya Choudhary
d987e9b327 Migrate Test Targets to New Android Ownership Model
This CL is created as a best effort to migrate test targets to the new Android ownership model.
It is based on historical data from repository history and insights from git blame.
Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary
attribution in this CL, please create a new CL to fix that.

For detailed guidelines and further information on the migration please refer to the link below,
go/new-android-ownership-model

Bug: 304529413
Test: N/A
Change-Id: Ia06fe7f4d0518d03cebf52d34ca9b1434011d272
2024-02-13 00:24:32 +00:00
Stephen Hines
4d23482d7e Prefer .first() to .get(0)
```
error: accessing first element with `key_descriptors.get(0)`
   -->
system/security/keystore2/tests/keystore2_client_list_entries_tests.rs:143:27
    |
143 |                 let key = key_descriptors.get(0).unwrap();
    |                           ^^^^^^^^^^^^^^^^^^^^^^ help: try:
`key_descriptors.first()`
    |
    = help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#get_first
    = note: `-D clippy::get-first` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::get_first)]`
```

Bug: http://b/321303117
Test: toolchain/android_rust/test_compiler.py --prebuilt-path dist/rust-dev.tar.xz --target aosp_cf_x86_64_phone --all-rust
Change-Id: Ic278ca9ec8fc48e779741f43b1fd53702b54396f
2024-02-09 15:39:25 -08:00
Eric Biggers
56910d0a4d Merge "keystore2: rename MonotonicRawTime to BootTime" into main am: 3d4f5457af
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2940163

Change-Id: I53489025aa43e2463fa61892e48dc2bb8c1858bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 21:01:39 +00:00
Eric Biggers
3d4f5457af Merge "keystore2: rename MonotonicRawTime to BootTime" into main 2024-02-07 20:22:55 +00:00
Treehugger Robot
eb58a7f2a0 Merge "Replace use of deprecated logging functions" into main am: 5b9f6b70d2
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2952890

Change-Id: Idf0918f9b8830a9d6c9a0e18fd8a7c635f8fab85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-07 16:47:42 +00:00
Treehugger Robot
5b9f6b70d2 Merge "Replace use of deprecated logging functions" into main 2024-02-07 16:13:24 +00:00
Jeff Vander Stoep
153d1aaff4 Replace use of deprecated logging functions
This is needed to upgrade the android_logger crate from 0.12.0
to 0.13.3.

with_max_level provides the same functionality as with_min_level.
The renaming is admittedly confusing, but the new name is accurate
and it makes sense that they deprecated and then removed the
previously poorly named with_min_level.

See crate documentation [1] and code [2].

[1]: https://docs.rs/android_logger/0.12.0/android_logger/struct.Config.html#method.with_min_level
[2]: https://docs.rs/android_logger/0.12.0/src/android_logger/lib.rs.html#227

Bug: 322718401
Test: build and run CF with the change.
Test: m aosp_cf_x86_64_phone
Change-Id: Ibd13989ffe52a93191dd2d5a1b8f5a651eecd91d
2024-02-07 14:33:36 +01:00
Eran Messeri
c7f9449a28 Merge "Correcting permission check for App UIDs listing" into main am: b7e5421688
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2953647

Change-Id: I1e326e350db8fe3872d9cb69de9166ce9bbc767c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-06 17:21:34 +00:00
Eran Messeri
b7e5421688 Merge "Correcting permission check for App UIDs listing" into main 2024-02-06 16:40:03 +00:00
Eran Messeri
cfe79f1828 Correcting permission check for App UIDs listing
Correct the permission check for the Keystore maintenance method
that returns the list of app UIDs which have keys that are
bound to a specific SID.

The previous check relied on SELinux policies. But the Settings
app that calls this method has a permission - MANAGE_USERS -
that is more appropriate to check.

Bug: 302109605
Test: Manual.
Change-Id: Ia26256cf995d16d03d0bb92d8b237f7bbea30d07
2024-02-06 14:58:09 +00:00
Treehugger Robot
71b89efc7e Merge "Set the container field of aconfig flags" into main am: 4a8dc192c3
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2947640

Change-Id: I6e23ceb71a2c696a764a72ad922c50c316c957c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 22:49:06 +00:00
Treehugger Robot
4a8dc192c3 Merge "Set the container field of aconfig flags" into main 2024-02-05 22:08:34 +00:00
Stefano Cianciulli
92296495c5 [automerger skipped] Merge "Add libstatspull and libstatssocker to odsign" into main am: a57741efb9 -s ours
am skip reason: Merged-In I619784b71c0a87574dc633d641aec91da1fc3475 with SHA-1 9987d80385 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2942886

Change-Id: Iea73083f6e4a67441577b917a26af5ffd059a236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 10:42:19 +00:00
Stefano Cianciulli
a09d6c878c [automerger skipped] Add libstatspull and libstatssocker to odsign am: 5cacaefd20 -s ours
am skip reason: Merged-In I619784b71c0a87574dc633d641aec91da1fc3475 with SHA-1 9987d80385 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2942886

Change-Id: Icdeda328ff756256308160a1ed0ab4b1a89c1c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-05 10:42:12 +00:00
Stefano Cianciulli
a57741efb9 Merge "Add libstatspull and libstatssocker to odsign" into main 2024-02-05 09:56:53 +00:00
Oriol Prieto Gasco
85d84ff9ed Set the container field of aconfig flags
Test: m
Bug: 312769710
Change-Id: I366717c7139886e30360914256ad7710da5095e9
2024-02-03 02:39:40 +00:00
Stefano Cianciulli
5cacaefd20 Add libstatspull and libstatssocker to odsign
Bug: 257028435
Test: atest ArtGtestsTargetChroot
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d0737bfd5bd288c291ec454d09e1c80d0a2cc95e)
Merged-In: I619784b71c0a87574dc633d641aec91da1fc3475
Change-Id: I619784b71c0a87574dc633d641aec91da1fc3475
2024-02-02 11:18:15 +00:00
Stefano Cianciulli
9987d80385 Add libstatspull and libstatssocker to odsign
Ignore-AOSP-First: adding related changes in frameworks/proto_logging
Bug: 257028435
Test: atest ArtGtestsTargetChroot
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d0737bfd5bd288c291ec454d09e1c80d0a2cc95e)
Merged-In: I619784b71c0a87574dc633d641aec91da1fc3475
Change-Id: I619784b71c0a87574dc633d641aec91da1fc3475
2024-02-01 15:57:16 +00:00
Treehugger Robot
51a05b61ab Merge "Replace use of deprecated logging functions" into main am: 2730678378
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2939100

Change-Id: I2bd19f66f96c8a93d4f5b7dca908b547d6a1f3a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 11:45:38 +00:00
Treehugger Robot
2730678378 Merge "Replace use of deprecated logging functions" into main 2024-02-01 11:11:14 +00:00
Eric Biggers
19b3b0d894 keystore2: rename MonotonicRawTime to BootTime
Due to https://r.android.com/2822970 ("Use CLOCK_BOOTTIME for keystore2
auth token received time"), MonotonicRawTime now uses CLOCK_BOOTTIME
instead of CLOCK_MONOTONIC_RAW.  Therefore, rename it to BootTime.

Bug: 309686873
Test: atest -p --include-subdirs system/security/keystore2
Change-Id: If1fbbac2eccb03dc7360ae742d79e58f871fb80d
2024-01-31 22:54:54 +00:00
Jeff Vander Stoep
940820cfa1 Replace use of deprecated logging functions
This is needed to upgrade the android_logger crate from 0.12.0
to 0.13.3.

with_max_level provides the same functionality as with_min_level.
The renaming is admittedly confusing, but the new name is accurate
and it makes sense that they deprecated and then removed the
previously poorly named with_min_level.

See crate documentation [1] and code [2].

[1]: https://docs.rs/android_logger/0.12.0/android_logger/struct.Config.html#method.with_min_level
[2]: https://docs.rs/android_logger/0.12.0/src/android_logger/lib.rs.html#227

Bug: 322718401
Test: build and run CF with the change.
Test: m aosp_cf_x86_64_phone
Change-Id: I8d9d7c42100ede48496f9846068ed312fb8a15cb
2024-01-31 10:55:55 +01:00
Shaquille Johnson
3f433ffc32 Merge "Deprecating the aidl for Android Protected Confirmation" into main am: 53d2763a23
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2863108

Change-Id: I799fd3db0051c667445ce76ee4e5c6887fbb8091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 14:21:39 +00:00
Shaquille Johnson
53d2763a23 Merge "Deprecating the aidl for Android Protected Confirmation" into main 2024-01-29 13:49:22 +00:00
Shaquille Johnson
07fec0ff0c Deprecating the aidl for Android Protected Confirmation
Android Protected Confirmation is deprecated due to the high
support/maintenance cost for Android device makers and low adoption rate
among app developers. APC requires Android device makers to have a
substantial amount of device-specific UI code running in the trusted
execution environment. That has proven to be expensive to maintain and
non-scalable, as there cannot be a single implementations device makers
can share or use as a reference. Additionally, app developers have not
adopted this feature, as the Android platform offers other mechanisms
for authentication a user's intent. These mechanisms, such as
authentication-bound Keystore keys, are less secure than Trusted UI, but
are more wide-spread. While we explore alternatives to APC that are
viable to the device makers ecosystem, we sunset the APC API.

Bug: 313856313
Test: atest keystore2_test && atest CtsKeystoreTestCases
Change-Id: If065697ed13e3de706b8dde5cc5e2b6018592018
2024-01-25 16:02:32 +00:00
Eran Messeri
2795bb6437 Merge "List apps affected by secure user ID" into main am: 1841a55ebf
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2921730

Change-Id: I286b41eab78f95590f6aa809ab2a580d558c5d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-24 17:27:35 +00:00
Eran Messeri
1841a55ebf Merge "List apps affected by secure user ID" into main 2024-01-24 16:43:36 +00:00
Eran Messeri
4dc27b52eb List apps affected by secure user ID
Add a method to the Keystore maintenance interface to list the UIDs of
apps that are affected by a given secure user ID.

With this method, it would be possible to tell if removing a given
user's LSKF or enrolling new biometrics will invalidate Keystore keys,
thus affecting some apps.

Bug: 302109605
Test: atest keystore2_test
Change-Id: If5888506e0c72a56eca3339778889c7d8038acc5
2024-01-24 14:48:54 +00:00
Eric Biggers
41f887b7cf Merge "Fix UnlockedDeviceRequired with weak unlock methods" into main am: 3b862a87dd
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2906736

Change-Id: I6baebd5d3d7fc2049543ab7189d058aacdce0966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 23:41:59 +00:00
Eric Biggers
3b862a87dd Merge "Fix UnlockedDeviceRequired with weak unlock methods" into main 2024-01-18 22:22:12 +00:00
Eric Biggers
545463ccbb Merge "keystore: remove unused Keystore1 files" into main am: ed4f8be6be
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2915233

Change-Id: I1a3be97659a324c170d5e559b5047f16867c31af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 21:06:17 +00:00
Eric Biggers
ed4f8be6be Merge "keystore: remove unused Keystore1 files" into main 2024-01-18 20:25:36 +00:00
Andrew Walbran
ce3f70a164 Merge "Format Android.bp files with bpfmt" into main am: 4a04e9195e
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2913584

Change-Id: Id99c6ee22e94749a5960cb9bc5bace45e78639be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-18 19:43:12 +00:00
Andrew Walbran
4a04e9195e Merge "Format Android.bp files with bpfmt" into main 2024-01-18 19:01:27 +00:00
Luca Stefani
481b5d663b Format Android.bp files with bpfmt
Change-Id: I083e96e3dd94a48ebad473bcfbbb7fcbb89ce466
2024-01-18 08:34:35 +01:00
Eric Biggers
6946daa1ab Fix UnlockedDeviceRequired with weak unlock methods
Starting in Android 12, unlocking the device with a class 1
("convenience") biometric, class 2 ("weak") biometric, or a trust agent
unexpectedly doesn't allow the use of UnlockedDeviceRequired keys.  The
cause of this bug is that the cryptographic protection that Keystore now
applies to UnlockedDeviceRequired keys incorrectly assumes that the
device can only be unlocked using LSKF or via a biometric that
participates in Keystore (has a SID and uses HardwareAuthTokens).
Actually, Keyguard also allows the device to be unlocked using weaker
biometrics that do not particiate in Keystore, if they are enrolled.
Similarly, there are also cases where a trust agent can actively unlock
the device, e.g. unlocking a phone using a paired watch.

In combination with the system_server changes in
I34dc49f1338e94755e96c1cf84de0638dc70d311, this CL fixes the bug by
making Keystore retain the UnlockedDeviceRequired super keys in memory
if a weak unlock method is enabled at device lock time.  This does mean
that UnlockedDeviceRequired is enforced only logically when a weak
unlock method is enabled, but this is the best we can do in this case.

This CL also adds methods by which Keystore can be notified of the
expiration of unlock methods, causing the security level of
UnlockedDeviceRequired keys to be upgraded.  A future CL for
system_server is planned to use these.

Test: see I34dc49f1338e94755e96c1cf84de0638dc70d311
Bug: 296464083
Change-Id: I1b0d9ec4f9e31dc91642e865045766bd17e34cad
2024-01-17 22:51:37 +00:00
Eric Biggers
74b6c752da keystore: remove unused Keystore1 files
Remove files from the "keystore" directory that are unused, i.e. not
referenced by an Android.bp, or in the case of header files not included
from anywhere.  This mostly includes files belonging to Keystore1 that
were missed when Keystore1 was deleted.  This also includes a couple
outdated test scripts that were never actually wired up to anything.

Bug: 171305684
Test: m; mmm system/security
Change-Id: Ie31f773b5f15b0a0f95dffa9cad109fbf3a84970
2024-01-17 22:38:36 +00:00