Commit graph

8563 commits

Author SHA1 Message Date
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
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
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
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
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
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
James Willcox
855f233004 Merge "Add getLastAuthTime() to IKeystoreAuthorization" into main 2023-11-02 21:09:20 +00:00
James Willcox
d215da817a Add getLastAuthTime() to IKeystoreAuthorization
This returns the time (from CLOCK_MONOTONIC_RAW) that the specified user
last authenticated using the given authenticator.

Bug: 303839446
Test: atest keystore2_client_tests
Change-Id: Idd4c477365ffa556b7985d1d926dfa554680ff28
2023-10-31 20:30:50 +00:00
Treehugger Robot
9e3c07c685 Merge "Adding tests using APPLICATION_DATA and APPLICATION_ID." into main am: 449c3b2cec am: 3f359bef83
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616129

Change-Id: I6101940effc98d53e2bd6891a471d4375b7d02e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 19:30:57 +00:00
Treehugger Robot
9bac96b68b Merge "Adding tests using APPLICATION_DATA and APPLICATION_ID." into main am: 449c3b2cec am: ee68b156f3
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616129

Change-Id: I52fd3c7c650f0b651eedcec6100f266c4eacf6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 19:29:04 +00:00
Treehugger Robot
3f359bef83 Merge "Adding tests using APPLICATION_DATA and APPLICATION_ID." into main am: 449c3b2cec
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616129

Change-Id: I873591e54bfff61d6c1ee2ca612ca578aa70d49f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 19:04:05 +00:00
Treehugger Robot
ee68b156f3 Merge "Adding tests using APPLICATION_DATA and APPLICATION_ID." into main am: 449c3b2cec
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616129

Change-Id: I15080689250d687f66c53d7bf3984688d9e90f1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 19:02:02 +00:00
Treehugger Robot
449c3b2cec Merge "Adding tests using APPLICATION_DATA and APPLICATION_ID." into main 2023-10-31 18:22:42 +00:00
Orlando Arbildo
9ee036add7 Adding 'static bound on binder Interface implementation
Adding a 'static bound for a binder Interface Implementation.
This is now needed to allow new code used to cast a Binder
Native object back to the original object that implements the
Binder Interface.

Test: CI
Bug: 278780666
Change-Id: Ifa1ec4d4c6692d75ada6c58cb97e6c82b791be04
2023-10-31 00:15:22 +00:00
Shaquille Johnson
2cbadecb47 Merge "Add flag for deprecation of Legacy Keystore" into main am: ca3fa2b990 am: 51880ba16b
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2799438

Change-Id: I2f602275d6bff5ba6e41f55ab6ac49600f5125a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 06:13:37 +00:00
Shaquille Johnson
105bce3f92 Merge "Add flag for deprecation of Legacy Keystore" into main am: ca3fa2b990 am: fb1dc5db9c
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2799438

Change-Id: Ic40ff9931a7036930010e027db165a4933a709eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 06:12:23 +00:00
Shaquille Johnson
51880ba16b Merge "Add flag for deprecation of Legacy Keystore" into main am: ca3fa2b990
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2799438

Change-Id: Id0cb26938806f9bb141a0a2dcecbad2e0bce3f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 05:46:47 +00:00
Shaquille Johnson
fb1dc5db9c Merge "Add flag for deprecation of Legacy Keystore" into main am: ca3fa2b990
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2799438

Change-Id: Ie39461669d42bb9793802cc2d0c74eee9a363dea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 05:45:13 +00:00
Shaquille Johnson
ca3fa2b990 Merge "Add flag for deprecation of Legacy Keystore" into main 2023-10-30 05:18:05 +00:00
Shaquille Johnson
7e4cd0ade7 Add flag for deprecation of Legacy Keystore
Test: m keystore2
Bug: 307460850
Change-Id: Ib09449ad1a84c9f6dd455d8b14e1830788c86d49
2023-10-30 03:53:36 +00:00
Rajesh Nyamagoud
290dd7386f Adding tests using APPLICATION_DATA and APPLICATION_ID.
1. Generate a key with application-data and use the generated key to
   create an operation using the same application-data. Test should
   create an operation successfully.

2. Generate a key with application-data and use the generated key to
   create an operation using different application-data. Test should
   fail to create an operation with `INVALID_KEY_BLOB` error code.

3. Generate a key with application-id and use the generated key to
   create an operation using the same application-id. Test should
   create an operation successfully.

4. Generate a key with application-id and use the generated key to
   create an operation using different application-id. Test should
   fail to create an operation with `INVALID_KEY_BLOB` error code.

5. Generate an attestation key without app-id and app-data. Test should
   generate a new key with specifying app-id, app-data and using
   previously generated attestation key. Test should be able to generate
   a new key successfully.

6. Generate an attestation key with app-id and app-data. Test should try
   to generate an attested key using previously generated attestation
   key without specifying same app-id, app-data. Test should fail to
   generate a new key with an error code `INVALID_KEY_BLOB`. It is an
   oversight of the Keystore API that `APPLICATION_ID` and
   `APPLICATION_DATA` tags cannot be provided to generateKey for
   an attestation key that was generated with them.

Bug: 279721870
Test: atest keystore2_client_tests
Change-Id: I56fad4806c6d96c5994f4affdd7aa6620b1f1be8
2023-10-27 19:25:09 +00:00
Tri Vo
fff0933f1e Merge "Add keystore2_client_tests to VTS" into main am: c08cf0863a am: ba26738a15
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2800414

Change-Id: Ia5f95e83b0555bbd36b2221ffad6233229c17e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 16:49:05 +00:00
Tri Vo
c2d24ca142 Merge "Add keystore2_client_tests to VTS" into main am: c08cf0863a am: 64da3e766c
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2800414

Change-Id: Ibb10965d775eff48b16d108a1864a00f3d3bc8db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 16:47:38 +00:00