summaryrefslogtreecommitdiffstats
path: root/keymaster
Commit message (Expand)AuthorAgeFilesLines
* Merge "Revert "Add "Unlocked device required" parameter to keys""Jorim Jaggi2018-01-302-23/+12
|\
| * Revert "Add "Unlocked device required" parameter to keys"Brian Young2018-01-302-23/+12
* | Merge "Add "Unlocked device required" parameter to keys"TreeHugger Robot2018-01-292-12/+23
|\|
| * Add "Unlocked device required" parameter to keysBrian C. Young2018-01-252-12/+23
* | Support library enhancements, to ease transition of vold to KM4Shawn Willden2018-01-2511-74/+335
|/
* Merge changes from topic "tui_keystore"TreeHugger Robot2018-01-253-30/+74
|\
| * Add Trusted Confirmation support to Keymaster HAL.Shawn Willden2018-01-243-0/+44
| * Sort tags in keymaster_tags.h alphabeticallyJanis Danisevskis2018-01-241-30/+30
* | Merge "Update makefiles."Steven Moreland2018-01-231-0/+10
|\ \
| * | Update makefiles.Steven Moreland2018-01-231-0/+10
| |/
* / Add support for BOOT and VENDOR patch levels to keymaster.Shawn Willden2018-01-233-4/+47
|/
* Merge "Add additional parameters to importWrappedKey"TreeHugger Robot2018-01-226-15/+50
|\
| * Add additional parameters to importWrappedKeyShawn Willden2018-01-196-15/+50
* | Merge "Add VerificationToken tests."TreeHugger Robot2018-01-205-1/+142
|\ \
| * | Add VerificationToken tests.Shawn Willden2018-01-205-1/+142
| |/
* | Merge "Specify SecurityLevel::SOFTWARE in default keymaster 4.0 service."TreeHugger Robot2018-01-191-1/+3
|\ \
| * | Specify SecurityLevel::SOFTWARE in default keymaster 4.0 service.Frank Salim2018-01-181-1/+3
* | | Move KeyParameter operator== to support lib.Shawn Willden2018-01-192-86/+86
| |/ |/|
* | Add HMAC key sharing testsShawn Willden2018-01-183-0/+240
* | Refactor VTS tests a bit, to enable adding tests in separate files.Shawn Willden2018-01-184-627/+820
* | Merge "Fix build breakage"Shawn Willden2018-01-191-0/+1
|\ \
| * | Fix build breakageShawn Willden2018-01-181-0/+1
* | | Merge "ImportWrappedKey: preliminary VTS tests"TreeHugger Robot2018-01-191-0/+125
|\ \ \ | |/ / |/| |
| * | ImportWrappedKey: preliminary VTS testsFrank Salim2018-01-181-0/+125
* | | Move Keymaster wrapper into support library.Shawn Willden2018-01-186-0/+719
|/ /
* / Add support for 3DES algorithm to Keymaster.Shawn Willden2018-01-174-0/+607
|/
* Add Trusted User Presence support to Keymaster HAL.Shawn Willden2018-01-102-0/+48
* Remove references to Keymaster::3.0 from Keymaster::4.0Shawn Willden2018-01-044-50/+265
* Merge "Fix typos in KM4 interface definition documentation"Janis Danisevskis2018-01-021-2/+2
|\
| * Fix typos in KM4 interface definition documentationJanis Danisevskis2017-12-271-2/+2
* | Update Keymaster makefiles.Steven Moreland2017-12-221-0/+6
* | Remove libkeymaster_stagingShawn Willden2017-12-211-1/+0
|/
* Merge "Add support for StrongBox implementations to Keymaster HAL"TreeHugger Robot2017-12-126-35/+399
|\
| * Add support for StrongBox implementations to Keymaster HALShawn Willden2017-12-126-35/+399
* | Update makefiles.Steven Moreland2017-12-111-2/+0
|/
* Rename IKeymaster back to IKeymaserDeviceShawn Willden2017-11-306-14/+16
* Add Keymaster V4.0Shawn Willden2017-11-2821-5/+6587
* Merge "Fix Keymaster VTS for OpenSSL error code change" am: fc23356909 am: f9...Iris Chang2017-11-221-2/+4
|\
| * 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. am: ae6b2a5f1e am: 8ca98990abRyan Campbell2017-11-171-1/+1
|\| | |
| * | | 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 makefiles for hidl_interface.Steven Moreland2017-11-101-136/+29
* | | Updating makefiles for hidl_interface.Steven Moreland2017-11-131-136/+29
* | | Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1Steven Moreland2017-10-111-1/+5
|\ \ \ | | |/ | |/|
| * | 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
| | |\|