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

9155 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shaquille Johnson
037f3dcd40 Merge "Deprecate put and return error in ILegacyKeystore" into main am: 2dc300aee0 am: b864cb3782 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2797796

Change-Id: I6aba5d10e0dbc10d2ea93c6fb84a54f9b762a341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 17:53:14 +00:00
Shaquille Johnson
abfc6f99d1 Merge "Deprecate put and return error in ILegacyKeystore" into main am: 2dc300aee0 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2797796

Change-Id: I0c99eff2ad660c565b2dba1c8e41293c33a7394d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 17:41:16 +00:00
Shaquille Johnson
b864cb3782 Merge "Deprecate put and return error in ILegacyKeystore" into main am: 2dc300aee0 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2797796

Change-Id: I7662aec7b46f66cc451b98fbca4a27070c7b1791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-28 17:20:03 +00:00
Shaquille Johnson
2dc300aee0 Merge "Deprecate put and return error in ILegacyKeystore" into main 2023-11-28 16:13:22 +00:00
Shaquille Johnson
be6e91d15f Deprecate put and return error in ILegacyKeystore 
Legacy keystore is a old relic that was suppoed to be
disabled a while ago. It has enabled functionality that was
supposed to be removed but wasn't because it would break
changes in the VPN and WIFI code. This would begin the
process of permanently removing it.

Test: atest CtsKeystoreTestCases
Change-Id: Iedc1dca24a40eb0cf30c5280fc2842ff79cf7f17
 2023-11-28 15:12:04 +00:00
Shaquille Johnson
1dcac2095e Merge "Rename flag wal_db_journalmode" into main am: 9c7503368f am: c705c146ba am: 8185a6f215 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843638

Change-Id: Idb2e6e56bcd920431889482a6eb3959ad5320cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 18:22:55 +00:00
Shaquille Johnson
8185a6f215 Merge "Rename flag wal_db_journalmode" into main am: 9c7503368f am: c705c146ba 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843638

Change-Id: Id4bbc1f73671162e6b6f874bfae0499a9b563fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 17:49:47 +00:00
Shaquille Johnson
21d9387045 Merge "Rename flag wal_db_journalmode" into main am: 9c7503368f am: e22afc71d6 am: 2cbb9bc756 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843638

Change-Id: I62c8228cdcf60eb8000eeaf40fac57380b81912a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 17:33:06 +00:00
Shaquille Johnson
c705c146ba Merge "Rename flag wal_db_journalmode" into main am: 9c7503368f 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843638

Change-Id: I57212c35ffd8b6ca9fe930480ce1ff3b9b132d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 17:14:26 +00:00
Shaquille Johnson
2cbb9bc756 Merge "Rename flag wal_db_journalmode" into main am: 9c7503368f am: e22afc71d6 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843638

Change-Id: I954e20b203cb09d891d337470582b5ea1e33cf18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 17:03:44 +00:00
Shaquille Johnson
e22afc71d6 Merge "Rename flag wal_db_journalmode" into main am: 9c7503368f 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843638

Change-Id: I116ca8e1e994b082fbcd25d88cff1db92a19aa2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-27 16:42:48 +00:00
Shaquille Johnson
9c7503368f Merge "Rename flag wal_db_journalmode" into main 2023-11-27 16:07:15 +00:00
Shaquille Johnson
d28f5cbe9b Rename flag wal_db_journalmode 
This flag was defined as a regular flag and then was later changed to a
fixed_read_only flag.  This scenario is currently "unsupported" by the
flags infrastructure; an error occurs when trying to advance the flag to
staging. Work around this by renaming the flag so that the flags
infrastructure sees it as an entirely new flag. This cl adds this flag
to the legacykeystore code as well.

Bug: 296464083
Bug: 311648623
Test: m keystore2
Change-Id: If62a5fac2404113ca0bbc0807f154401c4241bf1
 2023-11-27 12:17:13 +00:00
Alice Wang
1a5a78f85f Merge "[keystore2] Update comment when fetching rkpd attestation key" into main am: 0ecec06af2 am: 5663e66427 am: ccc104d396 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2845534

Change-Id: I6ebe7786aeed402ac8a047123b7c228161a0596f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 17:39:22 +00:00
Alice Wang
e130384afb Merge "[keystore2] Update comment when fetching rkpd attestation key" into main am: 0ecec06af2 am: 7835719ca7 am: 69059bb959 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2845534

Change-Id: Iea128bf65f2e5f4edc416fa9b94fb7cf84cf0f41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 17:38:37 +00:00
Alice Wang
ccc104d396 Merge "[keystore2] Update comment when fetching rkpd attestation key" into main am: 0ecec06af2 am: 5663e66427 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2845534

Change-Id: Ibefa15b8394c5b83d5f5a8798ec370bb3f1a039b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 17:07:36 +00:00
Alice Wang
69059bb959 Merge "[keystore2] Update comment when fetching rkpd attestation key" into main am: 0ecec06af2 am: 7835719ca7 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2845534

Change-Id: Ib956fa30be209ba3ac056b2434eb9a6108603a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 16:49:59 +00:00
Alice Wang
5663e66427 Merge "[keystore2] Update comment when fetching rkpd attestation key" into main am: 0ecec06af2 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2845534

Change-Id: I3ed50045bfc8ece21786ff05a1116c8af7d40fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 16:36:03 +00:00
Alice Wang
7835719ca7 Merge "[keystore2] Update comment when fetching rkpd attestation key" into main am: 0ecec06af2 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2845534

Change-Id: Ic9875170ce43bd7cce719d53daeb77e978f22e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-24 16:19:06 +00:00
Alice Wang
0ecec06af2 Merge "[keystore2] Update comment when fetching rkpd attestation key" into main 2023-11-24 15:40:49 +00:00
Alice Wang
f7148408b5 [keystore2] Update comment when fetching rkpd attestation key 
No code change.

Test: atest keystore2_test
Bug: 310047761
Change-Id: I4269bd4bc146ac0d0aa7b5ca9af93957399aa7b6
 2023-11-24 08:36:51 +00:00
Treehugger Robot
d23faca98c Merge "Fix android.keystore.cts.KeyAttestationTest" into main am: 111900fbc6 am: ab102cfc7b am: 3f028b11e2 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843680

Change-Id: Ia0485a3ae55f24abf5fe6013d280efd3f5c40404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 14:41:55 +00:00
Treehugger Robot
a373fb9ef8 Merge "Fix android.keystore.cts.KeyAttestationTest" into main am: 111900fbc6 am: 5059489708 am: 4dd0d183f5 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843680

Change-Id: I185de9ad2540af189139c50783e2600eafe01756
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 14:41:42 +00:00
Treehugger Robot
3f028b11e2 Merge "Fix android.keystore.cts.KeyAttestationTest" into main am: 111900fbc6 am: ab102cfc7b 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843680

Change-Id: Ic57166e06839d414df378a7b369cdb14bd1770a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 14:23:53 +00:00
Treehugger Robot
4dd0d183f5 Merge "Fix android.keystore.cts.KeyAttestationTest" into main am: 111900fbc6 am: 5059489708 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843680

Change-Id: I1637693c6eec3987822aa1b6a70ed9462f29e8f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 14:09:52 +00:00
Treehugger Robot
ab102cfc7b Merge "Fix android.keystore.cts.KeyAttestationTest" into main am: 111900fbc6 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843680

Change-Id: Id2497d12d94a7f49178ac45b2b66696535304ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 13:47:46 +00:00
Treehugger Robot
5059489708 Merge "Fix android.keystore.cts.KeyAttestationTest" into main am: 111900fbc6 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2843680

Change-Id: I5d08ffd328651b0c4a5154aebb625afdcd5a20ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-23 13:37:15 +00:00
Treehugger Robot
111900fbc6 Merge "Fix android.keystore.cts.KeyAttestationTest" into main 2023-11-23 13:04:09 +00:00
Alice Wang
b03ed83251 Fix android.keystore.cts.KeyAttestationTest 
This cl moves the RPC name searching logic inside the attestation
key fetch function to fix the failing tests.

Test: atest keystore2_test
Bug: 310047761
Change-Id: Ied5fbd3248cae6aec230cacfa6807b3cb2b7cf4b
 2023-11-23 11:59:45 +00:00
Eric Biggers
6ea1c60e67 Rename the fix_unlocked_device_required_keys flag 
This flag was defined as a regular flag and then was later changed to a
fixed_read_only flag.  This scenario is currently "unsupported" by the
flags infrastructure; an error occurs when trying to advance the flag to
staging.  Work around this by renaming the flag so that the flags
infrastructure sees it as an entirely new flag.

Bug: 296464083
Bug: 311648623
Test: build
Change-Id: Iafde2d63578bf65b3f5a08ab57561eadbe8f6b7a
 2023-11-22 16:21:59 +00:00
David Drysdale
70dfdf347a Merge changes I28f673b6,I146f7cfd into main am: 39b7af2fcd am: 37744f6cfd am: 9c054ebb32 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2821841

Change-Id: I33bc50570c55f117db3302ecb64b22df2d8ee5ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 12:26:00 +00:00
David Drysdale
72db1e0c95 Merge changes I28f673b6,I146f7cfd into main am: 39b7af2fcd am: eed416d4a8 am: 4d6e7b22ff 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2821841

Change-Id: I2c556679c8d3f1c6f146a51673ee8a35d30fdc8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 12:23:51 +00:00
David Drysdale
9c054ebb32 Merge changes I28f673b6,I146f7cfd into main am: 39b7af2fcd am: 37744f6cfd 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2821841

Change-Id: Iacd7f0d61e31fa18e18ae324b91543a5fdcd970b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 11:52:06 +00:00
David Drysdale
4d6e7b22ff Merge changes I28f673b6,I146f7cfd into main am: 39b7af2fcd am: eed416d4a8 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2821841

Change-Id: Ia446ca76b3129c5429af3216bc3271a952565628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 11:49:38 +00:00
David Drysdale
37744f6cfd Merge changes I28f673b6,I146f7cfd into main am: 39b7af2fcd 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2821841

Change-Id: I1f1ce6604d72d9d3f6109526ac8499bd959167cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 11:19:22 +00:00
David Drysdale
eed416d4a8 Merge changes I28f673b6,I146f7cfd into main am: 39b7af2fcd 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2821841

Change-Id: Ie8a1edf47feacc1a8a2be827e5f3cc82160d5742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-20 11:18:03 +00:00
David Drysdale
39b7af2fcd Merge changes I28f673b6,I146f7cfd into main 
* changes:
  Flag for import of previously-emulated keys
  Cope with previously-emulated keys
 2023-11-20 10:43:44 +00:00
Alice Wang
0d50d74877 Merge "Make librkpd_client available to com.android.virt" into main am: 416683bc23 am: 6793c2e735 am: f63018fdff 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817842

Change-Id: I3fe0bde2a6bf2f01a8d58119c561fdd44b485386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 10:17:22 +00:00
Alice Wang
246727a8ec Merge "Make librkpd_client available to com.android.virt" into main am: 416683bc23 am: 6722754e43 am: b8b7f6f457 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817842

Change-Id: I9d06c436f389940ef3e0b0cf582f6662b3bd037f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 10:15:07 +00:00
Alice Wang
f63018fdff Merge "Make librkpd_client available to com.android.virt" into main am: 416683bc23 am: 6793c2e735 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817842

Change-Id: I5b3a70a080293a3dae3cc48c77e9b6a5f4e2baf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 09:46:27 +00:00
Alice Wang
b8b7f6f457 Merge "Make librkpd_client available to com.android.virt" into main am: 416683bc23 am: 6722754e43 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817842

Change-Id: Ia74923dec3e34b9c06789ecdf78e0d24456db80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 09:43:45 +00:00
Alice Wang
6722754e43 Merge "Make librkpd_client available to com.android.virt" into main am: 416683bc23 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817842

Change-Id: I24e5bc60d318e6d8cd5cdf725d082e86947faac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 09:29:37 +00:00
Alice Wang
6793c2e735 Merge "Make librkpd_client available to com.android.virt" into main am: 416683bc23 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817842

Change-Id: I32dce7d214396715e0db562b1602c3d9ca284474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-17 09:29:28 +00:00
Alice Wang
416683bc23 Merge "Make librkpd_client available to com.android.virt" into main 2023-11-17 09:05:45 +00:00
Eric Biggers
5c890ec9e1 Merge "keystore2: fix UnlockedDeviceRequired to work without LSKF" into main am: dfbab7e6bc am: bce56084de am: a382f32b7f 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2805742

Change-Id: Id0a593dda651cfe3996b5eeebac0ee80fc00cd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 19:45:44 +00:00
Eric Biggers
0c3c911fb3 Merge "keystore2: fix UnlockedDeviceRequired to work without LSKF" into main am: dfbab7e6bc am: 9a4da544c1 am: 1c04e18c60 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2805742

Change-Id: I8720cc829c93346820cb3508ad61489b447fb5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 19:44:19 +00:00
Eric Biggers
a382f32b7f Merge "keystore2: fix UnlockedDeviceRequired to work without LSKF" into main am: dfbab7e6bc am: bce56084de 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2805742

Change-Id: I2ef4ebc3c9ede41337d428f4d4f84a9edc71f93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 19:08:11 +00:00
Eric Biggers
1c04e18c60 Merge "keystore2: fix UnlockedDeviceRequired to work without LSKF" into main am: dfbab7e6bc am: 9a4da544c1 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2805742

Change-Id: I03522ba05d078e51c911a9edb527de5265ddd3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 19:07:05 +00:00
Eric Biggers
bce56084de Merge "keystore2: fix UnlockedDeviceRequired to work without LSKF" into main am: dfbab7e6bc 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2805742

Change-Id: I7104e777d674e33a56c03b6cd821cecb0ca6676f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 18:33:30 +00:00
Eric Biggers
9a4da544c1 Merge "keystore2: fix UnlockedDeviceRequired to work without LSKF" into main am: dfbab7e6bc 
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2805742

Change-Id: I04dceb29e39ab4683035edf03c8d89dcb6f4f920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-15 18:32:36 +00:00