Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / security / 9cfd7f327236a8cd9b371be3232a2d5ddf936d0b
  1. 9cfd7f3 Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 879d439e26 -s ours by Xin Li · 7 years ago
  2. 4a8909e DO NOT MERGE: Merge Oreo MR1 into master am: 47924d1aec -s ours by Xin Li · 7 years ago
  3. 879d439 Merge "DO NOT MERGE: Merge Oreo MR1 into master" by Xin Li · 7 years ago
  4. 47924d1 DO NOT MERGE: Merge Oreo MR1 into master by Xin Li · 7 years ago
  5. f380c40 Merge commit '320717adfab49735d0f5c330edda33a38540fcdb' into HEAD by Xin Li · 7 years ago
  6. eeec1dd Merge "Move keystore to Android.bp." am: 96b00c572e by Colin Cross · 7 years ago
  7. 96b00c5 Merge "Move keystore to Android.bp." by Colin Cross · 7 years ago
  8. 817ec0e Move keystore to Android.bp. by Jeff Sharkey · 7 years ago
  9. 320717a Merge changes from topic "keymaster_stl_none" am: b1de50e9b0 -s ours am: 9fe270641d -s ours by Jae Shin · 7 years ago
  10. 74d5410 Merge changes from topic "keymaster_stl_none" am: b1de50e9b0 -s ours by Jae Shin · 7 years ago
  11. 9fe2706 Merge changes from topic "keymaster_stl_none" am: b1de50e9b0 -s ours by Jae Shin · 7 years ago
  12. b1de50e Merge changes from topic "keymaster_stl_none" by Jae Shin · 7 years ago
  13. fd50048 Fix int truncation in auth token handling am: ce99f58cfe by Rubin Xu · 7 years ago
  14. ce99f58 Fix int truncation in auth token handling by Rubin Xu · 7 years ago
  15. d5d85b1 Rename libkeymaster to libkeymaster_staging by Janis Danisevskis · 7 years ago
  16. 62f58ca Split libkeymaster1 into libkeymaster and libkeymaster_portable by Janis Danisevskis · 7 years ago
  17. 3421c4a Remove use of UniquePtr from keystore by Janis Danisevskis · 7 years ago
  18. 86bd788 Fix multiple issues with the keystore grant mechanism am: af7783f735 -s ours by Janis Danisevskis · 7 years ago
  19. 51143c4 Fixed two bugs that broke the keystore granting mechanism by Janis Danisevskis · 7 years ago
  20. 5dc6cf7 Fix misnomer and resulting bug in keystore.cpp am: 00f94598c7 -s ours by Janis Danisevskis · 7 years ago
  21. f9f5545 Fix multiple issues with the keystore grant mechanism by Janis Danisevskis · 7 years ago
  22. 947a7c7 Fixed two bugs that broke the keystore granting mechanism by Janis Danisevskis · 7 years ago
  23. 36e70f0 Fix misnomer and resulting bug in keystore.cpp by Janis Danisevskis · 7 years ago
  24. af7783f Fix multiple issues with the keystore grant mechanism by Janis Danisevskis · 7 years ago
  25. 3f30364 Fixed two bugs that broke the keystore granting mechanism by Janis Danisevskis · 7 years ago
  26. 00f9459 Fix misnomer and resulting bug in keystore.cpp by Janis Danisevskis · 7 years ago
  27. 8dc28c3 Merge "Switch *_METHOD to a more future-proof pattern." am: f3147f209c am: a786d0becd by Robert Sloan · 7 years ago
  28. 977bbee Merge "Switch *_METHOD to a more future-proof pattern." am: f3147f209c by Robert Sloan · 7 years ago
  29. a786d0b Merge "Switch *_METHOD to a more future-proof pattern." am: f3147f209c by Robert Sloan · 7 years ago
  30. f3147f2 Merge "Switch *_METHOD to a more future-proof pattern." by Treehugger Robot · 7 years ago
  31. f5dd5d0 Merge "key_store:Using euid instead of uid when upgrade wifi blobs" am: 63d98e08b8 am: ff0f7e048a by Roshan Pius · 7 years ago
  32. 7068239 Merge "key_store:Using euid instead of uid when upgrade wifi blobs" am: 63d98e08b8 by Roshan Pius · 7 years ago
  33. ff0f7e0 Merge "key_store:Using euid instead of uid when upgrade wifi blobs" by Roshan Pius · 7 years ago
  34. 63d98e0 Merge "key_store:Using euid instead of uid when upgrade wifi blobs" by Roshan Pius · 7 years ago
  35. 29f72ec Switch *_METHOD to a more future-proof pattern. by Robert Sloan · 7 years ago
  36. 3bb0324 key_store:Using euid instead of uid when upgrade wifi blobs by Wei Zhang · 7 years ago
  37. 098c340 Merge "Fix retreiving characteristics file for grant key" into oc-mr1-dev by Janis Danisevskis · 7 years ago
  38. b8e9240 Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev by Janis Danisevskis · 7 years ago
  39. 687d892 Merge "Fix retreiving characteristics file for grant key" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  40. f08fb34 Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev by TreeHugger Robot · 7 years ago
  41. 83abec6 Correct missed return code path. am: 827243a972 by Shawn Willden · 7 years ago
  42. 827243a Correct missed return code path. by Shawn Willden · 7 years ago
  43. d3024ed Fix retreiving characteristics file for grant key by Janis Danisevskis · 7 years ago
  44. d714a67 Fix use of auth-bound keys after screen lock removal by Janis Danisevskis · 7 years ago
  45. e978dd5 Fix keystore return code am: 2f96c79a9c by Shawn Willden · 7 years ago
  46. 2f96c79 Fix keystore return code by Shawn Willden · 7 years ago
  47. d70e416 Return OP_AUTH_NEEDED when necessary. am: c5e8f36d92 by Shawn Willden · 7 years ago
  48. c5e8f36 Return OP_AUTH_NEEDED when necessary. by Shawn Willden · 7 years ago
  49. 2e50b55 Refurbish granting mechanism am: aca4c4cf48 -s ours am: 7409453eb4 -s ours by Janis Danisevskis · 7 years ago
  50. 7409453 Refurbish granting mechanism am: aca4c4cf48 -s ours by Janis Danisevskis · 7 years ago
  51. 84557a2 Refurbish granting mechanism am: 32261c8526 -s ours by Janis Danisevskis · 7 years ago
  52. 5ecd51b Refurbish granting mechanism am: aca4c4cf48 -s ours am: 30ab32703c -s ours by Janis Danisevskis · 7 years ago
  53. 30ab327 Refurbish granting mechanism am: aca4c4cf48 -s ours by Janis Danisevskis · 7 years ago
  54. 32261c8 Refurbish granting mechanism by Janis Danisevskis · 7 years ago
  55. aca4c4c Refurbish granting mechanism by Janis Danisevskis · 7 years ago
  56. 9448cd6 Merge "Refurbish granting mechanism" by TreeHugger Robot · 7 years ago
  57. ccb75f7 Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 am: 78505bae4c am: 7d6eedfc47 by Rob Sloan · 7 years ago
  58. ae9fa42 Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 am: 78505bae4c by Rob Sloan · 7 years ago
  59. 7d6eedf Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 by Rob Sloan · 7 years ago
  60. 78505ba Merge "Update BoringSSL structs in keystore-engine." am: 975e1aae69 by Rob Sloan · 7 years ago
  61. 975e1aa Merge "Update BoringSSL structs in keystore-engine." by Rob Sloan · 7 years ago
  62. 0a7e807 Update BoringSSL structs in keystore-engine. by Robert Sloan · 7 years ago
  63. 6d449e8 Refurbish granting mechanism by Janis Danisevskis · 7 years ago
  64. 0143be7 Compare auth token ID fields, instead of type twice. by Shawn Willden · 7 years ago
  65. fc764df Merge "Add OWNERS in system/security" am: aad9ba51cd am: 32e07b318c am: d32de98e00 by Chih-hung Hsieh · 7 years ago
  66. 067111a Merge "Add OWNERS in system/security" am: aad9ba51cd am: 32e07b318c by Chih-hung Hsieh · 7 years ago
  67. d32de98 Merge "Add OWNERS in system/security" am: aad9ba51cd am: 32e07b318c by Chih-hung Hsieh · 7 years ago
  68. 32e07b3 Merge "Add OWNERS in system/security" am: aad9ba51cd by Chih-hung Hsieh · 7 years ago
  69. aad9ba5 Merge "Add OWNERS in system/security" by Chih-hung Hsieh · 7 years ago
  70. 3eb68ff Add OWNERS in system/security by Chih-Hung Hsieh · 7 years ago
  71. 0ed642c Make zeroing more portable. by Shawn Willden · 7 years ago
  72. e983058 Use AES-GCM to encrypt keystore blobs. by Shawn Willden · 8 years ago
  73. 5d50d7e Rename libkeymaster to libkeymaster_staging by Janis Danisevskis · 7 years ago
  74. 5cc0d5e Split libkeymaster1 into libkeymaster and libkeymaster_portable by Janis Danisevskis · 7 years ago
  75. 7069027 Merge "Revert "Split libkeymaster1 into libkeymaster and libkeymaster_portable"" by Nick Kralevich · 7 years ago
  76. be0ec4f Revert "Split libkeymaster1 into libkeymaster and libkeymaster_portable" by Janis Danisevskis · 7 years ago
  77. e026794 Merge "Split libkeymaster1 into libkeymaster and libkeymaster_portable" by Janis Danisevskis · 7 years ago
  78. 7262af5 Explicitly declare dependencies on libbase macros. am: 6a203fda93 by Steven Moreland · 7 years ago
  79. 6a203fd Explicitly declare dependencies on libbase macros. by Steven Moreland · 7 years ago
  80. 356b922 Merge "Remove use of UniquePtr from keystore" by Janis Danisevskis · 7 years ago
  81. 52868f2 Explicitly declare dependencies on libbase macros. by Steven Moreland · 7 years ago
  82. ea3b820 Split libkeymaster1 into libkeymaster and libkeymaster_portable by Janis Danisevskis · 7 years ago
  83. ccfff10 Remove use of UniquePtr from keystore by Janis Danisevskis · 7 years ago
  84. 584b8ea Merge "Do not clear critical keys in clear_uid()" into oc-dev am: 48dc4ad3b9 by Rubin Xu · 7 years ago
  85. 80f5705 Merge "Do not clear critical keys in clear_uid()" into oc-dev am: 48dc4ad3b9 by Rubin Xu · 7 years ago
  86. 48dc4ad Merge "Do not clear critical keys in clear_uid()" into oc-dev by TreeHugger Robot · 7 years ago
  87. 4dac5a9 Add device ID attestation method to keymaster am: 5aa93e08a8 am: 77485b71fb by Bartosz Fabianowski · 7 years ago
  88. 77485b7 Add device ID attestation method to keymaster am: 5aa93e08a8 by Bartosz Fabianowski · 7 years ago
  89. 4e26514 Fix temporary key deletion after device ID attestation am: e0256a8dbb by Bartosz Fabianowski · 7 years ago
  90. abedb78 Fix temporary key deletion after device ID attestation am: e0256a8dbb by Bartosz Fabianowski · 7 years ago
  91. 85c85e9 Do not clear critical keys in clear_uid() by Rubin Xu · 7 years ago
  92. 5aa93e0 Add device ID attestation method to keymaster by Bartosz Fabianowski · 7 years ago
  93. e0256a8 Fix temporary key deletion after device ID attestation by Bartosz Fabianowski · 7 years ago
  94. 422376d Merge "Revert "Fix temporary key deletion after device ID attestation"" into oc-dev am: e3b7240bf5 by Dan Stoza · 7 years ago
  95. 9ab834a Merge "Revert "Fix temporary key deletion after device ID attestation"" into oc-dev by Dan Stoza · 7 years ago
  96. e3b7240 Merge "Revert "Fix temporary key deletion after device ID attestation"" into oc-dev by TreeHugger Robot · 7 years ago
  97. 3afff91 Revert "Fix temporary key deletion after device ID attestation" by Dan Stoza · 7 years ago
  98. ee92406 Merge "Fix temporary key deletion after device ID attestation" into oc-dev am: 211dcefb77 by Bartosz Fabianowski · 7 years ago
  99. 536b429 Merge "Fix temporary key deletion after device ID attestation" into oc-dev by Bartosz Fabianowski · 7 years ago
  100. 211dcef Merge "Fix temporary key deletion after device ID attestation" into oc-dev by TreeHugger Robot · 7 years ago