Commit graph

1019 commits

Author SHA1 Message Date
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
Treehugger Robot
449c3b2cec Merge "Adding tests using APPLICATION_DATA and APPLICATION_ID." into main 2023-10-31 18:22:42 +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
4e6dbef7f7 Add keystore2_client_tests to VTS
Bug: 194359114
Test: keystore2_client_tests
Change-Id: I74f29e8c42fd6fdca07a7999dfc2e5345ad45c09
2023-10-23 14:50:30 -04:00
Tri Vo
724e4e5660 Add keystore2_client_tests to TEST_MAPPING
Bug: 194359114
Test: keystore2_client_tests
Change-Id: Ia5f774cd797d1b4b4e343a5588833739ad4843ee
2023-10-23 14:50:25 -04:00
Eran Messeri
f692f42327 Merge "The INCLUDE_UNIQUE_ID parameter is not strictly expected to be in key authorizations." into main 2023-10-20 16:14:01 +00:00
Rajesh Nyamagoud
17a9261560 The INCLUDE_UNIQUE_ID parameter is not strictly expected to be in key authorizations.
Bug: 279721870
Test: atest keystore2_client_tests
Change-Id: Ic5724cf7ea2b6ad6d1f80e34524af777e5e0ea49
2023-10-19 17:29:12 +00:00
Eric Biggers
b1f641d7a5 keystore2: rename the ScreenLockBound superencryption keys and type
Rename the ScreenLockBound superencryption keys and superencryption type
to UnlockedDeviceRequired.  This avoids confusion about what "screen
lock bound" means and makes the terminology consistent with the
UnlockedDeviceRequired key parameter in the API.

Bug: 296464083
Test: atest -p --include-subdirs system/security/keystore2
Test: atest CtsKeystoreTestCases
Flag: exempt, mechanical refactoring and comment changes
Change-Id: I98f7716d05c06f8c6db0f3eb616fb6e780407c2d
2023-10-18 01:54:18 +00:00
Eric Biggers
673d34addb keystore2: rename the LskfBound superencryption key and type
Rename the LskfBound superencryption key and superencryption type (also
known as per-boot) to AfterFirstUnlock.

This makes it much clearer what the protection of this key is.  This
includes avoiding the misleading use of "LSKF"; the secret that's
actually relevant is the user's synthetic password, which is most
commonly unlocked with the LSKF but can potentially be unlocked in other
ways.  This is also helpful for the planned change to make the user's
super keys exist even while the user doesn't have an LSKF.

Bug: 296464083
Test: atest -p --include-subdirs system/security/keystore2
Test: atest CtsKeystoreTestCases
Flag: exempt, mechanical refactoring and comment changes
Change-Id: I9b16934f37222fef2bf01830f521928ef2c1853a
2023-10-18 01:54:18 +00:00
Eric Biggers
1386937eca keystore2: rename values of UserState enum
Rename UserState::LskfLocked to UserState::BeforeFirstUnlock, and
rename UserState::LskfUnlocked to UserState::AfterFirstUnlock.

This makes it much clearer what these states are.  This includes
avoiding the misleading use of "LSKF"; the secret that's actually
relevant is the user's synthetic password, which is most commonly
unlocked with the LSKF but can potentially be unlocked in other ways.
This is also helpful for the planned change to make the user's super
keys exist even while the user doesn't have an LSKF.

Bug: 296464083
Test: atest -p --include-subdirs system/security/keystore2
Test: atest CtsKeystoreTestCases
Flag: exempt, mechanical refactoring and comment changes
Change-Id: I78f15e2165876951c98e22e577fc4c92a3602b3b
2023-10-18 01:54:18 +00:00
Treehugger Robot
7eea1e3c1c Merge "Update needed for Rust v1.73.0" into main 2023-10-17 16:33:52 +00:00
David Drysdale
abdfe3a53e Merge "Add utilities to deal with software keyblobs" into main 2023-10-17 06:44:29 +00:00
Treehugger Robot
e79fe80acf Merge changes Ic7857267,I2bf53018 into main
* changes:
  Adding tests to check unique id attestation.
  Changes are made in keystore-client-tests to verify CREATION_DATETIME, ATTESTATION_CHALLENGE and ATTESTATION_APPLICATION_ID.
2023-10-16 17:20:52 +00:00
Eric Biggers
b6d1dfbe0b Merge "Remove IKeystoreMaintenance#getState()" into main 2023-10-16 16:26:56 +00:00
Charisee
6fff58e850 Update needed for Rust v1.73.0
Bug: 303252546
Test: ./test_compiler.py --prebuilt-path dist/rust-dev.tar.xz  --target aosp_cf_x86_64_phone --image
Change-Id: Icbe8740b2bff6bf35fd18cdaee1518af5a11a348
2023-10-14 21:11:03 +00:00
Treehugger Robot
df6fe6d17d Merge "Adding tests using MAX_USES_PER_BOOT, EARLY_BOOT_ONLY, BOOTLOADER_ONLY and USAGE_COUNT_LIMIT" into main 2023-10-13 10:56:03 +00:00
David Drysdale
c0ed986a8d Add utilities to deal with software keyblobs
Add code (adapted from system/keymint/common/src/keyblob/legacy.rs)
which parses keyblobs in the format produced by the previous C++
reference implementation of KeyMint.

Bug: 283077822
Bug: 296403357
Test: tested with ARC upgrade, see b/296403357
Change-Id: I519eed0ac968d5c2595f95609ffadede5d2d2677
2023-10-12 09:27:49 +01:00
David Drysdale
cc5143e2b1 Merge changes I8539455e,I14f0d535 into main
* changes:
  Cope with Keymaster->KeyMint device upgrade
  Commonize upgrade_keyblob_if_required_with
2023-10-11 10:50:21 +00:00
David Drysdale
5accbaa18a Cope with Keymaster->KeyMint device upgrade
When handling keyblob upgrade required, also watch out for an invalid
keyblob error that might indicate that a key used to be a
km_compat-wrapped Keymaster key.

In this situation, try stripping off the km_compat prefix and
attempt upgrade of the inner keyblob data instead.

Bug: 251426862
Bug: 283077822
Bug: 296403357
Test: tested with ARC upgrade, see b/296403357
Change-Id: I8539455e33ab2e1c97f26174476ee9d616269e74
2023-10-10 07:04:50 +01:00
Eric Biggers
2f9498af06 Remove IKeystoreMaintenance#getState()
IKeystoreMaintenance#getState() is no longer called, so remove it along
with the enum value for the GetState permission.

Bug: 296464083
Test: atest -p --include-subdirs system/security/keystore2
Change-Id: I9ec6cca78cd1eb899ac7adfc99fc5eee41dc7e44
2023-10-09 23:16:05 +00:00
Rajesh Nyamagoud
f408c28c0e Adding tests to check unique id attestation.
Bug: 279721870
Test: atest keystore2_client_tests
Change-Id: Ic7857267345035ad0d92d8176d34cfe3e64e5c62
2023-10-09 21:59:43 +00:00
Rajesh Nyamagoud
5f6db2f442 Changes are made in keystore-client-tests to verify CREATION_DATETIME,
ATTESTATION_CHALLENGE and ATTESTATION_APPLICATION_ID.

Bug: 279721870
Test: atest keystore2_client_tests
Change-Id: I2bf530189e41ede27763ef696ff9a126c4110e24
2023-10-09 21:51:19 +00:00
Rajesh Nyamagoud
f436a9326c Adding tests using MAX_USES_PER_BOOT, EARLY_BOOT_ONLY, BOOTLOADER_ONLY and USAGE_COUNT_LIMIT
1. Generate a key with `BOOTLOADER_ONLY` tag. Test should successfully
   generate a key and verify the key characteristics. Test should fail
   with error code `INVALID_KEY_BLOB` during creation of an operation
   using this key.

2. Generate a key with `EARLY_BOOT_ONLY` tag. Test should successfully
   generate a key and verify the key characteristics. Test should fail
   with error code `EARLY_BOOT_ENDED` during creation of an operation
   using this key.

3. Generate a key with `MAX_USES_PER_BOOT` tag. Test should successfully
   generate a key and verify the key characteristics. Test should be
   able to use the key successfully `MAX_USES_COUNT` times. After
   exceeding key usage `MAX_USES_COUNT` times subsequent attempts to use
   the key in test should fail with error code `MAX_OPS_EXCEEDED`.

4. Generate a key with `USAGE_COUNT_LIMIT` tag. Test should successfully
   generate a key and verify the key characteristics. Test should be
   able to use the key successfully `MAX_USES_COUNT` times. After
   exceeding key usage `MAX_USES_COUNT` times subsequent attempts to use
   the key in test should fail with error code `KEY_NOT_FOUND`. Test
   should also check attest record for attested keys that
   `USAGE_COUNT_LIMIT` is included in attest record.

Bug: 279721870
Test: atest keystore2_client_tests
Change-Id: I205964b571d92dc0fcbd11b1f6d45bc3aea7c050
2023-10-09 21:44:48 +00:00
Rajesh Nyamagoud
75dfa0c2ec Adding tests using tags ACTIVE_DATETIME, ORIGINATION_EXPIRE_DATETIME,
USAGE_EXPIRE_DATETIME.

1. Tests will generate a key with current date and time set to
   active-datetime and verify the key characteristics. Test will use
   this key to create a sign operation successfully.

2. Test will generate a key with future date set to active-datetime and
   verify the key characteristics. Test will fail with error code
   `KEY_NOT_YET_VALID` while creating an operation using generated key.

3. Tests will generate a key with future date and time set to
   origination-expire-datetime and verify the key characteristics. Test
   will use this key to create a sign operation successfully.

4. Test will generate a key with current date and time set to
   origination-expire-datetime and verify the key characteristics. Test
   will fail with error code `KEY_EXPIRED` while creating an operation
   using generated key.

5. Tests will generate a key with future date and time set to
   usage-expire-datetime and verify the key characteristics. Test
   will use this key to successfully verify the signature created using
   this key.

6. Tests will generate a key with current date and time set to
   usage-expire-datetime and verify the key characteristics. Test
   will fail with error code `KEY_EXPIRED` while verifying the signature
   created using this key.

7. Test will generate a AES key with future date and time set to
   usage-expire-datetime and verify the key characteristics. Test
   will perform encrypt and decrypt operations using this generated key
   successfully.

8. Test will generate a AES key with current date and time set to
   usage-expire-datetime and verify the key characteristics. Test
   will fail with error code `KEY_EXPIRED` while creating Decrypt
   operation using generated key.

Bug: 279721870
Test: atest keystore2_client_tests
Change-Id: I8a0865a6256a6da133e95d0ee8250ba67359a2a2
2023-10-09 21:10:00 +00:00
Eric Biggers
3363996eaf Merge "IKeystoreMaintenance.aidl: document permissions correctly" into main 2023-10-09 16:41:43 +00:00
David Drysdale
96db425969 Commonize upgrade_keyblob_if_required_with
Bug: 251426862
Bug: 283077822
Bug: 296403357
Test: tested with ARC upgrade, see b/296403357
Change-Id: I14f0d53585c97da2ebdbd53aafa18c4d8b778e17
2023-10-09 10:07:26 +01:00
Rajesh Nyamagoud
19fe29adb3 Removed dependency on libkeymint_vts_test_utils.
Test: mmm system/security/keystore2/test_utils/; mmm system/security/keystore2/tests;
atest keystore2_client_tests; atest keystore2_test_utils_test; atest keystore2_test; atest keystore2_legacy_blobs_test;
Bug: 194359114

Change-Id: I2e17697c8ea54b1c38e128b32b4d30f1214c51fc
2023-10-06 23:15:21 +00:00
Eric Biggers
37e72923ce IKeystoreMaintenance.aidl: document permissions correctly
Test: N/A
Change-Id: Ia31dd277e17d32b857d1dd0fe58b8903c6ad2679
2023-10-06 21:42:06 +00:00
Shaquille Johnson
7f5a815ac4 Use pragma WAL in db connections
WAL mode allows db connections to open when the disk
is full. This is done in the current and legacy db and
tested manually by the commandline.

Testing: Filled a file with empty values until it took up all the space on the disk then accessed the database. This was not possible with this mode disabled but was once I enabled it on a new flash

Bug: 191777960
Test: atest keystore2_test and atest CtsKeystoreTestCases, filled real device to full and tested
Change-Id: Ic1a45fd635168061a6c5489a42a67cb59d3ddc6a
2023-10-03 11:39:28 +00:00
Shaquille Johnson
bce0cac39f Remove java generated files
Remove improper import and make the flag a constant
with the read only option

Bug: 191777960
Test: m keystore2
Change-Id: I34bd2d0d891686c93a167456e8d50eec75374244
2023-09-27 22:28:05 +01:00
Shaquille Johnson
6a751993d5 Add aconfig flags for rust keystore2
Test: m keystore2
Change-Id: I0bdd3d34a4e78500b266b8aac321ff1e2903dffb
2023-09-27 17:08:42 +01:00
Seth Moore
373225c6c5 Merge "Include challenge in test_rkpd_attestation_key_upgrade" into main 2023-09-26 19:25:05 +00:00
Seth Moore
29fd461ceb Include challenge in test_rkpd_attestation_key_upgrade
KeyMint.generateKey requires a challenge to be passed when a key
blob is also passed. The test missed this, and was thus failing on
compliant HALs.

Bug: 301223273
Test: keystore2_test
Change-Id: Icf7a32683c85d87fddd7d05ba07a110bb4e38c79
2023-09-26 10:45:43 -07:00
Tri Vo
cd6fc7a578 Reuse error mapping logic for key operation metrics
Define SerializedError wire type for convenience and type safety. It
does not change the rules of how errors are downcasted to an i32.

Change operation outcome errors from Keymint ErrorCode to
SerializedError. This has an intended effect of binder errors being
reported to metrics as ResponseCode::SYSTEM_ERROR instead of
ErrorCode::UNKNOWN_ERROR.

Also update comments.

Bug: 298194325
Test: m
Change-Id: Ieff70245b776c38845c4f5142ab13d438ff79104
2023-09-19 16:28:37 -04:00
Devin Moore
a764eb9f45 Merge "keystore2 compat: stop crashing without hwservicemanager" into main 2023-09-06 17:33:15 +00:00
Tri Vo
0140d4b523 Merge "Updated to use shared library instead of static library." into main 2023-09-01 21:01:54 +00:00
Rajesh Nyamagoud
42276da855 Updated to use shared library instead of static library.
Removed `libkeymint_vts_test_utils` and its dependent libs from static
libs list and added only `libkeymint_vts_test_utils` in shared libs
list.

Test: m libkeystore2_test_utils; atest keystore2_client_tests; atest keystore2_test_utils_test;
atest keystore2_test
Bug: 194359114

Change-Id: Iab4b8c174af81a8c64a9f44fcd634d54f78773da
2023-09-01 16:50:01 +00:00
Tri Vo
8ace735b6e Merge "Remove IRPC error handling" into main 2023-08-31 22:18:06 +00:00
Devin Moore
bf520df50e keystore2 compat: stop crashing without hwservicemanager
New devices will no longer have hwservicemanager installed as part of
HIDL deprecation. So this service must not crash when it's not found.
From keystore2's perspective, this is the same as not having the HIDL
Keymaster HALs installed.

Test: remove hwservicemanager from
device/google/cuttlefish/shared/device.mk && launch_cvd
Bug: 298454031

Change-Id: I4c7cefd388936aff821cff572a8af1b6f69f82d1
2023-08-31 21:43:03 +00:00
Tri Vo
dc8d6c06bb Remove IRPC error handling
Keystore no longer talks to IRPC directly. Remove corresponding error
handling code.

Test: m
Change-Id: I47ce41a0f48a30b994b18e794b1dd94fdbf9aa52
2023-08-30 17:00:12 -04:00
Eran Messeri
19e80fc8a0 Merge "Re-structured keystore test-utils module." into main 2023-08-30 15:11:43 +00:00
Rajesh Nyamagoud
10f02e705a Re-structured keystore test-utils module.
- Created separate build file.
- Moved ffi-utils from keystore2-client-tests to test-utils.
- Updated calling apis.

Test: atest keystore2_client_tests; atest keystore2_test_utils_test;
atest keystore2_test
Bug: 194359114

Change-Id: Ia2404218b7d13a9ae43b3fc4e481899576d24e63
2023-08-29 17:03:35 +00:00
David Drysdale
e85523f34a keystore2: add more logging
Also remove benign logging when there are multiple strong
biometrics.

Test: adb logcat on CF while adding/removing user/pwd
Change-Id: I777404d566990a4a604554133c0d87abba2200bc
2023-08-23 14:41:59 +01:00
Hasini Gunasinghe
7d690da73b Merge "Adding an OWNERS file as requested in b/288143537" into main 2023-08-18 21:45:07 +00:00
Tri Vo
dc4d64daff Merge "Generate certificates for importWrappedKey" into main 2023-08-18 18:37:47 +00:00
Tri Vo
3b0d703da8 Generate certificates for importWrappedKey
Bug: 291671113
Test: atest android.keystore.cts.ImportWrappedKeyTest
Change-Id: Ie195ac3931c4c79c738d583bfe272eb6a9314f8f
2023-08-17 13:57:01 -04:00
Treehugger Robot
e6dfdf59af Merge "keystore2_unsafe_fuzzer: Bug Fix" into main 2023-08-17 15:45:27 +00:00
James Farrell
2899721a5e Changes for Rust 1.72
Remove useless calls to vec!

Test: toolchain/android_rust/test_compiler.py
Bug: 295883071
Change-Id: Ie6cc07df6d27c522daf24f85d9fbaf673bdb413f
2023-08-17 04:37:05 +00:00
James Farrell
d77b97f0b6 Changes for Rust 1.72
Replace fold with try_fold

Bug: 295883071
Change-Id: I2b0b102d673f051ec52f6ba8caa6bd73030100b0
2023-08-15 20:03:38 +00:00