summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-02Snap for 10245577 from 9f206b8620243d52485787038240ea6496a22df2 to ↵android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseAndroid Build Coastguard Worker
udc-qpr1-release Change-Id: I5c43a6278793eeb90745cdc5c0541af7804f2adb
2023-06-01Enable self-testing by default in rkp factory tool am: ed854b2b3b am: d472bd6008android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseSeth Moore
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/23501328 Change-Id: Id54f08af632af302ab9b0542463b19b5a33b9100 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31Enable self-testing by default in rkp factory tool am: ed854b2b3bSeth Moore
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/23501328 Change-Id: Ia00ed30ebd0b8cf9f074c6dbd8a2ff0a747b3e99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-31Enable self-testing by default in rkp factory toolandroid14-devSeth Moore
This way, we run the self test when extracting a CSR on the factory line by default. This will ensure that devices producing bad payloads will be more likely to be caught earlier in the manufacturing flow. Test: ran tool devices with V2 and V3 HALs Bug: 284098419 (cherry picked from https://android-review.googlesource.com/q/commit:dff09d0b4799d9825ae3bb43b1ce45bc6ca69c7d) Merged-In: I79b50da7f86da50ebcfe18caf06046f1a39c6e81 Change-Id: I79b50da7f86da50ebcfe18caf06046f1a39c6e81
2023-05-16Snap for 10137062 from b33452cb03a3d209804ca1425f0e886ccfeebb74 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: I1d9d1982c4ef6d298e6fae1fda1054d6a5714b83
2023-05-15Ensure RSA_OAEP_MGF_DIGEST tags are returned am: 5e9b27f3b4 am: 52647fbda8David Drysdale
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/22892744 Change-Id: I5ab34665a1d1a80396f697b7c5d90a821d4eaea0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15Ensure RSA_OAEP_MGF_DIGEST tags are returned am: 5e9b27f3b4David Drysdale
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/22892744 Change-Id: Ica843ec8f676de4897fcffaf1521330beed3fb40 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28Snap for 10017868 from 0814f26dd11c3f3711a27601fea04c2543f69120 to ↵Android Build Coastguard Worker
udc-qpr1-release Change-Id: Ief3a1c5e1c102ca7d5467107e9833566955cce5f
2023-04-27Ensure RSA_OAEP_MGF_DIGEST tags are returnedDavid Drysdale
Test: CtsKeystorePerformanceTestCases with printf debugging Bug: 278157584 Ignore-AOSP-First: This is a cherry-pick from aosp Merged-In: I39a286fece2fa2e3637bb41e127bb79034434af1 Change-Id: I0889279da00328a09e8f1f90c8e11d71067a9dec
2023-04-14Merge "Connects to Keymint and gets version number" am: 0e4338ea95 am: ↵Shaquille Johnson
59c0f50eb2 am: f4be0307df am: d2ff98075d Original change: https://android-review.googlesource.com/c/platform/system/security/+/2517120 Change-Id: I42938740e873ff1f523712bcec4f1ed7137a6ec9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14Merge "Connects to Keymint and gets version number" am: 0e4338ea95 am: ↵Shaquille Johnson
59c0f50eb2 am: f4be0307df Original change: https://android-review.googlesource.com/c/platform/system/security/+/2517120 Change-Id: I1fd3c1915fbc0ce72f6b1d52f44bc4adf354988b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14Merge "Connects to Keymint and gets version number" am: 0e4338ea95 am: ↵Shaquille Johnson
59c0f50eb2 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2517120 Change-Id: I02636c59cf289483d254334a4601d3fafce19236 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14Merge "Connects to Keymint and gets version number" am: 0e4338ea95Shaquille Johnson
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2517120 Change-Id: I21bbe6046c6026d9c12b3c27a57fcd40f84ae132 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14Merge "Connects to Keymint and gets version number"Shaquille Johnson
2023-04-12Connects to Keymint and gets version numberShaquille Johnson
Fix for regression in aosp/2453685, this gets the version of keymint that is on the device. Test: atest keystore2_test Bug: 275589241 276396649 Change-Id: I2afe1472a0a4e3c4f81379c589833285bb228811
2023-04-03Merge "Remove dead stats interface for getting some atoms from keystore" am: ↵Seth Moore
b0ba852a65 am: cb44603503 am: 48792520e9 am: a4772b85df Original change: https://android-review.googlesource.com/c/platform/system/security/+/2518215 Change-Id: I0ce27320d49d1d921b863df7ea3069093523e72d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Remove dead stats interface for getting some atoms from keystore" am: ↵Seth Moore
b0ba852a65 am: cb44603503 am: 48792520e9 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2518215 Change-Id: I070e51645df5fae095dc52c47384f8e78fcae29f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Remove dead stats interface for getting some atoms from keystore" am: ↵Seth Moore
b0ba852a65 am: cb44603503 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2518215 Change-Id: Ifdd065e219e02eb93fef0cc8c8af1203ba9cdf9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Remove dead stats interface for getting some atoms from keystore" am: ↵Seth Moore
b0ba852a65 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2518215 Change-Id: I5b7d2f329fd44579b4007c73ee7bf835d1ab2e41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Merge "Remove dead stats interface for getting some atoms from keystore"android-u-beta-1-gplSeth Moore
2023-03-31Remove dead stats interface for getting some atoms from keystoreSeth Moore
The RkpPoolStats atom has been moved from keystore2 into rkpd, so we no longer need to query it from keystore2. Bug: 268247931 Test: presubmit Change-Id: I285011ed29183e3008310be248ddeb8b9668ac01
2023-03-27Merge "Keystore2: Batching listing of key entries" am: 4ec7585ff8 am: ↵Eran Messeri
6e5fe5015b am: cf61a5003d am: a81cd6f098 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2402644 Change-Id: If0ae8b82903dfee24343fc7dda39e8f2f568b2b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27Merge "Keystore2: Batching listing of key entries" am: 4ec7585ff8 am: ↵Eran Messeri
6e5fe5015b am: cf61a5003d Original change: https://android-review.googlesource.com/c/platform/system/security/+/2402644 Change-Id: Id7609b51a8008816be4ea23465ee351643998fef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27Merge "Keystore2: Batching listing of key entries" am: 4ec7585ff8 am: 6e5fe5015bEran Messeri
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2402644 Change-Id: I21a4dd3e2a6f4ec2864223e5d96d29d1b1d8d454 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27Merge "Keystore2: Batching listing of key entries" am: 4ec7585ff8Eran Messeri
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2402644 Change-Id: Id89fa9684bf5efdea3b433a5f5289fb0e2b44101 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-27Merge "Keystore2: Batching listing of key entries"Eran Messeri
2023-03-23Merge "Revert^2 "Remove android.security.remoteprovisioning interfaces"" am: ↵Tri Vo
06eb7abb93 am: f0c397dce8 am: 1b099c13ad am: e1328ae009 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2498095 Change-Id: I91caa35c043526fe216ab2ccf559b874c13f66ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge "Revert^2 "Remove android.security.remoteprovisioning interfaces"" am: ↵Tri Vo
06eb7abb93 am: f0c397dce8 am: 1b099c13ad Original change: https://android-review.googlesource.com/c/platform/system/security/+/2498095 Change-Id: Ie774e184a47483c4d3fbea0700ce3769a3bf9319 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge "Revert^2 "Remove android.security.remoteprovisioning interfaces"" am: ↵Tri Vo
06eb7abb93 am: f0c397dce8 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2498095 Change-Id: I963e9a253c62dd1fd1feaf5f0797f72a7613221b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge "Revert^2 "Remove android.security.remoteprovisioning interfaces"" am: ↵Tri Vo
06eb7abb93 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2498095 Change-Id: I56552f29df445fb433b920ba6e5fdeced9e53c01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23Merge "Revert^2 "Remove android.security.remoteprovisioning interfaces""Tri Vo
2023-03-21Keystore2: Batching listing of key entriesEran Messeri
Support for listing key entries in batches, so that a large number of key entries, or entries with long key aliases, could be listed. The list of key descriptors (which contain the key alias) is returned to JCA from Keystore2 service via the Binder interface. The size of a single Binder transaction is limited. Thus, we have run into http://b/222287335 , where an app can create too many Keystore2 keys than can be returned in a single Binder transaction. Effectively, this prevents the app from listing the keys it generated at all. This is solved by adding a method to the Keystore2 interface for obtaining all the key descriptors whose alias is past a given value (with the intention that this value is the last key alias from the previous batch). Keystore2 already limits the number of entries returned to a number estimated to fit under the Binder transaction size limit. Together, this enables callers to receive the list of key descriptors in batches. Additionally, add a method to Keystore2 to return the total number of key entries by querying the DB for the number of rows, rather than count the number of entries returned (which may be truncated). Bug: 222287335 Test: atest KeystoreTests Test: atest CtsKeystoreTestCases:android.keystore.cts.AndroidKeyStoreTest Test: atest keystore2_test Change-Id: I4a8efef2303beadd2cf6db992833d87bf58d7aec
2023-03-20Revert^2 "Remove android.security.remoteprovisioning interfaces"Tri Vo
These interfaces are deprecated and replaced by android.security.rkp_aidl ones. Bug: 273325840 Change-Id: I6f561d7c332fc3cc5921453b5bd5938154b700d0 Test: m
2023-03-20Merge "Revert "Remove android.security.remoteprovisioning interfaces"" am: ↵Ioana Alexandru
d788acd9d5 am: 8fd6a2cd79 am: 09320a543b am: 31280f7f85 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2496996 Change-Id: Ibf78cebfa63a8c5070ba19fe5d9bd3ea68edfab2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Revert "Remove android.security.remoteprovisioning interfaces"" am: ↵Ioana Alexandru
d788acd9d5 am: 8fd6a2cd79 am: 09320a543b Original change: https://android-review.googlesource.com/c/platform/system/security/+/2496996 Change-Id: If4f74f6078c6f1b504647d14e50c0750318a84d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Revert "Remove android.security.remoteprovisioning interfaces"" am: ↵Ioana Alexandru
d788acd9d5 am: 8fd6a2cd79 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2496996 Change-Id: Ifba6630c739d7815c43d58e78ed6c715f7b2cbf2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Revert "Remove android.security.remoteprovisioning interfaces"" am: ↵Ioana Alexandru
d788acd9d5 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2496996 Change-Id: I3968ba431cc2d032e1dec3240b2d48faa59eed8b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20Merge "Revert "Remove android.security.remoteprovisioning interfaces""Ioana Alexandru
2023-03-20Revert "Remove android.security.remoteprovisioning interfaces"Ioana Alexandru
This reverts commit 9fad346811d81cac9fdfec1aee012a2f1b973344. Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_udc-d1-dev-plus-aosp-without-vendor&target=errorprone&lkgb=9769185&lkbb=9776170&fkbb=9771476, bug b/274209879 Change-Id: I210c4a47d76864c3c212b907eb875ef363c3beab
2023-03-17Merge "Remove android.security.remoteprovisioning interfaces" am: 6987ceb93d ↵Tri Vo
am: 657860d6fc am: 4df748a17c am: 48bdb29aab Original change: https://android-review.googlesource.com/c/platform/system/security/+/2485320 Change-Id: I424a5231b672528a8bea290aa16b46c24f4c43bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Remove android.security.remoteprovisioning interfaces" am: 6987ceb93d ↵Tri Vo
am: 657860d6fc am: 4df748a17c Original change: https://android-review.googlesource.com/c/platform/system/security/+/2485320 Change-Id: I6f500014f5793ad585d740b8e949abfa0f2e0891 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Remove android.security.remoteprovisioning interfaces" am: 6987ceb93d ↵Tri Vo
am: 657860d6fc Original change: https://android-review.googlesource.com/c/platform/system/security/+/2485320 Change-Id: Ia73fbbf252972e1b25b8afbe41281c882d123917 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Remove android.security.remoteprovisioning interfaces" am: 6987ceb93dTri Vo
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2485320 Change-Id: I70a65b6898f335b6c4cafb013e043db36be084bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Remove android.security.remoteprovisioning interfaces"Tri Vo
2023-03-17Merge "Consolidate fs-verity wrapper in libfsverity_rs" am: 93302519d4 am: ↵Victor Hsieh
6df71858ac am: 232cdde7e4 am: 1c70a17fb0 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2492595 Change-Id: I91d1514ac94c885b9f501c402967d782802f338e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Consolidate fs-verity wrapper in libfsverity_rs" am: 93302519d4 am: ↵Victor Hsieh
6df71858ac am: 232cdde7e4 Original change: https://android-review.googlesource.com/c/platform/system/security/+/2492595 Change-Id: I34f1d6321246ac61ca3866a3be57d9c9bf3162ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Consolidate fs-verity wrapper in libfsverity_rs" am: 93302519d4 am: ↵Victor Hsieh
6df71858ac Original change: https://android-review.googlesource.com/c/platform/system/security/+/2492595 Change-Id: I43f4139177d321b05bd1ad6009d846a26dc77065 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Consolidate fs-verity wrapper in libfsverity_rs" am: 93302519d4Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2492595 Change-Id: I3cee5a3d45255d7dd46fa6acdf9849c068365995 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17Merge "Consolidate fs-verity wrapper in libfsverity_rs"Victor Hsieh
2023-03-15Consolidate fs-verity wrapper in libfsverity_rsVictor Hsieh
Bug: 272587415 Test: m libfsverity_rs Change-Id: I9370d4cf66b34b6b86fda60f22ea096ce038da07
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 02:20:23 +0000