Commit graph

9102 commits

Author SHA1 Message Date
Shaquille Johnson
22fd7224b2 Merge "Change name of flag to specify put" into main am: f1a07b2fe1 am: e2b3a0b53e am: 6493b3dc8e
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2830010

Change-Id: I7b67b8a2178e2a699c3db540ce11f5593a6552dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 13:43:10 +00:00
Eran Messeri
f126d5ef18 Merge "Test added to generate a key with specifying cerificate subject and certificate serial number. Test generates a key and verifies the specified key characteristics." into main am: a68eb23f51 am: ea60fe79fc am: 84743e9f28
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2619159

Change-Id: If9f8747ff26f63b18b3ee94a212cd47689b8203a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 13:42:56 +00:00
Shaquille Johnson
c4651b41a3 Merge "Change name of flag to specify put" into main am: f1a07b2fe1 am: 77317e1bb6
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2830010

Change-Id: Ib84107a3f08716719ddc40cadad656b47a1c51c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 13:12:11 +00:00
Eran Messeri
8f3e433928 Merge "Test added to generate a key with specifying cerificate subject and certificate serial number. Test generates a key and verifies the specified key characteristics." into main am: a68eb23f51 am: 87f666688d
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2619159

Change-Id: I7aa540dadf61bfaadccad3843ed4b05b28bd938c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 13:12:02 +00:00
Shaquille Johnson
6493b3dc8e Merge "Change name of flag to specify put" into main am: f1a07b2fe1 am: e2b3a0b53e
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2830010

Change-Id: I6982f3ca0ebdbab754ac58b59c810c743eaea3b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 13:10:35 +00:00
Eran Messeri
84743e9f28 Merge "Test added to generate a key with specifying cerificate subject and certificate serial number. Test generates a key and verifies the specified key characteristics." into main am: a68eb23f51 am: ea60fe79fc
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2619159

Change-Id: I7335900b86ff37d75801f0ffccdefe5e419a658e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 13:09:54 +00:00
Shaquille Johnson
e2b3a0b53e Merge "Change name of flag to specify put" into main am: f1a07b2fe1
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2830010

Change-Id: I21001255c15e5745a70693af9e4d123bee780798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 12:40:46 +00:00
Shaquille Johnson
77317e1bb6 Merge "Change name of flag to specify put" into main am: f1a07b2fe1
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2830010

Change-Id: I732bf1373e1ccf25f7dcb18171da33abe47a89d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 12:40:43 +00:00
Eran Messeri
ea60fe79fc Merge "Test added to generate a key with specifying cerificate subject and certificate serial number. Test generates a key and verifies the specified key characteristics." into main am: a68eb23f51
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2619159

Change-Id: I1234289746a32bae2134b07274dff1c693b18d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 12:40:34 +00:00
Eran Messeri
87f666688d Merge "Test added to generate a key with specifying cerificate subject and certificate serial number. Test generates a key and verifies the specified key characteristics." into main am: a68eb23f51
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2619159

Change-Id: Ife688d186e8f03ae158305ebae566ac0682204ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 12:40:07 +00:00
Shaquille Johnson
f1a07b2fe1 Merge "Change name of flag to specify put" into main 2023-11-15 12:14:42 +00:00
Eran Messeri
a68eb23f51 Merge "Test added to generate a key with specifying cerificate subject and certificate serial number. Test generates a key and verifies the specified key characteristics." into main 2023-11-15 12:11:14 +00:00
Shaquille Johnson
6084409db8 Change name of flag to specify put
Test: unapplicable
Change-Id: If1bba7c7cc486ed443a75e024b04cd017424126b
2023-11-15 09:38:09 +00:00
Treehugger Robot
8eb7326f30 Merge "Skip test case for AVF since those are not supported." into main am: c330132bda am: 57b56f65d8 am: faaacb9f1d
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2828414

Change-Id: I16ac4540b15eff1930bc39da0aaa77b9cd1b310c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 02:44:38 +00:00
Treehugger Robot
f8fdd0f6fa Merge "Skip test case for AVF since those are not supported." into main am: c330132bda am: 11d0c8fe28 am: f947259eb4
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2828414

Change-Id: I776f1726e69c56f0b31eb8fb8cb1924e9b85ec8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 02:42:56 +00:00
Treehugger Robot
faaacb9f1d Merge "Skip test case for AVF since those are not supported." into main am: c330132bda am: 57b56f65d8
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2828414

Change-Id: I55296ea7cda227abd5659629db3713c4999cc46b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 02:12:43 +00:00
Treehugger Robot
f947259eb4 Merge "Skip test case for AVF since those are not supported." into main am: c330132bda am: 11d0c8fe28
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2828414

Change-Id: Ie66f8743c4c372ac2a3c0efc2c7043261b2f4aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 02:10:50 +00:00
Treehugger Robot
11d0c8fe28 Merge "Skip test case for AVF since those are not supported." into main am: c330132bda
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2828414

Change-Id: I62c7f9c17419706fd55b9dbc6dcd7dd5c837e9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 01:40:47 +00:00
Treehugger Robot
57b56f65d8 Merge "Skip test case for AVF since those are not supported." into main am: c330132bda
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2828414

Change-Id: I8b562866502ddf83ad8af5bdcee5f0d1a6953719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 01:40:12 +00:00
Treehugger Robot
c330132bda Merge "Skip test case for AVF since those are not supported." into main 2023-11-15 01:12:02 +00:00
Treehugger Robot
16948619f1 Merge "Adding tests to verify Device-Unique-Attestation." into main am: 0e0b09a901 am: 278ee2062a am: 83e50defd6
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616219

Change-Id: Ia06a9f4af090e446e064e6be0be7a542641b8761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 00:32:50 +00:00
Treehugger Robot
d4b06739f6 Merge "Adding tests to verify Device-Unique-Attestation." into main am: 0e0b09a901 am: 4ecee2da29 am: 5fd99efca9
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616219

Change-Id: I58dadd5cfa892b1d34e96721b6a59affa4ab1f77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 00:31:29 +00:00
Treehugger Robot
83e50defd6 Merge "Adding tests to verify Device-Unique-Attestation." into main am: 0e0b09a901 am: 278ee2062a
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616219

Change-Id: I955332341670094ed77a7c2f9b8d86fc905aa6e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 00:01:34 +00:00
Vikram Gaur
016d24c813 Skip test case for AVF since those are not supported.
BUG: 308586759
Test: atest librkp_support_test
Change-Id: Iba47f0cc4284fa684e4e72667e9e553841087475
2023-11-15 00:01:17 +00:00
Treehugger Robot
5fd99efca9 Merge "Adding tests to verify Device-Unique-Attestation." into main am: 0e0b09a901 am: 4ecee2da29
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616219

Change-Id: I47d6149883fd7b189ebbaeb09dbd12ab5ab77e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-15 00:00:32 +00:00
Treehugger Robot
278ee2062a Merge "Adding tests to verify Device-Unique-Attestation." into main am: 0e0b09a901
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616219

Change-Id: Ia9a1a206988c3edf950dd99043e9a914a5255b42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 23:29:15 +00:00
Treehugger Robot
4ecee2da29 Merge "Adding tests to verify Device-Unique-Attestation." into main am: 0e0b09a901
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2616219

Change-Id: If13aaeb9db3bd4da5c37f0da226220bca276b5db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 23:28:46 +00:00
Rajesh Nyamagoud
e5557ffdce Test added to generate a key with specifying cerificate subject and
certificate serial number. Test generates a key and verifies the
specified key characteristics.

Bug: 279721870
Test: atest keystore2_client_tests
Change-Id: I3ea356da8ca3404a94081a680210a9f426a2b908
2023-11-14 23:25:30 +00:00
Treehugger Robot
0e0b09a901 Merge "Adding tests to verify Device-Unique-Attestation." into main 2023-11-14 23:04:35 +00:00
Rajesh Nyamagoud
b1c8e83392 Adding tests to verify Device-Unique-Attestation.
1. Test to verify Device-Unique-Attestation is not supported on
   `TRUSTED_ENVIRONMENT` security level. Test shoould fail to generate a
   key with device-unique-attestation with `INVALID_ARGUMENT` error code.

2. Generate EC/RSA keys with `DEVICE_UNIQUE_ATTESTATION` using `STRONGBOX`
   security level. Test should generate akey and verify key
   characteristics and cert-chain signatures. Test should be able to
   perform an operation using the generated key successfully.

3. Try to generate a device unique attested key with attestation of
   invalid device's identifiers. Test should fail to generate a key with
   error code `CANNOT_ATTEST_IDS`.

4. Generate a device unique attested key with attestation of the
   device's identifiers. Test should succeed in generating a attested
   key with attestation of device identifiers. Test might fail on
   devices which don't support device id attestation with error response
   code `CANNOT_ATTEST_IDS`. Separate test is added for each attestation
   id with RSA and EC keys.

Bug: 279721870
Test: atest keystore2_client_tests
Change-Id: I627a01dc44558a4393d14f9931b1708196ee6ff9
2023-11-14 21:33:19 +00:00
Alice Wang
71002d88e6 Merge "[rkpd] Refactor rkpd_client into an independent lib for reuse" into main am: 6a5cfb02cf am: c1d8cdaeba am: fa4b052bf5
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817840

Change-Id: I06b8149590622a45d27addfe84626b3560ae2e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 09:12:57 +00:00
Alice Wang
dbb6851d53 Merge "[rkpd] Refactor rkpd_client into an independent lib for reuse" into main am: 6a5cfb02cf am: 134a7cb0bc am: d7511405be
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817840

Change-Id: I8b195c169ee2c87916ac135df5cd3f9b89ac4108
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 09:12:36 +00:00
Alice Wang
fa4b052bf5 Merge "[rkpd] Refactor rkpd_client into an independent lib for reuse" into main am: 6a5cfb02cf am: c1d8cdaeba
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817840

Change-Id: I17f27f921c02320e2efc62dd6ce03f1e0a220067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 08:41:33 +00:00
Alice Wang
d7511405be Merge "[rkpd] Refactor rkpd_client into an independent lib for reuse" into main am: 6a5cfb02cf am: 134a7cb0bc
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817840

Change-Id: I2d24c30e4d1a43039c6573ba1362978d34e47d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 08:39:58 +00:00
Alice Wang
c1d8cdaeba Merge "[rkpd] Refactor rkpd_client into an independent lib for reuse" into main am: 6a5cfb02cf
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817840

Change-Id: I93e5407e16d4f7a199de8f8619b3ff37e5cbbbfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 08:08:06 +00:00
Alice Wang
134a7cb0bc Merge "[rkpd] Refactor rkpd_client into an independent lib for reuse" into main am: 6a5cfb02cf
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2817840

Change-Id: I56ae572cb4b5f6cacd9e4f44acd81bf496516004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14 08:08:06 +00:00
Alice Wang
6a5cfb02cf Merge "[rkpd] Refactor rkpd_client into an independent lib for reuse" into main 2023-11-14 07:37:00 +00:00
Alice Wang
cb9f8b5058 Merge "Revert^2 "[rkpd_client] Add Error type to rkpd_client"" into main am: 5c96cefe87 am: 8b832d1f3a am: 45363fa5de
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2824651

Change-Id: Id9ef5543e42fb120aa994920851d434d8fc5e30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 23:17:26 +00:00
Alice Wang
3fe0d9d692 Merge "Revert^2 "[rkpd_client] Add Error type to rkpd_client"" into main am: 5c96cefe87 am: 9e519c85b2 am: 38ac84ccd4
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2824651

Change-Id: I0868d2c3d076763c918be735feff976a3fbbe1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 23:15:10 +00:00
Alice Wang
45363fa5de Merge "Revert^2 "[rkpd_client] Add Error type to rkpd_client"" into main am: 5c96cefe87 am: 8b832d1f3a
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2824651

Change-Id: I700445718afddae72c9a888c63577a222e00ad25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 22:45:28 +00:00
Alice Wang
38ac84ccd4 Merge "Revert^2 "[rkpd_client] Add Error type to rkpd_client"" into main am: 5c96cefe87 am: 9e519c85b2
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2824651

Change-Id: I60087a653197ee842f3758414f9f2af481854f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 22:43:08 +00:00
Alice Wang
9e519c85b2 Merge "Revert^2 "[rkpd_client] Add Error type to rkpd_client"" into main am: 5c96cefe87
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2824651

Change-Id: I774724e99e87aa1f1eaf3cb71693525dee90e23b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 22:13:11 +00:00
Alice Wang
8b832d1f3a Merge "Revert^2 "[rkpd_client] Add Error type to rkpd_client"" into main am: 5c96cefe87
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2824651

Change-Id: Icaff78f40e906a1b26e4e57f341ffe868bbc617b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 22:12:09 +00:00
Alice Wang
5c96cefe87 Merge "Revert^2 "[rkpd_client] Add Error type to rkpd_client"" into main 2023-11-13 21:34:20 +00:00
Treehugger Robot
514c2ca214 Merge "Updated fuzz_config in Android.bp file" into main am: 98a802d844 am: 8801394aeb am: f27c347d51
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2505775

Change-Id: I99a54a323dfe593bbb34f998e08a2a95c4dda72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 20:26:30 +00:00
Treehugger Robot
53559a6407 Merge "Updated fuzz_config in Android.bp file" into main am: 98a802d844 am: 1947209766 am: ed9739b39f
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2505775

Change-Id: I597bdab14740c74fba6271ee628a3f74dfb84c4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 20:20:08 +00:00
Treehugger Robot
f27c347d51 Merge "Updated fuzz_config in Android.bp file" into main am: 98a802d844 am: 8801394aeb
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2505775

Change-Id: I924d53b31239bd749c2c55e67c2069c44de187f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 20:15:23 +00:00
Treehugger Robot
ed9739b39f Merge "Updated fuzz_config in Android.bp file" into main am: 98a802d844 am: 1947209766
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2505775

Change-Id: I043b59e5e94ade03457e288a98962c85da5a103b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 19:46:24 +00:00
Treehugger Robot
8801394aeb Merge "Updated fuzz_config in Android.bp file" into main am: 98a802d844
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2505775

Change-Id: I39bd50bdd02b50d5646180cae207eccd12c3f0dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 19:19:32 +00:00
Treehugger Robot
1947209766 Merge "Updated fuzz_config in Android.bp file" into main am: 98a802d844
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2505775

Change-Id: Id094bf5a3f7504724abd250556652a172f44f384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13 19:10:56 +00:00