Commit graph

9102 commits

Author SHA1 Message Date
James Willcox
5b5890081b Merge "Use CLOCK_BOOTTIME for keystore2 auth token received time" into main am: 464c7d3d2b
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2822970

Change-Id: If5a14bee81ca590fcb378357d0487ccbca61dead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 18:47:53 +00:00
Eric Biggers
17e96a8797 Merge changes I26394509,I9d76a0ec,I88779273 into main
* changes:
  keystore2: link to android.security flags library
  keystore2: log super key creation
  keystore2: factor out create_super_key()
2023-11-08 18:42:45 +00:00
James Willcox
464c7d3d2b Merge "Use CLOCK_BOOTTIME for keystore2 auth token received time" into main 2023-11-08 18:12:42 +00:00
James Willcox
80f7be1516 Use CLOCK_BOOTTIME for keystore2 auth token received time
CLOCK_BOOTTIME is more correct because it includes time spent
while the device is suspended.

This also fixes an issue when comparing the times resulting from the
get_last_auth_time() API in the Java world, because we want to use
SystemClock.elapsedRealtime(), which uses CLOCK_BOOTTIME.

Bug: 309686873
Test: atest keystore2_client_tests
Change-Id: I89d71ccfcfe4f8b3495fede40ae26ad6fa2b0118
2023-11-08 17:13:49 +00:00
Alice Wang
94a2aaad29 Merge "[refactor] Split the message macro in a standalone library for reuse" into main am: f1aba2721c am: 9f1a7fbe40 am: ddb1efe898
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817476

Change-Id: I5739002eb845c575178f1d4824598b13c3886cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 10:50:47 +00:00
Alice Wang
35e6885de6 Merge "[rkpd] Move security level to RPC name conversion out of rkpd_client" into main am: 5f70d89999 am: 8d442a6e3c am: 14efc74ea5
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817839

Change-Id: I2dcfd50a6fcac354eb533057fb890a3d5c6416bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 10:50:38 +00:00
Alice Wang
fd283b75ba Merge "[refactor] Split the message macro in a standalone library for reuse" into main am: f1aba2721c am: e82faef4b4 am: b5c6c2475a
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817476

Change-Id: Ia23cb5caeab35aa03bb5862772af82b4e99b712c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 10:50:09 +00:00
Alice Wang
816b290f3a Merge "[rkpd] Move security level to RPC name conversion out of rkpd_client" into main am: 5f70d89999 am: 17fabddcdb am: 286967deaf
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817839

Change-Id: I94fe029cfa11e4c2979443fc6092bdc0c778d8fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 10:49:34 +00:00
Alice Wang
ddb1efe898 Merge "[refactor] Split the message macro in a standalone library for reuse" into main am: f1aba2721c am: 9f1a7fbe40
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817476

Change-Id: Ia844088db2ee702cebdc1c6885bdea231bd157a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 10:10:18 +00:00
Alice Wang
14efc74ea5 Merge "[rkpd] Move security level to RPC name conversion out of rkpd_client" into main am: 5f70d89999 am: 8d442a6e3c
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817839

Change-Id: I04738a268dac7e0e3a90bb78a7192bef8143e612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 10:08:41 +00:00
Alice Wang
b5c6c2475a Merge "[refactor] Split the message macro in a standalone library for reuse" into main am: f1aba2721c am: e82faef4b4
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817476

Change-Id: Ide0cb603eb415f86c91af12dccf09abd7dc5e0e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 10:07:19 +00:00
Alice Wang
286967deaf Merge "[rkpd] Move security level to RPC name conversion out of rkpd_client" into main am: 5f70d89999 am: 17fabddcdb
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817839

Change-Id: I24be634507b748e524e5fe0d3b04323603b9e6eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 10:06:16 +00:00
Alice Wang
9f1a7fbe40 Merge "[refactor] Split the message macro in a standalone library for reuse" into main am: f1aba2721c
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817476

Change-Id: I0f5c37a210bc44d7be2cee1ce97e2e4dc6d3a35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 09:38:50 +00:00
Alice Wang
8d442a6e3c Merge "[rkpd] Move security level to RPC name conversion out of rkpd_client" into main am: 5f70d89999
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817839

Change-Id: I6ef811436e87d8368b26503c90f6975fa71a1d69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 09:38:39 +00:00
Alice Wang
e82faef4b4 Merge "[refactor] Split the message macro in a standalone library for reuse" into main am: f1aba2721c
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817476

Change-Id: I1f3230880e2ea34e938fc78f80e0198ba60279cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 09:36:08 +00:00
Alice Wang
17fabddcdb Merge "[rkpd] Move security level to RPC name conversion out of rkpd_client" into main am: 5f70d89999
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817839

Change-Id: I467a61afa45cfd5f10e11286eee3951c33c0c47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 09:35:01 +00:00
Alice Wang
4277d2e1ca [rkpd] Move watchdog calls from rkpd_client to keystore2
This cl moves watchdog calls to keystore2 to make rkpd_client
less dependent on keystore2, this allows us to make rkpd_client
an independent library more easily later.

Test: atest keystore2_test
Bug: 241428146
Change-Id: Ic3040ad65356aa7e25d38f36d453a258caf28403
2023-11-08 09:15:54 +00:00
Alice Wang
f1aba2721c Merge "[refactor] Split the message macro in a standalone library for reuse" into main 2023-11-08 09:05:30 +00:00
Alice Wang
5f70d89999 Merge "[rkpd] Move security level to RPC name conversion out of rkpd_client" into main 2023-11-08 09:05:21 +00:00
Alice Wang
560c443054 Merge "[refactor] Split watchdog in a standalone library for reuse" into main am: 9e89235bf1 am: c1a30963d0 am: 5ba64163c8
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817564

Change-Id: I6e8d83460a661ebdb56ccde999e703a96fbbff02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 14:02:37 +00:00
Alice Wang
cdb3ee9fd1 Merge "[refactor] Split watchdog in a standalone library for reuse" into main am: 9e89235bf1 am: f001f6c7ea am: 584b7d4e5f
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817564

Change-Id: Idfdf3ae9e7d98601195768cb63b083334ec2ddfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 14:02:15 +00:00
Alice Wang
e66c3310cd [refactor] Split the message macro in a standalone library for reuse
This simplifies the task of creating an independent library of
rkpd_client later.

Test: atest keystore2_test
Bug: 241428146
Change-Id: Idddf37d14580e691fde5a494e54297465cb693b6
2023-11-07 13:47:54 +00:00
Alice Wang
bf6a693217 [rkpd] Move security level to RPC name conversion out of rkpd_client
This will facilitate the extraction of rkpd_client as a standalone
library later.

Test: atest keystore2_test
Bug: 241428146
Change-Id: Icff6f88f2c3cc3dc50dd126067ed5f10c8aa7b29
2023-11-07 13:27:54 +00:00
Alice Wang
5ba64163c8 Merge "[refactor] Split watchdog in a standalone library for reuse" into main am: 9e89235bf1 am: c1a30963d0
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817564

Change-Id: I5a72a9cbcbdad6a8a3f1e9028b1eb76bc37a622d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 13:21:13 +00:00
Alice Wang
584b7d4e5f Merge "[refactor] Split watchdog in a standalone library for reuse" into main am: 9e89235bf1 am: f001f6c7ea
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817564

Change-Id: I28a49c304b79e5e246c3018b8819b6b0c04dcab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 13:19:03 +00:00
Alice Wang
c1a30963d0 Merge "[refactor] Split watchdog in a standalone library for reuse" into main am: 9e89235bf1
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817564

Change-Id: I668ecefddeffac0d52adf23742e457be29813b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 12:48:31 +00:00
Alice Wang
f001f6c7ea Merge "[refactor] Split watchdog in a standalone library for reuse" into main am: 9e89235bf1
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817564

Change-Id: I27a7b8166fe86d4bbbaf529372f9c2ccffe2546b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 12:45:44 +00:00
Alice Wang
9e89235bf1 Merge "[refactor] Split watchdog in a standalone library for reuse" into main 2023-11-07 12:28:16 +00:00
Alice Wang
83c6aefb5d [refactor] Split watchdog in a standalone library for reuse
This simplifies the task of creating an independent library of
rkpd_client later.

Test: atest keystore2_test
Bug: 241428146
Change-Id: I2834c9be9f5100d52829e6392f0dd48e7c76beb1
2023-11-07 10:30:26 +00:00
Treehugger Robot
b915f5eabd Merge "Update needed for Rust v1.73.0" into main am: 0e4c1c4129 am: f05f5ca2d3 am: ffc7d3cee4
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817885

Change-Id: I73e5b2e0213d5fcb6c65136d5e4c330560d858c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 01:13:04 +00:00
Treehugger Robot
971ed5987a Merge "Update needed for Rust v1.73.0" into main am: 0e4c1c4129 am: d8a6f71034 am: 63870227c7
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817885

Change-Id: I9d659bf26ae3be0a5956210ecf9004fe91d1fff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 01:10:57 +00:00
Treehugger Robot
ffc7d3cee4 Merge "Update needed for Rust v1.73.0" into main am: 0e4c1c4129 am: f05f5ca2d3
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817885

Change-Id: I8349cd139ec3f9cffff10724baae04878e30615c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 01:03:56 +00:00
Treehugger Robot
f05f5ca2d3 Merge "Update needed for Rust v1.73.0" into main am: 0e4c1c4129
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817885

Change-Id: Ibf8a3267641b542ffacdc8318f6f9104afc3eea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 00:34:23 +00:00
Treehugger Robot
63870227c7 Merge "Update needed for Rust v1.73.0" into main am: 0e4c1c4129 am: d8a6f71034
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817885

Change-Id: Iac30af8c3d9b75753920f967754d89750b15d60e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-07 00:29:35 +00:00
Treehugger Robot
d8a6f71034 Merge "Update needed for Rust v1.73.0" into main am: 0e4c1c4129
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817885

Change-Id: I9964d7d0da7edcfe5601b1c04d1ce790818ee729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 23:59:11 +00:00
Treehugger Robot
0e4c1c4129 Merge "Update needed for Rust v1.73.0" into main 2023-11-06 23:44:04 +00:00
Orlando Arbildo
5814f1c4d3 Merge "Adding 'static bound on binder Interface implementation" into main am: c0e1f3589b am: e09e6606df am: 3995007fd0
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2811277

Change-Id: I8df93f4dab4e47e435412e0fbec829abe2d58543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:57:01 +00:00
Orlando Arbildo
6e1979e25a Merge "Adding 'static bound on binder Interface implementation" into main am: c0e1f3589b am: d22ca185e0 am: 5cac7c4ac0
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2811277

Change-Id: I993aaa42eb0888a3f71bfeb04341a21b90441426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:56:40 +00:00
Charisee
78e844b86a Update needed for Rust v1.73.0
Remove redundancy
Bug: 303252546
Test: ./test_compiler.py --prebuilt-path dist/rust-dev.tar.xz  --target aosp_cf_x86_64_phone --image

Change-Id: Ia4366c2694c235f8931eea56d13548f08805952f
2023-11-06 20:41:19 +00:00
Orlando Arbildo
3995007fd0 Merge "Adding 'static bound on binder Interface implementation" into main am: c0e1f3589b am: e09e6606df
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2811277

Change-Id: I7e2e4e78e17dd6a0c924ef8bf63d48202f8a6da0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:15:52 +00:00
Orlando Arbildo
5cac7c4ac0 Merge "Adding 'static bound on binder Interface implementation" into main am: c0e1f3589b am: d22ca185e0
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2811277

Change-Id: Ia9f8a28d8cc6b7a520197840fe8d76f27fc5b593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 20:13:30 +00:00
Orlando Arbildo
e09e6606df Merge "Adding 'static bound on binder Interface implementation" into main am: c0e1f3589b
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2811277

Change-Id: I1846b641282f92507172c32664f38da62f24bb2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 19:30:13 +00:00
Orlando Arbildo
d22ca185e0 Merge "Adding 'static bound on binder Interface implementation" into main am: c0e1f3589b
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2811277

Change-Id: I6e945f0c2252e3a9b7d13e34f479fa794b238e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-06 19:27:55 +00:00
Orlando Arbildo
c0e1f3589b Merge "Adding 'static bound on binder Interface implementation" into main 2023-11-06 18:44:01 +00:00
James Willcox
e91a60dbe6 Merge "Add getLastAuthTime() to IKeystoreAuthorization" into main am: 855f233004 am: 1b4335d115 am: aa97bbbbbd
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2770182

Change-Id: Id3c82cae1294bcbd473a361d2b506240551ac91b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:22:54 +00:00
James Willcox
d5091d289e Merge "Add getLastAuthTime() to IKeystoreAuthorization" into main am: 855f233004 am: 703e6f78d5 am: 02b555a220
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2770182

Change-Id: I9671a4d0782eb8e44ded4c5bfd5961387f874645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:21:19 +00:00
James Willcox
aa97bbbbbd Merge "Add getLastAuthTime() to IKeystoreAuthorization" into main am: 855f233004 am: 1b4335d115
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2770182

Change-Id: I671aa500265171052ae2de9e678ba9349db96ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:12:34 +00:00
James Willcox
02b555a220 Merge "Add getLastAuthTime() to IKeystoreAuthorization" into main am: 855f233004 am: 703e6f78d5
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2770182

Change-Id: Ib30df770f9c16c4badbe6d0abf9148cb1a030633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 22:10:02 +00:00
James Willcox
1b4335d115 Merge "Add getLastAuthTime() to IKeystoreAuthorization" into main am: 855f233004
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2770182

Change-Id: I96beeff583808ccde5edeee28c40b2ef72bcca17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 21:42:17 +00:00
James Willcox
703e6f78d5 Merge "Add getLastAuthTime() to IKeystoreAuthorization" into main am: 855f233004
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2770182

Change-Id: Id80d18310cfe807e468dfe7d5a7b7ed759e743da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-02 21:39:59 +00:00