summaryrefslogtreecommitdiffstats
path: root/keymaster
Commit message (Expand)AuthorAgeFilesLines
* Remove subdirsSteven Moreland2017-11-281-5/+0
* Merge "Fix Keymaster VTS for OpenSSL error code change"Iris Chang2017-11-221-2/+4
|\
| * Merge "Fix Keymaster VTS for OpenSSL error code change"Treehugger Robot2017-11-221-2/+4
| |\
| | * Fix Keymaster VTS for OpenSSL error code changeIris Chang2017-11-151-2/+4
* | | Transfer VTS test ownership.Ryan Campbell2017-11-171-1/+1
|\| |
| * | Transfer VTS test ownership.Ryan Campbell2017-11-161-1/+1
| |/
* | Merge commit '1a06284b24f5eb7bb9c1fea0817da8898b3b1bff' fromXin Li2017-11-144-42/+36
|\ \ | |/ |/|
| * Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1Steven Moreland2017-10-111-1/+5
| |\
| | * Update for Soong java makefiles. am: c3e80fa01eSteven Moreland2017-10-111-1/+5
| | |\
| * | | Merge "VTS: fix VtsHalKeymasterV3_0Target issue" am: 1912c73a7f am: b87becf1c2Iris Chang2017-10-061-4/+6
| |\| |
| | * | Merge "VTS: fix VtsHalKeymasterV3_0Target issue" am: 1912c73a7fIris Chang2017-10-061-4/+6
| | |\ \
| * | | | Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985fSteven Moreland2017-10-041-0/+1
| |\| | |
| | * | | Merge "Update for hidl adapter module defaults." am: 988c977079Steven Moreland2017-10-041-0/+1
| | |\ \ \
| * | | | | Add OWNERS files to keymaster resources am: e6014f69ea am: 1ff3510d29Janis Danisevskis2017-10-032-0/+6
| |\| | | |
| | * | | | Add OWNERS files to keymaster resources am: e6014f69eaJanis Danisevskis2017-10-032-0/+6
| | |\ \ \ \
| * | | | | | Merge "Fix typo in update makefiles." am: 9960148420 am: f07e364ce3Steven Moreland2017-09-261-1/+2
| |\| | | | |
| | * | | | | Merge "Fix typo in update makefiles." am: 9960148420Steven Moreland2017-09-261-1/+2
| | |\ \ \ \ \
| * | | | | | | Update makefiles for hidl adapter. am: 26a0bb2762 am: 73949c1d7eSteven Moreland2017-09-261-0/+73
| |\| | | | | |
| | * | | | | | Update makefiles for hidl adapter. am: 26a0bb2762Steven Moreland2017-09-261-0/+73
| | |\ \ \ \ \ \
| * | | | | | | | Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079 a...Shawn Willden2017-09-121-1/+1
| |\| | | | | | |
| | * | | | | | | Merge "Don't send more than 2K to addRngEntropy" into oc-dev am: 7eeb6b5079Shawn Willden2017-09-121-1/+1
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge "Don't send more than 2K to addRngEntropy" into oc-devShawn Willden2017-09-121-1/+1
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge "Don't send more than 2K to addRngEntropy" into oc-devTreeHugger Robot2017-09-121-1/+1
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Don't send more than 2K to addRngEntropyShawn Willden2017-08-301-1/+1
| | * | | | | | | | | | Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03aShawn Willden2017-09-121-2/+2
| | |\| | | | | | | | |
| * | | | | | | | | | | Merge "Reduce max keymaster message size to 2K" into oc-dev am: 42d61ce03aShawn Willden2017-09-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Reduce max keymaster message size to 2K" into oc-devShawn Willden2017-09-121-2/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Reduce max keymaster message size to 2KShawn Willden2017-08-031-2/+2
| | | | |/ / / / / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge "Keymaster test statically links to dependencies." into oc-mr1-devTri Vo2017-08-113-39/+33
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Keymaster test statically links to dependencies.Tri Vo2017-08-103-39/+33
| * | | | | | | | | | | Update make file for vndk enabled.Justin Yun2017-08-041-0/+3
| |/ / / / / / / / / /
| * / / / / / / / / / Update Android.bp HIDL makefilesTri Vo2017-08-031-1/+1
| |/ / / / / / / / /
* | | | | | | | | / Update makefiles for hidl_interface.Steven Moreland2017-11-101-136/+29
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Update for Soong java makefiles.Steven Moreland2017-10-111-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Update for Soong java makefiles.Steven Moreland2017-10-101-1/+5
* | | | | | | | | Merge "VTS: fix VtsHalKeymasterV3_0Target issue"Iris Chang2017-10-061-4/+6
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge "VTS: fix VtsHalKeymasterV3_0Target issue"Treehugger Robot2017-10-061-4/+6
| |\ \ \ \ \ \ \
| | * | | | | | | VTS: fix VtsHalKeymasterV3_0Target issueIris Chang2017-10-061-4/+6
* | | | | | | | | Merge "Update for hidl adapter module defaults."Steven Moreland2017-10-041-0/+1
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Update for hidl adapter module defaults.Steven Moreland2017-10-041-0/+1
* | | | | | | | Add OWNERS files to keymaster resourcesJanis Danisevskis2017-10-032-0/+6
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Add OWNERS files to keymaster resourcesJanis Danisevskis2017-10-032-0/+6
| |/ / / / /
* | | | | / Merge "Fix typo in update makefiles."Steven Moreland2017-09-261-1/+2
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | Fix typo in update makefiles.Steven Moreland2017-09-261-1/+2
* | | | | Update makefiles for hidl adapter.Steven Moreland2017-09-251-0/+73
|\| | | | | |_|_|/ |/| | |
| * | | Update makefiles for hidl adapter.Steven Moreland2017-09-251-0/+73
| * | | Updating all makefiles.Steven Moreland2017-08-141-1/+4
| * | | Merge "Test import of a EC P-521 key." into oc-devShawn Willden2017-06-231-36/+76
| |\ \ \ | | | |/ | | |/|
| | * | Test import of a EC P-521 key.Shawn Willden2017-06-221-36/+76
| * | | Merge "Check return from DeleteKey correctly." into oc-devShawn Willden2017-06-211-17/+25
| |\| |