summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-09-01Snap for 9018797 from d78ef2348cadeb9a707a1b87f98ef4d0b0aac7ab to ↵android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseAndroid Build Coastguard Worker
tm-qpr1-release Change-Id: I7ca8e15e32d38a9d36532738b7b9faaa3b71b6f9
2022-08-30Fix OOB write in authToken2AidlVecandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseKeith Mok
The boundary check is wrong Bug: 242702451 Test: manual Ignore-AOSP-First: security Change-Id: I2b312916604e051fa4d8cb6e3e461a1f874bfa6d (cherry picked from commit 03bd6c29cd9b5cfb9c6bb83d165defc700e0ba7c)
2022-07-09Snap for 8813441 from 3fc6c4ba987c442afd7bafe63b1736ed55f748e1 to ↵Android Build Coastguard Worker
tm-qpr1-release Change-Id: I014b2889f078be49dc4c59e8b622ab9beaf9f533
2022-07-08KeyMint: pass through auth tokensDavid Drysdale
Bug: 230429454 Test: CtsVerifier/Biometric Tests/4) SetUserAuthParams, Auth-per-use Key with credential cases Change-Id: I5a6ed733662bf544c74efd77237a6b708bf81b86 (cherry picked from commit 44a18b7c9ad7a1eaba34203e40c6669acbf27216) Merged-In: I5a6ed733662bf544c74efd77237a6b708bf81b86
2022-06-14Snap for 8717341 from 5beca0e4c2158852b28d3201813ef67aa091d157 to ↵Android Build Coastguard Worker
tm-qpr1-release Change-Id: Iea4b7262a772ff965ddd4ddf645f00a6453612e6
2022-06-13Add error logging in GetRootOfTrust am: a2a1421dd5 am: 7081bc6c73Shawn Willden
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18808331 Change-Id: Idca5c395e82fdfe8555ae1b14c9fb0aad1f5fa08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13Catch more allocation failure cases am: 513e6158d0 am: deb9281da9David Drysdale
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18808330 Change-Id: I4210b250e30db29c59a5cbf47ddc0c0a81b3a238 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13Use new (std::nothrow) throughout am: 9355fadefa am: 8faef1c66dDavid Drysdale
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18808329 Change-Id: I9aed4288e32e326589f2e521d0102adb243d73cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13Add error logging in GetRootOfTrust am: a2a1421dd5Shawn Willden
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18808331 Change-Id: I080b11a393d38d5b8e25f9f776965e11e9161339 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13Catch more allocation failure cases am: 513e6158d0David Drysdale
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18808330 Change-Id: Ie65769f34908783730b89230e684624512b8872d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13Use new (std::nothrow) throughout am: 9355fadefaDavid Drysdale
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18808329 Change-Id: I09e070e67a1d9287e5d6c8611497220e2756ddab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Add error logging in GetRootOfTrustandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android13-tests-releaseandroid13-tests-devandroid13-devShawn Willden
Bug: 219076736 Test: VtsAidlKeyMintTargetTest Ignore-AOSP-First: Cherry pick from AOSP Change-Id: I9670bc63fb7d9e2c2091357f16bea27e8e3331bf (cherry picked from commit 63bf7285d48413c10b5833d2c9b4438b78c29a4d)
2022-06-09Catch more allocation failure casesDavid Drysdale
Bug: 216213939 Bug: 215451239 Test: VtsAidlKeyMintTargetTest Ignore-AOSP-First: Cherry pick from AOSP Change-Id: I604c980dba7644e4012a358b6f2dc204cb215c3c (cherry picked from commit 01d2e13c563a82e5cb0dc1adacd0ca5b41322497)
2022-06-09Use new (std::nothrow) throughoutDavid Drysdale
If code uses "normal" `new`, the compiler is allowed to assume that `nullptr` is never returned, even if built with -fno-exceptions. Use `new (std::nothrow)` throughout so that `nullptr` gets returned and can (in some cases) be handled. Bug: 215451239 Test: VtsAidlKeyMintTargetTest Ignore-AOSP-First: Cherry pick from AOSP Change-Id: Ied97ce946c0fbfbd5449c533e7ce1acbd0f595c5 (cherry picked from commit b80ef359b047a6bb72947b582102a979568f5c30)
2022-06-03Snap for 8677352 from c0a816b4f73cd5a7e53cda35d4bbaeeda25bb252 to ↵Android Build Coastguard Worker
tm-qpr1-release Change-Id: I8110069a7a1336d395befcf622526bd18eca75f8
2022-06-02Implement alternate SE root-of-trust provisioning. am: fdeafb864c am: 391b2ca3feShawn Willden
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18638885 Change-Id: Ieb228f130042e6d0440dda3449d66c98788a7a1e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02Implement alternate SE root-of-trust provisioning. am: fdeafb864cShawn Willden
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18638885 Change-Id: If37b53dad4b20703bd91cb05c93377705c5c4fd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02Implement alternate SE root-of-trust provisioning.Shawn Willden
Bug: 219076736 Test: VtsAidlKeyMintTargetTest Ignore-AOSP-First: Cherry pick from AOSP Change-Id: I28c13d9b201b831a1d339d5dd9d7bb8c2b176f59
2022-05-12Snap for 8573193 from f21ad1c15137ac1760f8b1c3970db346e27d8953 to ↵Android Build Coastguard Worker
tm-qpr1-release Change-Id: Icb3045d52fbf0a17cdc9425e03a0f3873e93733c
2022-05-11Expect x25519 data as SubjectPublicKeyInfo am: 415260e22f am: e5cbaa488dDavid Drysdale
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18281062 Change-Id: I686a93e9daabf096193d844198e81ef48bb62ca2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11Expect x25519 data as SubjectPublicKeyInfo am: 415260e22fDavid Drysdale
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/18281062 Change-Id: I9d20574b16793469595edf1efa5211ade0df5814 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10Expect x25519 data as SubjectPublicKeyInfoDavid Drysdale
Expect that the data for an X25519 key agreement operations should arrive in the form of a SubjectPublicKeyInfo ASN1 structure rather than just a raw key. This is more convenient and more consistent with the expectations for other EC keys (using NIST curves). Now that x25519 public keys are arriving in a SubjectPublicKeyInfo envelope, make sure the correct error code is emitted when they trigger a failure when erroneously attempting to perform key agreement against a NIST curve private key. Test: VtsAidlKeyMintTargetTest Bug: 231959070 Change-Id: I0d515a7d3b7124288d36cbd219e3679fa5137f0c Merged-In: I0d515a7d3b7124288d36cbd219e3679fa5137f0c Ignore-AOSP-First: already in aosp/master
2022-04-21Snap for 8479861 from 11090e20df8ba55c223b4754ee5ad018f5af15fa to ↵Android Build Coastguard Worker
tm-qpr1-release Change-Id: I6f6b3406681ff0b80c01c761895a74cb6eaa8f73
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: b4a4ead4a3 -s ours am: 69e3c6355e -s ours am: 9931e2182d -s ours am: 44c663dc4d -s ours am skip reason: Merged-In I1a32556cdff371138118028772b773f5e9b22c61 with SHA-1 5569b04a43 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/17805370 Change-Id: Id24263b06556bddd36e34f7680b7aaa4a422e194 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: b4a4ead4a3 -s ours am: 69e3c6355e -s ours am: 9931e2182d -s ours am skip reason: Merged-In I1a32556cdff371138118028772b773f5e9b22c61 with SHA-1 5569b04a43 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/17805370 Change-Id: I0d56e3a32df63afe5572c215af22d2e58bd38201 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: b4a4ead4a3 -s ours am: 69e3c6355e -s ours am skip reason: Merged-In I1a32556cdff371138118028772b773f5e9b22c61 with SHA-1 5569b04a43 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/17805370 Change-Id: I7d64871f24d9535bff606b90f4d29eb0c7ac9995 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8433047 am: b4a4ead4a3 -s ours am skip reason: Merged-In I1a32556cdff371138118028772b773f5e9b22c61 with SHA-1 5569b04a43 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/17805370 Change-Id: Idd4d6d23907987d40772e27678609153550cd438 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047Xin Li
Bug: 226662282 Merged-In: I1a32556cdff371138118028772b773f5e9b22c61 Change-Id: I704f0af8492ec142fb1b3d62b99f84da01c117cf
2022-04-15Snap for 8458224 from 9f5f7e8a1d6584889a80ac0170157e255ef01990 to ↵Android Build Coastguard Worker
tm-qpr1-release Change-Id: Ic25995e9592ec2c8e580bb939b4c79fbe97fb814
2022-04-14Error log on key downgrade am: 2dc09f37d8 am: b367ab8fed am: 511095be1a am: ↵David Drysdale
96cc7174b6 am: 81b2d3c153 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2063870 Change-Id: I75aabdb6f4c298d1bb32040cb3125da8968db5f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Error log on key downgrade am: 2dc09f37d8 am: b367ab8fed am: 511095be1a am: ↵David Drysdale
96cc7174b6 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2063870 Change-Id: I2ed37436e648864a3a5a3722d070187043480caa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Error log on key downgrade am: 2dc09f37d8 am: b367ab8fed am: 511095be1aDavid Drysdale
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2063870 Change-Id: I4f15a66021d8f364e4725b57ed5d54e61b0f9f4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Error log on key downgrade am: 2dc09f37d8 am: b367ab8fedDavid Drysdale
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2063870 Change-Id: I36d7862b7943b497f7e4761ed882a6d0a65e87fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14Error log on key downgrade am: 2dc09f37d8David Drysdale
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2063870 Change-Id: I7ec022dd6b6205ab5d2aa52601c86798c7c44c75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Error log on key downgradeDavid Drysdale
Make it more obvious when something attempts to use a key that is apparently from the future. Bug: 228893064 Test: VtsAidlKeyMintTargetTest Change-Id: I37886b7e742898fe5363c7d43f543ee67ebea2e3
2022-04-06Snap for 8414339 from ceb99bda93126b7168da125869480e332e21a04a to ↵Android Build Coastguard Worker
tm-qpr1-release Change-Id: I9d8d1bdfc570760ee1eb3f0ff60e4a8c55342e67
2022-04-01Merge "Add version and impl info field to EncryptedKey" am: 0b18dcb337 am: ↵Max Bires
f360090d42 am: ecb3a6eaaa am: 33d14a31a0 am: 6d9ff0ac1e Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037587 Change-Id: I408ad179362da4f0d6907c0ddb9bbf0eed84fcd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Add version and impl info field to EncryptedKey" am: 0b18dcb337 am: ↵Max Bires
f360090d42 am: ecb3a6eaaa am: 33d14a31a0 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037587 Change-Id: I259a43b5aa866660bf49e085e33d4758582698ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Add version and impl info field to EncryptedKey" am: 0b18dcb337 am: ↵Max Bires
f360090d42 am: ecb3a6eaaa Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037587 Change-Id: I92fe31874956dfe637987dcb0c18b42175aae60d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Add version and impl info field to EncryptedKey" am: 0b18dcb337 am: ↵Max Bires
f360090d42 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037587 Change-Id: Ib8febc918fa255fc664c12a500dbcd3718e65422 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Add version and impl info field to EncryptedKey" am: 0b18dcb337Max Bires
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037587 Change-Id: I3a594c65f9084bb6645d01292f8fce7454ba7f94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Add version and impl info field to EncryptedKey"Max Bires
2022-03-24Add version and impl info field to EncryptedKeyMax Bires
This change alters the EncryptedKey struct to provide the ability to version the KDF used to derive the key to wrap the EncryptedKey with. Additionally, it adds an addl_info field to allow the implementor to specify any other information they would like to attach to the key structure. Test: tbd Change-Id: I1a32556cdff371138118028772b773f5e9b22c61
2022-03-23[automerger skipped] Mark ab/8191998 as merged am: 31da10914f -s ours am: ↵Maria Yang
b4b33a4073 -s ours am: e7c6e58710 -s ours am: b90ce8637c -s ours am skip reason: Merged-In I15330a2f23c3461e23daad450af33e3f92e6730c with SHA-1 7f7cabaaee is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037189 Change-Id: I74f35e372f919149b1a4938848bea8934301033f
2022-03-23[automerger skipped] Mark ab/8191998 as merged am: 31da10914f -s ours am: ↵Maria Yang
b4b33a4073 -s ours am: e7c6e58710 -s ours am skip reason: Merged-In I15330a2f23c3461e23daad450af33e3f92e6730c with SHA-1 7f7cabaaee is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037189 Change-Id: Ifcd5c8dfa94b8dcd5b5c46348c306bceb67e13c7
2022-03-23[automerger skipped] Mark ab/8191998 as merged am: 31da10914f -s ours am: ↵Maria Yang
b4b33a4073 -s ours am skip reason: Merged-In I15330a2f23c3461e23daad450af33e3f92e6730c with SHA-1 7f7cabaaee is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037189 Change-Id: I653f2542d0ebef452c1446b9083a59d736549e61
2022-03-22[automerger skipped] Mark ab/8191998 as merged am: 31da10914f -s oursMaria Yang
am skip reason: Merged-In I15330a2f23c3461e23daad450af33e3f92e6730c with SHA-1 7f7cabaaee is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2037189 Change-Id: I15fbdf4373df995b13b8ec480615f1f73015f978
2022-03-21Mark ab/8191998 as mergedandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android12L-tests-releaseandroid12L-tests-devMaria Yang
Bug: 188847863 Merged-In: I15330a2f23c3461e23daad450af33e3f92e6730c Change-Id: Ia86265da53b1ab9844c639600cc87cf8b483a784
2022-03-09[automerger skipped] Merge Android 12L am: 00c493e49c -s ours am: 011f79c4d6 ↵Xin Li
-s ours am: bcefd13b9e -s ours am skip reason: Merged-In I809f4aa2beed0fe9cfd7fb7e5ccde1cac73c1a13 with SHA-1 05d5e5fea0 is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2013304 Change-Id: Ia04735f14e9430ea2c5f222a5d255c0ff0d35ac0
2022-03-08[automerger skipped] Merge Android 12L am: 00c493e49c -s ours am: 011f79c4d6 ↵Xin Li
-s ours am skip reason: Merged-In I809f4aa2beed0fe9cfd7fb7e5ccde1cac73c1a13 with SHA-1 05d5e5fea0 is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2013304 Change-Id: Ibf3a111622fede44b4578c10935fbb5f8ac35b00
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 01:40:53 +0000