Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_prerebase | Dan Pasanen | 2016-12-05 | 1 | -0/+15 |
|\ | |||||
| * | Don't reject OS version "upgrades" to zero. | Shawn Willden | 2016-09-02 | 1 | -0/+15 |
* | | Merge tag 'android-7.1.0_r4' of https://android.googlesource.com/platform/sys... | Steve Kondik | 2016-10-25 | 0 | -0/+0 |
|\| | |||||
| * | Handle 64-bit attestation values on 32-bit platforms. | Shawn Willden | 2016-05-04 | 2 | -6/+30 |
| |\ | |||||
| * \ | Add key usage extension to attestation certificates. | Shawn Willden | 2016-05-02 | 2 | -9/+90 |
| |\ \ | |||||
| * \ \ | Merge "Reject too-large key attestation challenges." into nyc-dev | Shawn Willden | 2016-04-29 | 1 | -0/+9 |
| |\ \ \ | |||||
| * \ \ \ | Revert "Revert "Add authority key ID to attestation certificates."" | Shawn Willden | 2016-04-29 | 1 | -3/+31 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge "Revert "Add authority key ID to attestation certificates."" into nyc-dev | Shawn Willden | 2016-04-28 | 1 | -31/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge changes I8705aac6,I27d98b71 into nyc-dev | Shawn Willden | 2016-04-28 | 9 | -22/+176 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Add authority key ID to attestation certificates. | Shawn Willden | 2016-04-28 | 1 | -3/+31 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | merge in nyc-release history after reset to nyc-devcm-14.0 | The Android Automerger | 2016-05-04 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-05-03 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-05-02 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-05-02 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-05-01 | 0 | -0/+0 |
| | |\| | | | | | | | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | | * | | | | | | Revert "Add authority key ID to attestation certificates." | Shawn Willden | 2016-04-28 | 1 | -31/+3 |
| | | * | | | | | | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-04-28 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | | * | | | | | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-04-04 | 0 | -0/+0 |
| | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-04-04 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | |||||
| | | | * | | | | | | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-04-03 | 0 | -0/+0 |
| | | | |\| | | | | | | | | | |/ / / / | | | | |/| | | | | |||||
| | | | | * | | | | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-03-31 | 0 | -0/+0 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-03-27 | 0 | -0/+0 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * \ \ \ | merge in nyc-release history after reset to nyc-dev | The Android Automerger | 2016-02-11 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | | * \ \ \ | merge in nyc-release history after reset to master | The Android Automerger | 2016-02-02 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | * \ \ \ | merge in nyc-release history after reset to master | The Android Automerger | 2016-02-02 | 0 | -0/+0 |
| | | | | | | | | |\ \ \ \ | | | | | | | | | |/ / / / | | | | | | | | |/| | | | | |||||
| | | | | | | | * | | | | | merge in nyc-release history after reset to master | The Android Automerger | 2016-02-02 | 0 | -0/+0 |
| | | | | | | | |\ \ \ \ \ | |||||
| | | | | | | | | * | | | | | merge in nyc-release history after reset to master | The Android Automerger | 2016-02-01 | 0 | -0/+0 |
| | | | | | | | | |\| | | | | |||||
| | | | | | | | | | * | | | | Revert "Add attestation support to SoftKeymaster." | Shawn Willden | 2016-01-28 | 6 | -199/+13 |
| | | | | | | | | | * | | | | Revert "Add attestation support to AndroidKeymaster." | Shawn Willden | 2016-01-28 | 2 | -19/+1 |
| | | | | | | | | | * | | | | Revert "Add attestation support to Key classes." | Shawn Willden | 2016-01-28 | 5 | -228/+38 |
| | | | | | | | | | * | | | | Revert "Add attestation support to KeymasterContext" | Shawn Willden | 2016-01-28 | 5 | -372/+0 |
* | | | | | | | | | | | | | | Handle 64-bit attestation values on 32-bit platforms. | Shawn Willden | 2016-05-03 | 2 | -6/+30 |
|/ / / / / / / / / / / / / | |||||
* / / / / / / / / / / / / | Add key usage extension to attestation certificates. | Shawn Willden | 2016-05-02 | 2 | -9/+90 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge "Reject too-large key attestation challenges." into nyc-dev | TreeHugger Robot | 2016-04-29 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Reject too-large key attestation challenges. | Shawn Willden | 2016-04-29 | 1 | -0/+9 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Revert "Revert "Add authority key ID to attestation certificates."" | Shawn Willden | 2016-04-29 | 1 | -3/+31 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge "Revert "Add authority key ID to attestation certificates."" into nyc-dev | Shawn Willden | 2016-04-28 | 1 | -31/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Revert "Add authority key ID to attestation certificates." | Shawn Willden | 2016-04-28 | 1 | -31/+3 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge changes I8705aac6,I27d98b71 into nyc-dev | TreeHugger Robot | 2016-04-28 | 9 | -22/+176 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add EC curve tag to keymaster1 SoftKeymaster1 attestations. | Shawn Willden | 2016-04-27 | 1 | -1/+22 |
| * | | | | | | | | Fix SoftKeymaster handling of EC curve specification. | Shawn Willden | 2016-04-27 | 8 | -21/+154 |
| |/ / / / / / / | |||||
* / / / / / / / | Add authority key ID to attestation certificates. | Shawn Willden | 2016-04-25 | 1 | -3/+31 |
|/ / / / / / / | |||||
* / / / / / / | keymaster: fix pointer overflow checks | Sami Tolvanen | 2016-03-31 | 2 | -7/+17 |
|/ / / / / / | |||||
* | | | | | | Implement Unique ID support. | Shawn Willden | 2016-03-29 | 6 | -10/+56 |
* | | | | | | Implement key version binding. | Shawn Willden | 2016-03-29 | 22 | -40/+906 |
* | | | | | | Correct attestation record. | Shawn Willden | 2016-03-26 | 8 | -191/+237 |
|/ / / / / | |||||
* / / / / | Remove agree_key and add configure to keymaster2. | Shawn Willden | 2016-03-09 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge "Add version, challenge and unique ID to attestation." into nyc-dev | Shawn Willden | 2016-02-11 | 11 | -72/+190 |
|\ \ \ \ | |||||
| * | | | | Add version, challenge and unique ID to attestation. | Shawn Willden | 2016-02-08 | 11 | -72/+190 |
* | | | | | Fix null pointer dereference in SofKeymasterDevice. | Shawn Willden | 2016-02-10 | 1 | -1/+2 |