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

8674 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Eric Biggers
dfbab7e6bc Merge "keystore2: fix UnlockedDeviceRequired to work without LSKF" into main 2023-11-15 17:33:33 +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
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
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