tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9319 commits 1 branch 0 tags 12 MiB
Commit graph

9319 commits

This branch
This branch
All branches
Author SHA1 Message Date
Android Build Coastguard Worker
7b5f8762fc Snap for 11949167 from 057ae1223f to 24Q3-release 
Change-Id: I25026b88ba4b518b8f71072a68b89f1680a8ad05
 2024-06-10 23:26:10 +00:00
Karuna Wadhera
057ae1223f Merge "Query for /default and /strongbox IRPCs directly" into main am: 77eb25fc04 am: a03d913d76 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3122032

Change-Id: I0db09863f497bf829ef0585f270a1762fd2c45d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-10 18:22:58 +00:00
Karuna Wadhera
a03d913d76 Merge "Query for /default and /strongbox IRPCs directly" into main am: 77eb25fc04 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3122032

Change-Id: Ife871544eac4c58cd7e1683b39d8a90ddf4f9c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-10 18:05:34 +00:00
Karuna Wadhera
77eb25fc04 Merge "Query for /default and /strongbox IRPCs directly" into main 2024-06-10 17:46:06 +00:00
Karuna Wadhera
9ae66c0bef Query for /default and /strongbox IRPCs directly 
This removes the need to query for and call find on all IRPCs.

Bug: 312427637
Test: atest -p --include-subdirs system/security/keystore2
Change-Id: I8893627e983eac577b9920497f926f12c0e98271
 2024-06-10 15:10:40 +00:00
David Drysdale
f07fa6661b Merge "Simplify map_or_log_err" into main am: d49e9ba243 am: b51d4fdb5e 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3118732

Change-Id: Ief4fb44a6f2208deb3dfc896acc4a1e5e2602e81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-10 11:25:49 +00:00
David Drysdale
b51d4fdb5e Merge "Simplify map_or_log_err" into main am: d49e9ba243 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3118732

Change-Id: I0e6333ec9562923ac5590d417ed5cddca00adb3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-10 11:05:54 +00:00
David Drysdale
d49e9ba243 Merge "Simplify map_or_log_err" into main 2024-06-10 10:52:00 +00:00
David Drysdale
5238d77a83 Simplify map_or_log_err 
All (non-test) invocations use the same second argument `Ok` (which
actually acts as a 1-arg closure `|v| Ok(v)`), so no need to have it as
a parameter.  The common second argument just maps `Ok(v)` to `Ok(v)`,
which means that `map_err()` can be used instead of `map_or_else()`,
and the same type parameter is used for both input and output.

Test: legacykeystore_test
Test: keystore2_test
Flag: None, pure refactor
Change-Id: I46b6e327d0b546df6be6664781a52bb888c04eca
 2024-06-07 16:34:53 +00:00
Android Build Coastguard Worker
97ae037e5e Snap for 11926388 from 7039a1a15b to 24Q3-release 
Change-Id: I3d4c52601850078afd2df6be9713f0be6c56b531
 2024-06-05 00:21:36 +00:00
Treehugger Robot
7039a1a15b Merge "Convert to cargo_embargo" into main am: 9409581c44 am: 7b61d28776 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3094237

Change-Id: Ic5f6fea20bb96c8125e5e476bd32060c0c646ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-04 12:36:54 +00:00
Treehugger Robot
7b61d28776 Merge "Convert to cargo_embargo" into main am: 9409581c44 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3094237

Change-Id: I3559ce4af182faacef0575d53a1dc37410c4f63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-04 12:20:41 +00:00
Treehugger Robot
9409581c44 Merge "Convert to cargo_embargo" into main 2024-06-04 11:54:11 +00:00
Android Build Coastguard Worker
35ab4c7088 Snap for 11920703 from 6366edd67b to 24Q3-release 
Change-Id: I46ab9e3efa2900b64c3e74cac800fbdf8d523953
 2024-06-04 00:00:37 +00:00
Devin Moore
6366edd67b [automerger skipped] Create and use a death recipient cookie object am: 95427c76cb am: 7db81bd6b2 am: 051a76ca91 -s ours 
am skip reason: Merged-In I1c65c93577aee287e26fa23ded43d9e2efc90bf2 with SHA-1 95427c76cb is already in history

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

Change-Id: I5d490afd0f799a718fc426654c4851c5a4b68ee7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:54:12 +00:00
Devin Moore
b0e2e622a0 [automerger skipped] Create and use a death recipient cookie object am: 95427c76cb am: 926908b795 -s ours 
am skip reason: Merged-In I1c65c93577aee287e26fa23ded43d9e2efc90bf2 with SHA-1 a17c771893 is already in history

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

Change-Id: I7885194bfd94a26fc7f25f9f273a82156ac49f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:28:52 +00:00
Devin Moore
051a76ca91 Create and use a death recipient cookie object am: 95427c76cb am: 7db81bd6b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/27183334

Change-Id: Ia888c9f392c85d3030d57c7802a5cd308858172a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 17:28:52 +00:00
Devin Moore
7db81bd6b2 Create and use a death recipient cookie object am: 95427c76cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/27183334

Change-Id: I3a0a143345940a2e1173b9582faf8b000f1246fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 16:36:45 +00:00
Devin Moore
926908b795 Create and use a death recipient cookie object am: 95427c76cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/27183334

Change-Id: I0dc0b5586756d22493103b17e1a68420c886db4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-03 16:36:11 +00:00
Android Build Coastguard Worker
f706a75770 Snap for 11908474 from 6942187dbd to 24Q3-release 
Change-Id: I6882aa06ae377f2829e15ee5ac1302439cbb21ca
 2024-05-30 23:25:30 +00:00
Cindy Lin
6942187dbd Merge "Implement mls-rs-crypto-traits backed by BoringSSL." into main am: a8fc566120 am: ab1d17e8d2 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3089793

Change-Id: I5509007155819dc315b09941cc385ed60daa74b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-30 10:06:17 +00:00
Cindy Lin
ab1d17e8d2 Merge "Implement mls-rs-crypto-traits backed by BoringSSL." into main am: a8fc566120 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3089793

Change-Id: I19780c967e50877f8985d2cec489e1abe3c3cb7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-30 09:59:30 +00:00
Martin Geisler
3182da2136 Convert to cargo_embargo 
Bug: 302021139
Test: m libmls_rs_uniffi in local checkout
Change-Id: I4a6c562bf09b844b71b91e71ca830d38bf3e71c0
 2024-05-30 11:44:16 +02:00
Cindy Lin
a8fc566120 Merge "Implement mls-rs-crypto-traits backed by BoringSSL." into main 2024-05-30 09:27:49 +00:00
Automerger Merge Worker
69e50eb0eb Merge changes from topic "am-e77834e0fca14c5e8f661a2d4930d342" into main 
* changes:
  [automerger skipped] Merge "Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future" into aosp-main-future am: 8597f0f8ab -s ours
  [automerger skipped] Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future am: 109d4d5b3f -s ours
 2024-05-29 21:56:11 +00:00
Treehugger Robot
f1f0446fc6 [automerger skipped] Merge "Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future" into aosp-main-future am: 8597f0f8ab -s ours 
am skip reason: Merged-In I3aa48d05f367fafab5151fa7eb6dd447840dae0d with SHA-1 b10745144a is already in history

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

Change-Id: Ib095aa329ceaa71599d5e414714ee870f7e8b0b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 21:55:56 +00:00
Treehugger Robot
d304a2cc4f [automerger skipped] Merge "Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future" into aosp-main-future am: 8597f0f8ab -s ours 
am skip reason: Merged-In I3aa48d05f367fafab5151fa7eb6dd447840dae0d with SHA-1 b10745144a is already in history

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

Change-Id: I42dee2cd828d74e4f286f40be1df8b1bd236f945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 21:55:55 +00:00
Xin Li
ca261c8c75 [automerger skipped] Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future am: 109d4d5b3f -s ours 
am skip reason: Merged-In I3aa48d05f367fafab5151fa7eb6dd447840dae0d with SHA-1 b10745144a is already in history

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

Change-Id: I87980f3bc1b3709703773b86941ec73523b5b4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 21:55:50 +00:00
Xin Li
0a7c206299 [automerger skipped] Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future am: 109d4d5b3f -s ours 
am skip reason: Merged-In I3aa48d05f367fafab5151fa7eb6dd447840dae0d with SHA-1 b10745144a is already in history

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

Change-Id: I2ef16aad74b4ebb73b2e1a9339791715c9d7bc43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-29 21:55:48 +00:00
Android Build Coastguard Worker
453f10c13b Snap for 11896415 from 1db2e8c725 to 24Q3-release 
Change-Id: I6e08f7203d9bcd7bc797b9882145520fbbf40041
 2024-05-28 23:25:53 +00:00
Treehugger Robot
8597f0f8ab Merge "Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future" into aosp-main-future 2024-05-28 20:31:52 +00:00
Cindy Lin
6ec3c2b64f Implement mls-rs-crypto-traits backed by BoringSSL. 
Fix: 302021139
Test: Presubmit
Change-Id: Iaefa21d3fb69f92d735875778f3f96e1878d0876
 2024-05-28 13:29:16 +00:00
David Drysdale
1db2e8c725 Merge "Add debugging info for transactions" into main am: 95b8309b2f am: 09005dc0fe 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3103180

Change-Id: I29eabe616e1e81b12ae671ea2a9e621def6993a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-28 07:57:21 +00:00
David Drysdale
8eea31fa9f Merge "Add/use watchdog with standard timeout" into main am: de2ac5cf7d am: f023c1593a 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3099837

Change-Id: I31267a95a70469c2fc37516525d9e1f7418f38c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-28 07:56:51 +00:00
David Drysdale
09005dc0fe Merge "Add debugging info for transactions" into main am: 95b8309b2f 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3103180

Change-Id: Ibb1072d25d9abcd5bce5be7a9d18def3be33a20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-28 07:49:55 +00:00
David Drysdale
95b8309b2f Merge "Add debugging info for transactions" into main 2024-05-28 07:44:21 +00:00
David Drysdale
f023c1593a Merge "Add/use watchdog with standard timeout" into main am: de2ac5cf7d 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3099837

Change-Id: I4e500d63f23e924bc7b08a835490bdd175a01387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-28 07:42:01 +00:00
David Drysdale
de2ac5cf7d Merge "Add/use watchdog with standard timeout" into main 2024-05-28 07:17:08 +00:00
Xin Li
109d4d5b3f Mark 2024-06 Release (ab/AP2A.240605.024) as merged in aosp-main-future 
Bug: 343100748
Merged-In: I3aa48d05f367fafab5151fa7eb6dd447840dae0d
Change-Id: I5800fdf210100e25c977b53b60a870a3126c3d69
 2024-05-27 22:54:48 -07:00
Android Build Coastguard Worker
83d360bed2 Snap for 11889377 from 0da99ca967 to 24Q3-release 
Change-Id: I3d08c7c0ff17e746e1dc994ce1cb5b1f704f4d4e
 2024-05-25 03:24:56 +00:00
David Drysdale
7b9ca23b18 Add debugging info for transactions 
Pass around information about which code is performing an exclusive
database transaction, and run an additional watchdog inside the
transaction closure.

Bug: 319563050
Test: CtsKeystoreTestCases
Change-Id: Ib54f1f4c0c37f9d7392d21d9ccb880d066029945
 2024-05-24 15:42:24 +01:00
David Drysdale
0da99ca967 Merge "Remove unused code" into main am: 5b257c6923 am: bfe6762a42 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2812718

Change-Id: Iffd5e04fd0ae5e6cab8ec1af483e6c6910e3ba62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-24 10:25:44 +00:00
David Drysdale
bfe6762a42 Merge "Remove unused code" into main am: 5b257c6923 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2812718

Change-Id: I494f2f49d56ff406d046e08e0cfd09e874e2b262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-24 10:06:16 +00:00
David Drysdale
5b257c6923 Merge "Remove unused code" into main 2024-05-24 09:33:26 +00:00
Android Build Coastguard Worker
92956af823 Snap for 11881322 from 3b98d44dce to 24Q3-release 
Change-Id: If566f8e81415504c0e880e6fa7631e16d2aea6df
 2024-05-23 23:24:40 +00:00
David Drysdale
541846b93c Add/use watchdog with standard timeout 
Almost all uses of the watchdog use the same 500ms timeout, so add a new
method that assumes that.

Test: CtsKeystoreTestCases
Change-Id: Idf7852400a58ba954e4a71e5e2282734a0960072
 2024-05-23 13:23:22 +01:00
David Drysdale
8c4c4f3420 Remove unused code 
Test: TreeHugger
Change-Id: If7a4606f5a6a09c574574ed8ed04788435259fa8
 2024-05-23 12:58:15 +01:00
Max Bires
3b98d44dce Merge "Revert "Deprecating the aidl for Android Protected Confirmation"" into main am: ef518cbe49 am: cfc58edc40 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3093803

Change-Id: I056219826510013500365715fcad9439e7d24fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-23 04:19:11 +00:00
Max Bires
cfc58edc40 Merge "Revert "Deprecating the aidl for Android Protected Confirmation"" into main am: ef518cbe49 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3093803

Change-Id: I990db94ce94fac37e4c653e4076fb66bf7a70b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-23 03:53:13 +00:00
Max Bires
ef518cbe49 Merge "Revert "Deprecating the aidl for Android Protected Confirmation"" into main 2024-05-23 03:32:38 +00:00