Gitiles
Code Review Sign In
gerrit.omnirom.org / android_system_security / 669e0992755005da26d2b9b9218402cd79d769a0
  1. 669e099 Merge tag 'android-15.0.0_r6' of https://android.googlesource.com/platform/system/security into HEAD by micky387 · 5 months ago
  2. e2422a8 Snap for 12404440 from 4eda2025c47cd804d59281030ff74ea22d3ead78 to 24Q4-release by Android Build Coastguard Worker · 8 months ago
  3. 4eda202 Merge changes I23a79eb5,I231079f3 into main am: 94b1285f47 am: 7841358378 by David Drysdale · 8 months ago
  4. 7841358 Merge changes I23a79eb5,I231079f3 into main am: 94b1285f47 by David Drysdale · 8 months ago
  5. 94b1285 Merge changes I23a79eb5,I231079f3 into main by David Drysdale · 8 months ago
  6. 4ec004e [automerger skipped] Merge "Use android_get_control_socket from the rustutils crate" into main am: d194b9ff0c -s ours am: a16f42540f -s ours by Jiyong Park · 8 months ago
  7. b89fcc8 [automerger skipped] Use android_get_control_socket from the rustutils crate am: c2284f4125 -s ours am: bcd25e117f -s ours by Jiyong Park · 8 months ago
  8. a16f425 [automerger skipped] Merge "Use android_get_control_socket from the rustutils crate" into main am: d194b9ff0c -s ours by Jiyong Park · 8 months ago
  9. bcd25e1 [automerger skipped] Use android_get_control_socket from the rustutils crate am: c2284f4125 -s ours by Jiyong Park · 8 months ago
  10. d194b9f Merge "Use android_get_control_socket from the rustutils crate" into main by Jiyong Park · 8 months ago
  11. d60f255 Snap for 12399051 from 25832e20aa896b79ca1abf137ec45b4c847974cd to 24Q4-release by Android Build Coastguard Worker · 8 months ago
  12. 25832e2 [automerger skipped] Use android_get_control_socket from the rustutils crate am: 4bf401a5f8 -s ours by Jiyong Park · 8 months ago
  13. 49811e2 Add debug display of Keystore metric info by David Drysdale · 2 years ago
  14. 955d600 Snap for 12391343 from 4687b9e0f3a1c832b839c1a01512a47049600fbf to 24Q4-release by Android Build Coastguard Worker · 8 months ago
  15. 0fefae3 Implement dump for IKeystoreMaintenance by David Drysdale · 8 months ago
  16. 4bf401a Use android_get_control_socket from the rustutils crate by Jiyong Park · 8 months ago
  17. c2284f4 Use android_get_control_socket from the rustutils crate by Jiyong Park · 8 months ago
  18. 7e74126 Snap for 12385180 from 6af1cf1d1678ecce00b011ece241bd92828e7c64 to 24Q4-release by Android Build Coastguard Worker · 8 months ago
  19. 4687b9e Merge "Manually verify the certificate with RSA-PSS & SHA1/SHA224 digests." into main am: d1a0aa9e1c am: df29faa214 by Treehugger Robot · 8 months ago
  20. df29faa Merge "Manually verify the certificate with RSA-PSS & SHA1/SHA224 digests." into main am: d1a0aa9e1c by Treehugger Robot · 8 months ago
  21. d1a0aa9 Merge "Manually verify the certificate with RSA-PSS & SHA1/SHA224 digests." into main by Treehugger Robot · 8 months ago
  22. e34be6c Manually verify the certificate with RSA-PSS & SHA1/SHA224 digests. by Rajesh Nyamagoud · 8 months ago
  23. 1228389 Handle key parameter conversion for FBE_ICE tag by Phanindra Babu Pabba · 4 years ago
  24. 6af1cf1 Use android_get_control_socket from the rustutils crate by Jiyong Park · 8 months ago
  25. bc5eedc Snap for 12361654 from b1cf187db7a98588eaea534b63d67679671e7179 to 24Q4-release by Android Build Coastguard Worker · 8 months ago
  26. b1cf187 Merge "Moving keystore2_client_tests to presubmit." into main am: a2621b4d6c am: 1102a4ad7c by Treehugger Robot · 8 months ago
  27. 452b380 Snap for 12354992 from 7376e2b6c1019b147b2e7964fa34ef80dd4a59ea to 24Q4-release by Android Build Coastguard Worker · 8 months ago
  28. 1102a4a Merge "Moving keystore2_client_tests to presubmit." into main am: a2621b4d6c by Treehugger Robot · 8 months ago
  29. a2621b4 Merge "Moving keystore2_client_tests to presubmit." into main by Treehugger Robot · 8 months ago
  30. 7376e2b Merge "Verify Tag::VENDOR_PATCHLEVEL key parameter if the underlying device is a KeyMint implementation." into main am: 7a0a9cf84b am: 3cd126be54 by Treehugger Robot · 8 months ago
  31. 3cd126b Merge "Verify Tag::VENDOR_PATCHLEVEL key parameter if the underlying device is a KeyMint implementation." into main am: 7a0a9cf84b by Treehugger Robot · 8 months ago
  32. 7a0a9cf Merge "Verify Tag::VENDOR_PATCHLEVEL key parameter if the underlying device is a KeyMint implementation." into main by Treehugger Robot · 8 months ago
  33. fcae6fd Verify Tag::VENDOR_PATCHLEVEL key parameter if the underlying device by Rajesh Nyamagoud · 8 months ago
  34. 16712f9 Merge "Revert "Revert "Add an option to allow/disallow degenerate DICE ..."" into main am: d657999e00 am: 18f3e7fcfe by Karuna Wadhera · 8 months ago
  35. 18f3e7f Merge "Revert "Revert "Add an option to allow/disallow degenerate DICE ..."" into main am: d657999e00 by Karuna Wadhera · 8 months ago
  36. d657999 Merge "Revert "Revert "Add an option to allow/disallow degenerate DICE ..."" into main by Karuna Wadhera · 8 months ago
  37. 2326dfb Merge changes I2db3c68b,I30845199 into main am: f7ef28956f am: 3cf89561ed by David Drysdale · 8 months ago
  38. 3cf8956 Merge changes I2db3c68b,I30845199 into main am: f7ef28956f by David Drysdale · 8 months ago
  39. f7ef289 Merge changes I2db3c68b,I30845199 into main by David Drysdale · 8 months ago
  40. d6c1a99 Snap for 12348750 from 50ad48020025c0a3552fbb1c701a9d3b73e33beb to 24Q4-release by Android Build Coastguard Worker · 8 months ago
  41. c37901f Revert "Revert "Add an option to allow/disallow degenerate DICE ..." by Karuna Wadhera · 8 months ago
  42. fc932f0 Moving keystore2_client_tests to presubmit. by Rajesh Nyamagoud · 8 months ago
  43. 4244d01 Add an option to allow/disallow degenerate DICE chains by Karuna Wadhera · 9 months ago
  44. e85c1b7 Add unit test of GC behaviour by David Drysdale · 8 months ago
  45. da89743 Test large numbers of keys in the database by David Drysdale · 11 months ago
  46. f24a282 Snap for 12342105 from 9eb56108c8579325c10e5962ee2956c5bcf43d4c to 24Q4-release by Android Build Coastguard Worker · 8 months ago
  47. 50ad480 Merge "Revert "Add an option to allow/disallow degenerate DICE chains"" into main am: 2b6f390b9b am: fff47de31e by Priyanka Advani (xWF) · 8 months ago
  48. fff47de Merge "Revert "Add an option to allow/disallow degenerate DICE chains"" into main am: 2b6f390b9b by Priyanka Advani (xWF) · 8 months ago
  49. 2b6f390 Merge "Revert "Add an option to allow/disallow degenerate DICE chains"" into main by Priyanka Advani (xWF) · 8 months ago
  50. d9cf298 Revert "Add an option to allow/disallow degenerate DICE chains" by Priyanka Advani (xWF) · 8 months ago
  51. 9eb5610 Merge "Add an option to allow/disallow degenerate DICE chains" into main am: 215c89b009 am: 1e135299e1 by Karuna Wadhera · 8 months ago
  52. 1e13529 Merge "Add an option to allow/disallow degenerate DICE chains" into main am: 215c89b009 by Karuna Wadhera · 8 months ago
  53. 215c89b Merge "Add an option to allow/disallow degenerate DICE chains" into main by Karuna Wadhera · 8 months ago
  54. 4a35428 Merge "Add tests covering android.system.keystore2.IKeystoreOperation::abort API." into main am: 62d437023f am: 6c26988a47 by Treehugger Robot · 8 months ago
  55. 6c26988 Merge "Add tests covering android.system.keystore2.IKeystoreOperation::abort API." into main am: 62d437023f by Treehugger Robot · 8 months ago
  56. 62d4370 Merge "Add tests covering android.system.keystore2.IKeystoreOperation::abort API." into main by Treehugger Robot · 8 months ago
  57. 11a97ea Add tests covering android.system.keystore2.IKeystoreOperation::abort API. by Rajesh Nyamagoud · 9 months ago
  58. 896fa51 Snap for 12337246 from 6487afd8cbb82e9468d150eb5bea6c597d2f70d5 to 24Q4-release by Android Build Coastguard Worker · 9 months ago
  59. 6487afd [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 1f87762e32 -s ours am: 8c12f9ff0d -s ours by Xin Li · 9 months ago
  60. ff5a2e0 [automerger skipped] Merge 24Q3 to AOSP main am: 05b904603f -s ours am: 1c6c1621cf -s ours by Xin Li · 9 months ago
  61. bad0012 Snap for 12335440 from 045d21d6214bab2375d844df7c9e87ce66d98dd8 to 24Q4-release by Android Build Coastguard Worker · 9 months ago
  62. 8c12f9f [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 1f87762e32 -s ours by Xin Li · 9 months ago
  63. 1c6c162 [automerger skipped] Merge 24Q3 to AOSP main am: 05b904603f -s ours by Xin Li · 9 months ago
  64. 1f87762 Merge "Merge 24Q3 to AOSP main" into main by Xin Li · 9 months ago
  65. 045d21d Merge "Avoid using lazy_static." into main am: c189c170b7 am: da24360b2d by Treehugger Robot · 9 months ago
  66. da24360 Merge "Avoid using lazy_static." into main am: c189c170b7 by Treehugger Robot · 9 months ago
  67. c189c17 Merge "Avoid using lazy_static." into main by Treehugger Robot · 9 months ago
  68. b63f8d2 Merge "Update Android for Rust 1.81.0" into main am: 2236d4d867 am: 539735ae8d by Treehugger Robot · 9 months ago
  69. 539735a Merge "Update Android for Rust 1.81.0" into main am: 2236d4d867 by Treehugger Robot · 9 months ago
  70. 2236d4d Merge "Update Android for Rust 1.81.0" into main by Treehugger Robot · 9 months ago
  71. 05b9046 Merge 24Q3 to AOSP main by Xin Li · 9 months ago
  72. 00fa9bd Update Android for Rust 1.81.0 by Chris Wailes · 9 months ago
  73. b5e5e70 Snap for 12319997 from 5c3d26dccdd36208a39765aa8124bc9e824952f0 to 24Q4-release by Android Build Coastguard Worker · 9 months ago
  74. 5c3d26d Merge "Avoid checking VENDOR_PATCHLEVEL in generated key characteristics if the underlying device is a Keymaster implementation." into main am: 255cde6f04 am: d1a34e6457 by Treehugger Robot · 9 months ago
  75. d1a34e6 Merge "Avoid checking VENDOR_PATCHLEVEL in generated key characteristics if the underlying device is a Keymaster implementation." into main am: 255cde6f04 by Treehugger Robot · 9 months ago
  76. 255cde6 Merge "Avoid checking VENDOR_PATCHLEVEL in generated key characteristics if the underlying device is a Keymaster implementation." into main by Treehugger Robot · 9 months ago
  77. fbfc939 Add an option to allow/disallow degenerate DICE chains by Karuna Wadhera · 9 months ago
  78. c63a83d Avoid checking VENDOR_PATCHLEVEL in generated key characteristics if by Rajesh Nyamagoud · 9 months ago
  79. b150be8 Merge "Check app-attest-key feature supported while using ATTEST_KEY in tests." into main am: c26d2f72ff am: 29005ce693 by Treehugger Robot · 9 months ago
  80. 29005ce Merge "Check app-attest-key feature supported while using ATTEST_KEY in tests." into main am: c26d2f72ff by Treehugger Robot · 9 months ago
  81. c26d2f7 Merge "Check app-attest-key feature supported while using ATTEST_KEY in tests." into main by Treehugger Robot · 9 months ago
  82. 7e2c3ed Check app-attest-key feature supported while using ATTEST_KEY in tests. by Rajesh Nyamagoud · 9 months ago
  83. a4bc1a9 Avoid using lazy_static. by Andrew Walbran · 9 months ago
  84. 8139c1d Snap for 12304452 from dca00fed31a5248ebd08c17506b7b8643d5a2847 to 24Q4-release by Android Build Coastguard Worker · 9 months ago
  85. dca00fe [automerger skipped] Use static libraries for multilib VTS am: 906fc75e3e -s ours am: 85060d8e30 -s ours by Rajesh Nyamagoud · 9 months ago
  86. 85060d8 [automerger skipped] Use static libraries for multilib VTS am: 906fc75e3e -s ours by Rajesh Nyamagoud · 9 months ago
  87. 906fc75 Use static libraries for multilib VTS by Rajesh Nyamagoud · 9 months ago
  88. 6966d8c Merge "Use static libraries for multilib VTS" into main am: 6a034e0160 am: 3a39c821af by David Drysdale · 9 months ago
  89. 3a39c82 Merge "Use static libraries for multilib VTS" into main am: 6a034e0160 by David Drysdale · 9 months ago
  90. 6a034e0 Merge "Use static libraries for multilib VTS" into main by David Drysdale · 9 months ago
  91. 76311aa Use static libraries for multilib VTS by Rajesh Nyamagoud · 9 months ago
  92. 518309d Snap for 12289667 from 26ea10eb3bedfaaf52747a170b5426545c4d0328 to 24Q4-release by Android Build Coastguard Worker · 9 months ago
  93. 26ea10e [automerger skipped] Merge "Allow more error codes on multi-padding failure" into aosp-24Q3-ts-dev am: e2a6621e72 -s ours am: 5527feb889 -s ours by Treehugger Robot · 9 months ago
  94. 6aa5e7d [automerger skipped] Allow more error codes on multi-padding failure am: 3a0c4350b2 -s ours am: 81ddd84132 -s ours by David Drysdale · 9 months ago
  95. 5527feb [automerger skipped] Merge "Allow more error codes on multi-padding failure" into aosp-24Q3-ts-dev am: e2a6621e72 -s ours by Treehugger Robot · 9 months ago
  96. 81ddd84 [automerger skipped] Allow more error codes on multi-padding failure am: 3a0c4350b2 -s ours by David Drysdale · 9 months ago
  97. e2a6621 Merge "Allow more error codes on multi-padding failure" into aosp-24Q3-ts-dev by Treehugger Robot · 9 months ago
  98. 90f2012 [automerger skipped] Removing `keystore2_attest_symmetric_key_fail_sys_error` test. am: c2ca61b0dc -s ours am: 149fa02bd7 -s ours by Rajesh Nyamagoud · 9 months ago
  99. 149fa02 [automerger skipped] Removing `keystore2_attest_symmetric_key_fail_sys_error` test. am: c2ca61b0dc -s ours by Rajesh Nyamagoud · 9 months ago
  100. 3e797a5 Merge "Allow more error codes on multi-padding failure" into main am: dc86c3e858 am: 7e8e5c26ec by David Drysdale · 9 months ago