1. ec43173 Merge "system/security/softkeymaster: don't pass a structure into |d2i_PrivateKey|." by Shawn Willden · 8 years ago
  2. 44ee626 system/security/softkeymaster: don't pass a structure into |d2i_PrivateKey|. by Adam Langley · 9 years ago
  3. c3c8a8b Merge commit \'b0adba8170cb5df45629876998229bc0f3c6dd6b\' into HEAD by Bill Yi · 8 years ago
  4. 5c2c1f9 Merge commit 'b0adba8170cb5df45629876998229bc0f3c6dd6b' into HEAD by Bill Yi · 8 years ago
  5. 3976b6c Actually pass attestation requests through to keystore. by Shawn Willden · 8 years ago
  6. 067042f Fix various memory errors. by Shawn Willden · 8 years ago
  7. b3bb392 Merge changes from topic \'km_tag_allow_on_body\' am: a1433ee2f8 am: e30ca16ae0 by Shawn Willden · 8 years ago
  8. e30ca16 Merge changes from topic \'km_tag_allow_on_body\' am: a1433ee2f8 by Shawn Willden · 8 years ago
  9. a1433ee Merge changes from topic 'km_tag_allow_on_body' by Shawn Willden · 8 years ago
  10. d3fac68 Add KM_TAG_ALLOW_WHILE_ON_BODY by Shawn Willden · 8 years ago
  11. 50eb1b2 Add attestation support to keystore. by Shawn Willden · 9 years ago
  12. 89c52f1 Merge "Update Keystore to use keymaster2 HAL." am: fd50293cd5 am: f647e0a994 by Shawn Willden · 8 years ago
  13. f647e0a Merge "Update Keystore to use keymaster2 HAL." am: fd50293cd5 by Shawn Willden · 8 years ago
  14. fd50293 Merge "Update Keystore to use keymaster2 HAL." by Shawn Willden · 8 years ago
  15. c1d1fee Refactor keystore. by Shawn Willden · 8 years ago
  16. 8f3f112 Merge "Refactor keystore." am: e4f2fa54b0 am: 63e1e79476 -s ours by Shawn Willden · 8 years ago
  17. 63e1e79 Merge "Refactor keystore." am: e4f2fa54b0 by Shawn Willden · 8 years ago
  18. e4f2fa5 Merge "Refactor keystore." by Shawn Willden · 8 years ago
  19. 715d023 Update Keystore to use keymaster2 HAL. by Shawn Willden · 9 years ago
  20. 6507c27 Refactor keystore. by Shawn Willden · 9 years ago
  21. 935f1b6 keep history after reset to mnc-dr-dev am: d1b3dc5f63 -s ours am: de4e6af56d by Baligh Uddin · 8 years ago
  22. de4e6af keep history after reset to mnc-dr-dev am: d1b3dc5f63 -s ours by Baligh Uddin · 8 years ago
  23. d1b3dc5 keep history after reset to mnc-dr-dev by Baligh Uddin · 8 years ago
  24. c3034a6 Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2 by Shawn Willden · 8 years ago
  25. 9eedb2e Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2 by Shawn Willden · 8 years ago
  26. 93c57ca Merge "Update keystore_cli_v2 for keymaster_defs changes." by Shawn Willden · 8 years ago
  27. 9d9318e Update keystore_cli_v2 for keymaster_defs changes. by Shawn Willden · 9 years ago
  28. fc77259 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 am: 80b09638de by Shawn Willden · 9 years ago
  29. 9c9cdbf Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6 am: 5a02a61066 by Shawn Willden · 9 years ago
  30. 788ca11 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 am: 80b09638de by Shawn Willden · 9 years ago
  31. b0adba8 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 by Shawn Willden · 9 years ago
  32. 6e645e0 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 by Shawn Willden · 9 years ago
  33. 80b0963 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 by Shawn Willden · 9 years ago
  34. 108a5d3 Merge "Limit maximum number of concurrent keystore operations." by Shawn Willden · 9 years ago
  35. 82f3531 Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6 am: 347c9b233e by Shawn Willden · 9 years ago
  36. 5a02a61 Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6 by Shawn Willden · 9 years ago
  37. 347c9b2 Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6 by Shawn Willden · 9 years ago
  38. e5f3a44 Merge "ECIES: adding ECIES-KEM" am: ab42146068 by Shawn Willden · 9 years ago
  39. ab42146 Merge "ECIES: adding ECIES-KEM" by Shawn Willden · 9 years ago
  40. 447095f Limit maximum number of concurrent keystore operations. by Shawn Willden · 9 years ago
  41. 0ba9f6e ECIES: adding ECIES-KEM by Shawn Willden · 9 years ago
  42. 9fa8f62 Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895 am: 6c4a59b0f8 by Darren Krahn · 9 years ago
  43. bd6db0b Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895 by Darren Krahn · 9 years ago
  44. 6c4a59b Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895 by Darren Krahn · 9 years ago
  45. 296727f Merge "keystore: Add a test suitable for Brillo PTS." by Darren Krahn · 9 years ago
  46. a9474ab keystore: Add a test suitable for Brillo PTS. by Darren Krahn · 9 years ago
  47. d0aff1d Merge "Add keystore to AID_READPROC" am: 641c6299e5 am: 0768b9943c by Nick Kralevich · 9 years ago
  48. b98232f Merge "Add keystore to AID_READPROC" am: 641c6299e5 am: 0768b9943c by Nick Kralevich · 9 years ago
  49. 0768b99 Merge "Add keystore to AID_READPROC" am: 641c6299e5 by Nick Kralevich · 9 years ago
  50. 641c629 Merge "Add keystore to AID_READPROC" by Nick Kralevich · 9 years ago
  51. d92d2cd Add keystore to AID_READPROC by Nick Kralevich · 9 years ago
  52. 2d59278 Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEAD am: 46fbb2b5df by Bill Yi · 9 years ago
  53. d9944fa Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEAD by Bill Yi · 9 years ago
  54. 46fbb2b Merge commit '5c0e13490a6035296333e942623b40e23bebc110' into HEAD by Bill Yi · 9 years ago
  55. ce1f913 keystore: Pass kDefaultUid to Keystore service methods by Gaurav Shah · 9 years ago
  56. 85978d0 Limit maximum number of concurrent keystore operations. am: ddab0bb513 am: 7335397765 by Shawn Willden · 9 years ago
  57. e6dcac6 Merge "Add -Wno-unused-parameter when using libchrome." am: 19a1dcea54 am: b7843952f0 by Gaurav Shah · 9 years ago
  58. e67513c Merge "Add NOTICE and MODULE_LICENSE_ files." am: e943c2f6e2 am: 06b07625c0 by Gaurav Shah · 9 years ago
  59. 807981c Merge "Reallocate keymaster parameters with malloc." am: 17f2c2f7ad am: 1fb1926ef5 by Gaurav Shah · 9 years ago
  60. 6af3c8b Merge "Add encryption convenience methods to KeystoreClient." am: e01125c8a9 am: e1ec0c0cc6 by Gaurav Shah · 9 years ago
  61. 872e45f resolve merge conflicts of 5020f94ae4 to master. by Gaurav Shah · 9 years ago
  62. d7870f1 Limit maximum number of concurrent keystore operations. am: ddab0bb513 by Shawn Willden · 9 years ago
  63. 7335397 Limit maximum number of concurrent keystore operations. am: ddab0bb513 by Shawn Willden · 9 years ago
  64. 87f472d Merge "Add -Wno-unused-parameter when using libchrome." am: 19a1dcea54 by Gaurav Shah · 9 years ago
  65. 9d62b40 Merge "Add NOTICE and MODULE_LICENSE_ files." am: e943c2f6e2 am: 06b07625c0 by Gaurav Shah · 9 years ago
  66. 14dfda1 Merge "Reallocate keymaster parameters with malloc." am: 17f2c2f7ad by Gaurav Shah · 9 years ago
  67. 9866640 Merge "Add encryption convenience methods to KeystoreClient." am: e01125c8a9 by Gaurav Shah · 9 years ago
  68. 5020f94 Merge "Create a KeystoreClient class." am: 4122b99ba0 am: 1e336527fe by Gaurav Shah · 9 years ago
  69. b784395 Merge "Add -Wno-unused-parameter when using libchrome." am: 19a1dcea54 by Gaurav Shah · 9 years ago
  70. 06b0762 Merge "Add NOTICE and MODULE_LICENSE_ files." am: e943c2f6e2 by Gaurav Shah · 9 years ago
  71. 1fb1926 Merge "Reallocate keymaster parameters with malloc." am: 17f2c2f7ad by Gaurav Shah · 9 years ago
  72. e1ec0c0 Merge "Add encryption convenience methods to KeystoreClient." am: e01125c8a9 by Gaurav Shah · 9 years ago
  73. 1e33652 Merge "Create a KeystoreClient class." am: 4122b99ba0 by Gaurav Shah · 9 years ago
  74. 19a1dce Merge "Add -Wno-unused-parameter when using libchrome." by Gaurav Shah · 9 years ago
  75. e943c2f Merge "Add NOTICE and MODULE_LICENSE_ files." by Gaurav Shah · 9 years ago
  76. 17f2c2f Merge "Reallocate keymaster parameters with malloc." by Gaurav Shah · 9 years ago
  77. e01125c Merge "Add encryption convenience methods to KeystoreClient." by Gaurav Shah · 9 years ago
  78. 4122b99 Merge "Create a KeystoreClient class." by Gaurav Shah · 9 years ago
  79. 1c95429 Add -Wno-unused-parameter when using libchrome. by Jorge Lucangeli Obes · 9 years ago
  80. 5ab8993 Add NOTICE and MODULE_LICENSE_ files. by Darren Krahn · 9 years ago
  81. c8eca23 Reallocate keymaster parameters with malloc. by Darren Krahn · 9 years ago
  82. 251cb28 Add encryption convenience methods to KeystoreClient. by Darren Krahn · 9 years ago
  83. 69a3dbc Create a KeystoreClient class. by Darren Krahn · 9 years ago
  84. ddab0bb Limit maximum number of concurrent keystore operations. by Shawn Willden · 9 years ago
  85. d49498b Merge "Revive test script for keystore" am: 91e439b0e8 am: d91cf18037 by Shawn Willden · 9 years ago
  86. 5c0e134 Merge "Revive test script for keystore" am: 91e439b0e8 am: d91cf18037 by Shawn Willden · 9 years ago
  87. d91cf18 Merge "Revive test script for keystore" am: 91e439b0e8 by Shawn Willden · 9 years ago
  88. 91e439b Merge "Revive test script for keystore" by Shawn Willden · 9 years ago
  89. b5acd96 Merge "system/security: remove BORINGSSL_201509 support." am: d8feb9b2ba am: 54a201ef00 by Kenny Root · 9 years ago
  90. c015fb2 Merge "system/security: remove BORINGSSL_201509 support." am: d8feb9b2ba by Kenny Root · 9 years ago
  91. 54a201e Merge "system/security: remove BORINGSSL_201509 support." am: d8feb9b2ba by Kenny Root · 9 years ago
  92. d8feb9b Merge "system/security: remove BORINGSSL_201509 support." by Kenny Root · 9 years ago
  93. 172f6e5 am f37d516d: am 66eec576: am 2567e491: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." by Shawn Willden · 9 years ago
  94. f37d516 am 66eec576: am 2567e491: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." by Shawn Willden · 9 years ago
  95. 66eec57 am 2567e491: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." by Shawn Willden · 9 years ago
  96. 2567e49 Merge "Wrap incomplete keymaster1 implementations with sw keymaster." by Shawn Willden · 9 years ago
  97. 76193b0 Wrap incomplete keymaster1 implementations with sw keymaster. by Shawn Willden · 9 years ago
  98. 8898c05 am f240a412: am bc22f8d6: am 410ba59a: Fix failure to save master key on new profile by Chad Brubaker · 9 years ago
  99. f240a41 am bc22f8d6: am 410ba59a: Fix failure to save master key on new profile by Chad Brubaker · 9 years ago
  100. bc22f8d am 410ba59a: Fix failure to save master key on new profile by Chad Brubaker · 9 years ago