summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in nyc-release history after reset to nyc-devcm-14.0The Android Automerger2016-05-040-0/+0
|\
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-030-0/+0
| |\
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-020-0/+0
| | |\
| | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-020-0/+0
| | | |\ | | | |/ | | |/|
| | * | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-010-0/+0
| | |\|
| | | * Revert "Add authority key ID to attestation certificates."Shawn Willden2016-04-281-31/+3
| | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-280-0/+0
| | | |\
| | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-040-0/+0
| | | | |\
| | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-040-0/+0
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-030-0/+0
| | | | |\|
| | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-310-0/+0
| | | | | |\
| | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-270-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-110-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | |\ | | | | | | | | | |/ | | | | | | | | |/|
| | | | | | | | * | merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | |\ \
| | | | | | | | | * | merge in nyc-release history after reset to masterThe Android Automerger2016-02-010-0/+0
| | | | | | | | | |\|
| | | | | | | | | | * Revert "Add attestation support to SoftKeymaster."Shawn Willden2016-01-286-199/+13
| | | | | | | | | | * Revert "Add attestation support to AndroidKeymaster."Shawn Willden2016-01-282-19/+1
| | | | | | | | | | * Revert "Add attestation support to Key classes."Shawn Willden2016-01-285-228/+38
| | | | | | | | | | * Revert "Add attestation support to KeymasterContext"Shawn Willden2016-01-285-372/+0
* | | | | | | | | | | Handle 64-bit attestation values on 32-bit platforms.Shawn Willden2016-05-032-6/+30
|/ / / / / / / / / /
* / / / / / / / / / Add key usage extension to attestation certificates.Shawn Willden2016-05-022-9/+90
|/ / / / / / / / /
* | | | | | | | | Merge "Reject too-large key attestation challenges." into nyc-devTreeHugger Robot2016-04-291-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reject too-large key attestation challenges.Shawn Willden2016-04-291-0/+9
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Revert "Revert "Add authority key ID to attestation certificates.""Shawn Willden2016-04-291-3/+31
* | | | | | | | | Merge "Revert "Add authority key ID to attestation certificates."" into nyc-devShawn Willden2016-04-281-31/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Revert "Add authority key ID to attestation certificates."Shawn Willden2016-04-281-31/+3
* | | | | | | | | Merge changes I8705aac6,I27d98b71 into nyc-devTreeHugger Robot2016-04-289-22/+176
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add EC curve tag to keymaster1 SoftKeymaster1 attestations.Shawn Willden2016-04-271-1/+22
| * | | | | | | | Fix SoftKeymaster handling of EC curve specification.Shawn Willden2016-04-278-21/+154
| |/ / / / / / /
* / / / / / / / Add authority key ID to attestation certificates.Shawn Willden2016-04-251-3/+31
|/ / / / / / /
* / / / / / / keymaster: fix pointer overflow checksSami Tolvanen2016-03-312-7/+17
|/ / / / / /
* | | | | | Implement Unique ID support.Shawn Willden2016-03-296-10/+56
* | | | | | Implement key version binding.Shawn Willden2016-03-2922-40/+906
* | | | | | Correct attestation record.Shawn Willden2016-03-268-191/+237
|/ / / / /
* / / / / Remove agree_key and add configure to keymaster2.Shawn Willden2016-03-091-1/+1
|/ / / /
* | | | Merge "Add version, challenge and unique ID to attestation." into nyc-devShawn Willden2016-02-1111-72/+190
|\ \ \ \
| * | | | Add version, challenge and unique ID to attestation.Shawn Willden2016-02-0811-72/+190
* | | | | Fix null pointer dereference in SofKeymasterDevice.Shawn Willden2016-02-101-1/+2
* | | | | Make AuthorizationSet comply with C++11 Rule of FivePaul Crowley2016-02-102-4/+40
|/ / / /
* | | | Fix message versioning support. am: e8c8ec8440Shawn Willden2016-02-020-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Fix message versioning support.Shawn Willden2016-02-021-11/+53
| |\ \ \
| | * | | Fix message versioning support.Shawn Willden2016-02-021-11/+53
* | | | | Fix message versioning support.Shawn Willden2016-02-011-14/+55
| |_|/ / |/| | |
* | | | resolve merge conflicts of 4aa5650699 to master.Shawn Willden2016-01-2815-65/+177
|\| | |
| * | | Support input to "finish()" in AndroidKeymaster operations.Shawn Willden2016-01-2915-65/+177
| |\| |
| | * | Support input to "finish()" in AndroidKeymaster operations.Shawn Willden2016-01-2815-65/+177
* | | | Add input to FinishOperationRequest message. am: 4ed2d7ed22Shawn Willden2016-01-293-11/+50
|\| | |
| * | | Add input to FinishOperationRequest message.Shawn Willden2016-01-293-11/+50
| |\| |