summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-11-05Indicate that softkeymaster key blobs are standalone, meaning they don'tandroid-5.1.1_r5android-5.1.1_r12lollipop-mr1-devShawn Willden
2014-09-26Merge "Delete user's keys only after keystore reset" into lmp-devlollipop-devRobin Lee
2014-09-26Delete user's keys only after keystore resetRobin Lee
2014-09-25Fallback to software keystore on import_key failureKenny Root
2014-09-11isEmpty checks all files like resetKenny Root
2014-08-29Build keystore in 32 bit on platforms that require it.Shawn Willden
2014-08-29APIs for syncing password between profilesRobin Lee
2014-08-12Correct double-convert from uid to useridRobin Lee
2014-07-31Merge "keystore: allow system to clear keys even while encrypted" into lmp-devKenny Root
2014-07-31keystore: fully reset user keystore on requestKenny Root
2014-07-31keystore: allow system to clear keys even while encryptedKenny Root
2014-06-30am 00b27fc4: am 0387a7fd: Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich
2014-06-30am 0387a7fd: Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich
2014-06-30am 1bed3f00: am 9421618b: Merge "Revert "Add calls for SELinux MAC checks in ...Nick Kralevich
2014-06-30am 9421618b: Merge "Revert "Add calls for SELinux MAC checks in keystore.""Nick Kralevich
2014-06-27Merge "Revert "Add calls for SELinux MAC checks in keystore.""Nick Kralevich
2014-06-30Revert "Add calls for SELinux MAC checks in keystore."Nick Kralevich
2014-06-26am e24fbbae: am bbf064bb: Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich
2014-06-26am bbf064bb: Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich
2014-06-26Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich
2014-06-30Add calls for SELinux MAC checks in keystore.Riley Spahn
2014-06-26Merge "Add calls for SELinux MAC checks in keystore."Nick Kralevich
2014-06-26Add calls for SELinux MAC checks in keystore.Riley Spahn
2014-06-20am d776bbd5: am 4bbc12a0: Merge "Fix softkeymaster EC group memory leak."Shawn Willden
2014-06-20am 4bbc12a0: Merge "Fix softkeymaster EC group memory leak."Shawn Willden
2014-06-20Merge "Fix softkeymaster EC group memory leak."Shawn Willden
2014-06-19am 35dadbc8: am 9f64567d: Merge changes Icb667451,Ie08d910bShawn Willden
2014-06-19am 9f64567d: Merge changes Icb667451,Ie08d910bShawn Willden
2014-06-19Merge changes Icb667451,Ie08d910bShawn Willden
2014-06-17am 9ee34c2f: am f7386706: Merge "Reformat software keymaster with clang-format."Shawn Willden
2014-06-17Fix softkeymaster EC group memory leak.Shawn Willden
2014-06-17Use template instead of macro to release UniquePtrs.Shawn Willden
2014-06-17Make usage of new/delete and malloc/free consistent.Shawn Willden
2014-06-17am f7386706: Merge "Reformat software keymaster with clang-format."Shawn Willden
2014-06-17Merge "Reformat software keymaster with clang-format."Shawn Willden
2014-06-13Reformat software keymaster with clang-format.Shawn Willden
2014-05-22merge in master-release history after reset to 12b9921e52e28d4b1ea0d786ee81fb...The Android Automerger
2014-05-22merge in master-release history after reset to 12b9921e52e28d4b1ea0d786ee81fb...The Android Automerger
2014-05-21merge in master-release history after reset to 12b9921e52e28d4b1ea0d786ee81fb...The Android Automerger
2014-05-20Revert "Reformat software keymaster with clang-format."Kenny Root
2014-05-20merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297f...The Android Automerger
2014-05-19merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297f...The Android Automerger
2014-05-18merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297f...The Android Automerger
2014-05-17merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297f...The Android Automerger
2014-05-16Reformat software keymaster with clang-format.Shawn Willden
2014-05-15merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297f...The Android Automerger
2014-05-14merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297f...The Android Automerger
2014-05-13merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297f...The Android Automerger
2014-05-12merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297f...The Android Automerger
2014-05-11merge in master-release history after reset to 1d4d33bc7a52b5b8e6eb016cb3297f...The Android Automerger