1. 2bfc0d9 [automerger skipped] Fix keystore wifi concurrency issue. by Janis Danisevskis · 5 years ago
  2. 1849841 Fix keystore wifi concurrency issue. by Janis Danisevskis · 5 years ago
  3. 54fcc99 Fix keystore wifi concurrency issue. by Janis Danisevskis · 5 years ago
  4. 31629ba Fixing bug in security vulnerability patch am: 1e6d4bfd3e by Max Bires · 7 years ago
  5. c18ffb3 Fixing bug in security vulnerability patch am: 1e6d4bfd3e by Max Bires · 7 years ago
  6. fd8d014 Fixing bug in security vulnerability patch by Max Bires · 7 years ago
  7. 1e6d4bf Fixing bug in security vulnerability patch by Max Bires · 7 years ago
  8. 33566a2 Fixing security vuln by tightening race condition window. am: e92a8975f4 by Max Bires · 7 years ago
  9. be5b449 Fixing security vuln by tightening race condition window. am: e92a8975f4 by Max Bires · 7 years ago
  10. 05fbbe5 Fixing security vuln by tightening race condition window. by Max Bires · 7 years ago
  11. e92a897 Fixing security vuln by tightening race condition window. by Max Bires · 7 years ago
  12. 240fea4 [DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a am: c06ec2348a am: 1ed3e156c3 -s ours am: 0d3e006ed8 -s ours am: 383607b113 -s ours am: 62990b5484 -s ours by Rubin Xu · 7 years ago
  13. 8bb6666 [DO NOT MERGE] Fix keychain key upgrade issue am: 58291e0ff3 am: aa1474b3e9 -s ours am: 5b60e7659c -s ours by Rubin Xu · 7 years ago
  14. efcaf66 [DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a am: c06ec2348a am: 1ed3e156c3 -s ours am: 0d3e006ed8 -s ours am: 383607b113 -s ours by Rubin Xu · 7 years ago
  15. 25f39e9 [DO NOT MERGE] Fix keychain key upgrade issue am: 58291e0ff3 am: aa1474b3e9 -s ours by Rubin Xu · 7 years ago
  16. 26d1711 resolve merge conflicts of 2b93ec4 to oc-dr1-dev am: 0010dae9ff -s ours by Rubin Xu · 7 years ago
  17. 0010dae resolve merge conflicts of 2b93ec4 to oc-dr1-dev by Rubin Xu · 7 years ago
  18. 62990b5 [DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a am: c06ec2348a am: 1ed3e156c3 -s ours am: 0d3e006ed8 -s ours by Rubin Xu · 7 years ago
  19. 383607b [DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a am: c06ec2348a am: 1ed3e156c3 -s ours by Rubin Xu · 7 years ago
  20. 0d3e006 [DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a am: c06ec2348a by Rubin Xu · 7 years ago
  21. 1ed3e15 [DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a am: c06ec2348a by Rubin Xu · 7 years ago
  22. c06ec23 [DO NOT MERGE] Fix keychain key upgrade issue am: 7593bbf15a by Rubin Xu · 7 years ago
  23. 5b60e76 [DO NOT MERGE] Fix keychain key upgrade issue am: 58291e0ff3 by Rubin Xu · 7 years ago
  24. aa1474b [DO NOT MERGE] Fix keychain key upgrade issue am: 58291e0ff3 by Rubin Xu · 7 years ago
  25. 7593bbf [DO NOT MERGE] Fix keychain key upgrade issue by Rubin Xu · 7 years ago
  26. 58291e0 [DO NOT MERGE] Fix keychain key upgrade issue by Rubin Xu · 7 years ago
  27. 2b93ec4 [DO NOT MERGE] Fix keychain key upgrade issue by Rubin Xu · 7 years ago
  28. bfb01d9 Handle auth token with same timestamp by Rubin Xu · 7 years ago
  29. ce99f58 Fix int truncation in auth token handling by Rubin Xu · 7 years ago
  30. af7783f Fix multiple issues with the keystore grant mechanism by Janis Danisevskis · 7 years ago
  31. 3f30364 Fixed two bugs that broke the keystore granting mechanism by Janis Danisevskis · 7 years ago
  32. 00f9459 Fix misnomer and resulting bug in keystore.cpp by Janis Danisevskis · 7 years ago
  33. 687d892 Merge "Fix retreiving characteristics file for grant key" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  34. f08fb34 Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  35. 827243a Correct missed return code path. by Shawn Willden · 7 years ago
  36. d3024ed Fix retreiving characteristics file for grant key by Janis Danisevskis · 7 years ago
  37. d714a67 Fix use of auth-bound keys after screen lock removal by Janis Danisevskis · 7 years ago
  38. 2f96c79 Fix keystore return code by Shawn Willden · 7 years ago
  39. c5e8f36 Return OP_AUTH_NEEDED when necessary. by Shawn Willden · 7 years ago
  40. 30ab327 Refurbish granting mechanism am: aca4c4cf48 -s ours by Janis Danisevskis · 7 years ago
  41. aca4c4c Refurbish granting mechanism by Janis Danisevskis · 7 years ago
  42. 9448cd6 Merge "Refurbish granting mechanism" by TreeHugger Robot · 7 years ago
  43. ccb75f7 Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 am: 78505bae4c am: 7d6eedfc47 by Rob Sloan · 7 years ago
  44. ae9fa42 Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 am: 78505bae4c by Rob Sloan · 7 years ago
  45. 7d6eedf Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 by Rob Sloan · 7 years ago
  46. 78505ba Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 by Rob Sloan · 7 years ago
  47. 975e1aa Merge "Update BoringSSL structs in keystore-engine." by Rob Sloan · 7 years ago
  48. 0a7e807 Update BoringSSL structs in keystore-engine. by Robert Sloan · 7 years ago
  49. 6d449e8 Refurbish granting mechanism by Janis Danisevskis · 7 years ago
  50. 0143be7 Compare auth token ID fields, instead of type twice. by Shawn Willden · 7 years ago
  51. fc764df Merge "Add OWNERS in system/security" am: aad9ba51cd am: 32e07b318c am: d32de98e00 by Chih-hung Hsieh · 7 years ago
  52. 067111a Merge "Add OWNERS in system/security" am: aad9ba51cd am: 32e07b318c by Chih-hung Hsieh · 7 years ago
  53. d32de98 Merge "Add OWNERS in system/security" am: aad9ba51cd am: 32e07b318c by Chih-hung Hsieh · 7 years ago
  54. 32e07b3 Merge "Add OWNERS in system/security" am: aad9ba51cd by Chih-hung Hsieh · 7 years ago
  55. aad9ba5 Merge "Add OWNERS in system/security" by Chih-hung Hsieh · 7 years ago
  56. 3eb68ff Add OWNERS in system/security by Chih-Hung Hsieh · 7 years ago
  57. 0ed642c Make zeroing more portable. by Shawn Willden · 7 years ago
  58. e983058 Use AES-GCM to encrypt keystore blobs. by Shawn Willden · 7 years ago
  59. 5d50d7e Rename libkeymaster to libkeymaster_staging by Janis Danisevskis · 7 years ago
  60. 5cc0d5e Split libkeymaster1 into libkeymaster and libkeymaster_portable by Janis Danisevskis · 7 years ago
  61. 7069027 Merge "Revert "Split libkeymaster1 into libkeymaster and libkeymaster_portable"" by Nick Kralevich · 7 years ago
  62. be0ec4f Revert "Split libkeymaster1 into libkeymaster and libkeymaster_portable" by Janis Danisevskis · 7 years ago
  63. e026794 Merge "Split libkeymaster1 into libkeymaster and libkeymaster_portable" by Janis Danisevskis · 7 years ago
  64. 7262af5 Explicitly declare dependencies on libbase macros. am: 6a203fda93 by Steven Moreland · 7 years ago
  65. 6a203fd Explicitly declare dependencies on libbase macros. by Steven Moreland · 7 years ago
  66. 356b922 Merge "Remove use of UniquePtr from keystore" by Janis Danisevskis · 7 years ago
  67. 52868f2 Explicitly declare dependencies on libbase macros. by Steven Moreland · 7 years ago
  68. ea3b820 Split libkeymaster1 into libkeymaster and libkeymaster_portable by Janis Danisevskis · 7 years ago
  69. ccfff10 Remove use of UniquePtr from keystore by Janis Danisevskis · 7 years ago
  70. 584b8ea Merge "Do not clear critical keys in clear_uid()" into oc-dev am: 48dc4ad3b9 by Rubin Xu · 7 years ago
  71. 80f5705 Merge "Do not clear critical keys in clear_uid()" into oc-dev am: 48dc4ad3b9 by Rubin Xu · 7 years ago
  72. 48dc4ad Merge "Do not clear critical keys in clear_uid()" into oc-dev by TreeHugger Robot · 7 years ago
  73. 4dac5a9 Add device ID attestation method to keymaster am: 5aa93e08a8 am: 77485b71fb by Bartosz Fabianowski · 7 years ago
  74. 77485b7 Add device ID attestation method to keymaster am: 5aa93e08a8 by Bartosz Fabianowski · 7 years ago
  75. 4e26514 Fix temporary key deletion after device ID attestation am: e0256a8dbb by Bartosz Fabianowski · 7 years ago
  76. abedb78 Fix temporary key deletion after device ID attestation am: e0256a8dbb by Bartosz Fabianowski · 7 years ago
  77. 85c85e9 Do not clear critical keys in clear_uid() by Rubin Xu · 7 years ago
  78. 5aa93e0 Add device ID attestation method to keymaster by Bartosz Fabianowski · 7 years ago
  79. e0256a8 Fix temporary key deletion after device ID attestation by Bartosz Fabianowski · 7 years ago
  80. 422376d Merge "Revert "Fix temporary key deletion after device ID attestation"" into oc-dev am: e3b7240bf5 by Dan Stoza · 7 years ago
  81. 9ab834a Merge "Revert "Fix temporary key deletion after device ID attestation"" into oc-dev by Dan Stoza · 7 years ago
  82. e3b7240 Merge "Revert "Fix temporary key deletion after device ID attestation"" into oc-dev by TreeHugger Robot · 7 years ago
  83. 3afff91 Revert "Fix temporary key deletion after device ID attestation" by Dan Stoza · 7 years ago
  84. ee92406 Merge "Fix temporary key deletion after device ID attestation" into oc-dev am: 211dcefb77 by Bartosz Fabianowski · 7 years ago
  85. 536b429 Merge "Fix temporary key deletion after device ID attestation" into oc-dev by Bartosz Fabianowski · 7 years ago
  86. 211dcef Merge "Fix temporary key deletion after device ID attestation" into oc-dev by TreeHugger Robot · 7 years ago
  87. 536018d Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION am: 67899de5ad by Rubin Xu · 7 years ago
  88. e26a161 Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION am: 67899de5ad by Rubin Xu · 7 years ago
  89. 67899de Introduce KEYSTORE_FLAG_CRITICAL_TO_DEVICE_ENCRYPTION by Rubin Xu · 7 years ago
  90. a65ab42 Fix temporary key deletion after device ID attestation by Bartosz Fabianowski · 7 years ago
  91. 636b243 Disable super encryption for now am: 484779559c am: d28dcca48c by Rubin Xu · 7 years ago
  92. d28dcca Disable super encryption for now am: 484779559c by Rubin Xu · 7 years ago
  93. 4847795 Disable super encryption for now by Rubin Xu · 7 years ago
  94. e089388 Decrypt super-encrypted keys am: 45c112a566 am: 7cf3ac8330 by Shawn Willden · 7 years ago
  95. 7cf3ac8 Decrypt super-encrypted keys am: 45c112a566 by Shawn Willden · 7 years ago
  96. 45c112a Decrypt super-encrypted keys by Shawn Willden · 7 years ago
  97. 5b0a3ea Superencrypt authentication-bound keys. am: d5a24e6745 am: 788e50a6e5 by Shawn Willden · 7 years ago
  98. 788e50a Superencrypt authentication-bound keys. am: d5a24e6745 by Shawn Willden · 7 years ago
  99. 4a1ea75 resolve merge conflicts of 4a1b451 to master by Shawn Willden · 7 years ago
  100. d5a24e6 Superencrypt authentication-bound keys. by Shawn Willden · 7 years ago