summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow no digest given to imply KM_DIGEST_NONE if it was authorizedlineage-16.0Janis Danisevskis2019-07-222-6/+16
* Fix SignatureTest CTS failures in keymaster1_legacy_supportJanis Danisevskis2019-07-222-11/+49
* Invalid ownership transfer in keymaster2_passthrough_contextJanis Danisevskis2018-06-041-4/+4
* Fix type on auth token verification label.Janis Danisevskis2018-04-181-1/+1
* Make wrapped_key functions availabileShawn Willden2018-04-104-36/+40
* Merge changes from topics "niap-asym-write-pi-dev", "niap-asym-write-api-pi-d...Brian Young2018-03-305-2/+15
|\
| * Restore "Add "Unlocked device required" parameter to keys"Brian Young2018-03-282-1/+2
| * Add "unlocked device required" APIBrian Young2018-03-284-2/+14
* | Add missing break statements.Nick Bray2018-03-281-0/+2
|/
* Add missing break in switch statement.Nick Bray2018-03-211-0/+1
* Revert "Restore "Add "Unlocked device required" parameter to keys""Brian Young2018-02-235-15/+2
* Restore "Add "Unlocked device required" parameter to keys"Brian C. Young2018-02-155-2/+15
* AuthorizationSet: Clear() should also reset the error_ field am: f9524f57bf a...Janis Danisevskis2018-01-310-0/+0
|\
| * AuthorizationSet: Clear() should also reset the error_ field am: f9524f57bfJanis Danisevskis2018-01-312-0/+10
| |\
| | * AuthorizationSet: Clear() should also reset the error_ fieldJanis Danisevskis2018-01-312-0/+10
| | |\
| | | * AuthorizationSet: Clear() should also reset the error_ fieldJanis Danisevskis2018-01-302-0/+10
* | | | Merge "AuthorizationSet: Clear() should also reset the error_ field"TreeHugger Robot2018-01-312-0/+10
|\ \ \ \
| * | | | AuthorizationSet: Clear() should also reset the error_ fieldJanis Danisevskis2018-01-302-0/+10
* | | | | Revert "Add "Unlocked device required" parameter to keys"Brian Young2018-01-305-12/+0
* | | | | Add "Unlocked device required" parameter to keysBrian C. Young2018-01-255-0/+12
|/ / / /
* | | | Merge "Add additional parameters to importWrappedKey"TreeHugger Robot2018-01-225-9/+32
|\ \ \ \
| * | | | Add additional parameters to importWrappedKeyShawn Willden2018-01-195-9/+32
* | | | | Merge "Add VerifyAuthorization support."TreeHugger Robot2018-01-1910-27/+286
|\ \ \ \ \
| * | | | | Add VerifyAuthorization support.Shawn Willden2018-01-1910-27/+287
| |/ / / /
* | | | | Merge "Add security level parameter to keymaster factory"TreeHugger Robot2018-01-192-7/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add security level parameter to keymaster factoryJanis Danisevskis2018-01-022-7/+9
* | | | | Add Triple DES supportShawn Willden2018-01-1719-24/+849
* | | | | AndroidKeymaster: ImportWrappedKeyShawn Willden2018-01-1729-194/+1212
* | | | | Disable overflow sanitizer in libkeymaster. am: dbca658abf am: e50ef30e57Ivan Lozano2018-01-160-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Disable overflow sanitizer in libkeymaster. am: dbca658abfIvan Lozano2018-01-161-1/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Disable overflow sanitizer in libkeymaster.Ivan Lozano2018-01-161-1/+6
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Disable overflow sanitizer in libkeymaster.Ivan Lozano2018-01-121-1/+6
* | | | | Move abstracted block cipher operations into separate files.Shawn Willden2018-01-166-676/+727
* | | | | Refactor AES operations to generalize block cipher operations.Shawn Willden2018-01-166-328/+338
* | | | | Move Key into OperationShawn Willden2018-01-1621-425/+479
* | | | | Merge "Disable overflow sanitizer in libkeymaster."Ivan Lozano2018-01-121-1/+6
|\ \ \ \ \
| * | | | | Disable overflow sanitizer in libkeymaster.Ivan Lozano2018-01-101-1/+6
* | | | | | Merge changes I5372b97e,Id751126d,Ia436694cTreeHugger Robot2018-01-1015-47/+856
|\ \ \ \ \ \
| * | | | | | Implement HMAC sharing in Android keymaster.Shawn Willden2018-01-0712-41/+565
| * | | | | | Partially fix keymaster unit tests.Shawn Willden2018-01-041-3/+5
| * | | | | | Add CKDF implementation.Shawn Willden2018-01-044-3/+286
| |/ / / / /
* / / / / / Fix potential DoS on devices with old keymaster1 hardware.Shawn Willden2018-01-082-6/+0
|/ / / / /
* | | | / Update to "clean break" Keymaster::4.0Shawn Willden2018-01-041-2/+1
| |_|_|/ |/| | |
* | | | Remove libkeymaster_staging.Shawn Willden2017-12-213-88/+43
* | | | Change .clang-format to allow one-line if statements.Shawn Willden2017-12-141-1/+1
* | | | Add StrongBox support to Keymaster4 HALShawn Willden2017-12-112-11/+56
* | | | Manually merge changes from giant AOSP topicStephen Li2017-12-070-0/+0
|\| | |
| * | | DO NOT MERGE: Merge Oreo MR1 into master am: 897d282599 -s oursXin Li2017-12-070-0/+0
| |\| |
| | * | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-070-0/+0
| | |\|
| | | * DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-068-9/+37
| | | |\ | | | |/ | | |/|