1. acc171b Merge \"Fix clang-tidy performance warnings in system/security.\" am: 4f987e61af by Chih-Hung Hsieh · 8 years ago
  2. 4f987e6 Merge "Fix clang-tidy performance warnings in system/security." by Chih-hung Hsieh · 8 years ago
  3. 24b2a39 Fix clang-tidy performance warnings in system/security. by Chih-Hung Hsieh · 8 years ago
  4. d62c727 Merge \"Fix google-explicit-constructor warnings in keystore.\" am: 590a1dade7 by Chih-Hung Hsieh · 8 years ago
  5. 590a1da Merge "Fix google-explicit-constructor warnings in keystore." by Treehugger Robot · 8 years ago
  6. d7791be Fix google-explicit-constructor warnings in keystore. by Chih-Hung Hsieh · 8 years ago
  7. b8fdcc2 Merge "Fix misc-macro-parentheses warnings." am: 8f8ed7f3f4 am: 4ca5d689be by Chih-hung Hsieh · 8 years ago
  8. 4ca5d68 Merge "Fix misc-macro-parentheses warnings." am: 8f8ed7f3f4 by Chih-Hung Hsieh · 8 years ago
  9. 8f8ed7f Merge "Fix misc-macro-parentheses warnings." by Chih-hung Hsieh · 8 years ago
  10. 26275ad Fix misc-macro-parentheses warnings. by Chih-Hung Hsieh · 8 years ago
  11. 9976622 Merge "Fix google-explicit-constructor warnings." am: e218406 am: e44c337 by Chih-hung Hsieh · 8 years ago
  12. e44c337 Merge "Fix google-explicit-constructor warnings." am: e218406 by Chih-Hung Hsieh · 8 years ago
  13. e218406 Merge "Fix google-explicit-constructor warnings." by Chih-hung Hsieh · 8 years ago
  14. d3bccc8 Fix google-explicit-constructor warnings. by Chih-Hung Hsieh · 8 years ago
  15. 3b7ab77 Move keystore to foreground cpuset. am: 1140ef6 by Martijn Coenen · 8 years ago
  16. 1140ef6 Move keystore to foreground cpuset. by Martijn Coenen · 8 years ago
  17. e96063f Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp." am: 193059d by Shawn Willden · 8 years ago
  18. c5e91c2 Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp." am: 193059d by David Benjamin · 8 years ago
  19. 193059d Merge "Remove RSA_FLAG_EXT_PKEY from android_engine.cpp." by Shawn Willden · 8 years ago
  20. ff2e505 resolve merge conflicts of faac064 to nyc-dev-plus-aosp by Christopher Wiley · 8 years ago
  21. faac064 Merge "Export libbinder headers from libkeystore_binder" am: 52e5773 by Christopher Wiley · 8 years ago
  22. 52e5773 Merge "Export libbinder headers from libkeystore_binder" by Treehugger Robot · 8 years ago
  23. 955cd84 Export libbinder headers from libkeystore_binder by Christopher Wiley · 8 years ago
  24. 1239911 Implement key upgrade in keystore. am: 98c5916 by Shawn Willden · 8 years ago
  25. 15a89da Configure keymaster with OS version info. am: 814a6e7 by Shawn Willden · 8 years ago
  26. 98c5916 Implement key upgrade in keystore. by Shawn Willden · 8 years ago
  27. 814a6e7 Configure keymaster with OS version info. by Shawn Willden · 8 years ago
  28. 30c7752 Remove RSA_FLAG_EXT_PKEY from android_engine.cpp. by David Benjamin · 8 years ago
  29. 5a15c7e Fix AuthTokenTable tests. am: 47d2616 by Shawn Willden · 8 years ago
  30. 47d2616 Fix AuthTokenTable tests. by Shawn Willden · 8 years ago
  31. c7f0737 Merge "keystore_cli_v2: Update AES parameters" am: 0348d00 by Sourabh Banerjee · 8 years ago
  32. 0348d00 Merge "keystore_cli_v2: Update AES parameters" by Mohammed Habibulla · 8 years ago
  33. 250b40b keystore_cli_v2: Update AES parameters by Sourabh Banerjee · 8 years ago
  34. 799aec5 Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE." am: 6148b2043b by Darren Krahn · 8 years ago
  35. 29e2f1c Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE." am: 6148b2043b by Darren Krahn · 8 years ago
  36. 6148b20 Merge "keystore_cli_v2: Removed test for KM_TAG_PURPOSE." by Darren Krahn · 8 years ago
  37. 01fc9a4 keystore_cli_v2: Removed test for KM_TAG_PURPOSE. by Darren Krahn · 8 years ago
  38. 0f93e78 Merge "keystore_cli_v2: Add support for testing against v0.3." am: 187b8f7a07 by Darren Krahn · 8 years ago
  39. 45ca6e5 Merge "keystore_cli_v2: Add support for testing against v0.3." am: 187b8f7a07 by Darren Krahn · 8 years ago
  40. 187b8f7 Merge "keystore_cli_v2: Add support for testing against v0.3." by Darren Krahn · 8 years ago
  41. fe37d0c Merge "Fix various memory errors." am: 29c54e37b2 am: 7388228191 by Shawn Willden · 8 years ago
  42. 7388228 Merge "Fix various memory errors." am: 29c54e37b2 by Shawn Willden · 8 years ago
  43. 82f4f5b keystore_cli_v2: Add support for testing against v0.3. by Darren Krahn · 8 years ago
  44. 29c54e3 Merge "Fix various memory errors." by Chih-hung Hsieh · 8 years ago
  45. eb1adaf Fix various memory errors. by Shawn Willden · 8 years ago
  46. 9d69b1b Merge "system/security/softkeymaster: don\'t pass a structure into |d2i_PrivateKey|." am: ec43173804 by Shawn Willden · 8 years ago
  47. 5e9794f Merge "system/security/softkeymaster: don\'t pass a structure into |d2i_PrivateKey|." by Shawn Willden · 8 years ago
  48. ec43173 Merge "system/security/softkeymaster: don't pass a structure into |d2i_PrivateKey|." by Shawn Willden · 8 years ago
  49. 44ee626 system/security/softkeymaster: don't pass a structure into |d2i_PrivateKey|. by Adam Langley · 8 years ago
  50. c3c8a8b Merge commit \'b0adba8170cb5df45629876998229bc0f3c6dd6b\' into HEAD by Bill Yi · 8 years ago
  51. 5c2c1f9 Merge commit 'b0adba8170cb5df45629876998229bc0f3c6dd6b' into HEAD by Bill Yi · 8 years ago
  52. 3976b6c Actually pass attestation requests through to keystore. by Shawn Willden · 8 years ago
  53. 067042f Fix various memory errors. by Shawn Willden · 8 years ago
  54. b3bb392 Merge changes from topic \'km_tag_allow_on_body\' am: a1433ee2f8 am: e30ca16ae0 by Shawn Willden · 8 years ago
  55. e30ca16 Merge changes from topic \'km_tag_allow_on_body\' am: a1433ee2f8 by Shawn Willden · 8 years ago
  56. a1433ee Merge changes from topic 'km_tag_allow_on_body' by Shawn Willden · 8 years ago
  57. d3fac68 Add KM_TAG_ALLOW_WHILE_ON_BODY by Shawn Willden · 8 years ago
  58. 50eb1b2 Add attestation support to keystore. by Shawn Willden · 8 years ago
  59. 89c52f1 Merge "Update Keystore to use keymaster2 HAL." am: fd50293cd5 am: f647e0a994 by Shawn Willden · 8 years ago
  60. f647e0a Merge "Update Keystore to use keymaster2 HAL." am: fd50293cd5 by Shawn Willden · 8 years ago
  61. fd50293 Merge "Update Keystore to use keymaster2 HAL." by Shawn Willden · 8 years ago
  62. c1d1fee Refactor keystore. by Shawn Willden · 8 years ago
  63. 8f3f112 Merge "Refactor keystore." am: e4f2fa54b0 am: 63e1e79476 -s ours by Shawn Willden · 8 years ago
  64. 63e1e79 Merge "Refactor keystore." am: e4f2fa54b0 by Shawn Willden · 8 years ago
  65. e4f2fa5 Merge "Refactor keystore." by Shawn Willden · 8 years ago
  66. 715d023 Update Keystore to use keymaster2 HAL. by Shawn Willden · 8 years ago
  67. 6507c27 Refactor keystore. by Shawn Willden · 9 years ago
  68. 935f1b6 keep history after reset to mnc-dr-dev am: d1b3dc5f63 -s ours am: de4e6af56d by Baligh Uddin · 8 years ago
  69. de4e6af keep history after reset to mnc-dr-dev am: d1b3dc5f63 -s ours by Baligh Uddin · 8 years ago
  70. d1b3dc5 keep history after reset to mnc-dr-dev by Baligh Uddin · 8 years ago
  71. c3034a6 Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2 by Shawn Willden · 8 years ago
  72. 9eedb2e Merge "Update keystore_cli_v2 for keymaster_defs changes." am: 93c57ca1b2 by Shawn Willden · 8 years ago
  73. 93c57ca Merge "Update keystore_cli_v2 for keymaster_defs changes." by Shawn Willden · 8 years ago
  74. 9d9318e Update keystore_cli_v2 for keymaster_defs changes. by Shawn Willden · 9 years ago
  75. fc77259 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 am: 80b09638de by Shawn Willden · 9 years ago
  76. 9c9cdbf Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6 am: 5a02a61066 by Shawn Willden · 9 years ago
  77. 788ca11 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 am: 80b09638de by Shawn Willden · 9 years ago
  78. b0adba8 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 by Shawn Willden · 9 years ago
  79. 6e645e0 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 by Shawn Willden · 9 years ago
  80. 80b0963 Merge "Limit maximum number of concurrent keystore operations." am: 108a5d34b5 by Shawn Willden · 9 years ago
  81. 108a5d3 Merge "Limit maximum number of concurrent keystore operations." by Shawn Willden · 9 years ago
  82. 82f3531 Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6 am: 347c9b233e by Shawn Willden · 9 years ago
  83. 5a02a61 Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6 by Shawn Willden · 9 years ago
  84. 347c9b2 Merge "ECIES: adding ECIES-KEM" am: ab42146068 am: e5f3a444f6 by Shawn Willden · 9 years ago
  85. e5f3a44 Merge "ECIES: adding ECIES-KEM" am: ab42146068 by Shawn Willden · 9 years ago
  86. ab42146 Merge "ECIES: adding ECIES-KEM" by Shawn Willden · 9 years ago
  87. 447095f Limit maximum number of concurrent keystore operations. by Shawn Willden · 9 years ago
  88. 0ba9f6e ECIES: adding ECIES-KEM by Shawn Willden · 9 years ago
  89. 9fa8f62 Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895 am: 6c4a59b0f8 by Darren Krahn · 9 years ago
  90. bd6db0b Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895 by Darren Krahn · 9 years ago
  91. 6c4a59b Merge "keystore: Add a test suitable for Brillo PTS." am: 296727f895 by Darren Krahn · 9 years ago
  92. 296727f Merge "keystore: Add a test suitable for Brillo PTS." by Darren Krahn · 9 years ago
  93. a9474ab keystore: Add a test suitable for Brillo PTS. by Darren Krahn · 9 years ago
  94. d0aff1d Merge "Add keystore to AID_READPROC" am: 641c6299e5 am: 0768b9943c by Nick Kralevich · 9 years ago
  95. b98232f Merge "Add keystore to AID_READPROC" am: 641c6299e5 am: 0768b9943c by Nick Kralevich · 9 years ago
  96. 0768b99 Merge "Add keystore to AID_READPROC" am: 641c6299e5 by Nick Kralevich · 9 years ago
  97. 641c629 Merge "Add keystore to AID_READPROC" by Nick Kralevich · 9 years ago
  98. d92d2cd Add keystore to AID_READPROC by Nick Kralevich · 9 years ago
  99. 2d59278 Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEAD am: 46fbb2b5df by Bill Yi · 9 years ago
  100. d9944fa Merge commit \'5c0e13490a6035296333e942623b40e23bebc110\' into HEAD by Bill Yi · 9 years ago