| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2 | Dan Pasanen | 2017-04-05 | 3 | -0/+152 |
| |\ | |||||
| | * | Support Union and Difference in AuthorizationSet | Tucker Sylvestro | 2016-10-05 | 3 | -0/+152 |
| | * | Don't reject OS version "upgrades" to zero. | Shawn Willden | 2016-09-19 | 1 | -0/+15 |
| | |\ | |||||
| * | \ | Merge 20c90d3d72fe6e3b092e1e779ff2d0ac4569cd38 on remote branchstaging/cm-14.1-cafrebasecm-14.1_old | Linux Build Service Account | 2016-12-15 | 1 | -0/+15 |
| |\ \ \ | |||||
| | * \ \ | Merge N-MR1 to remote branch. | Naveen Kumar | 2016-12-08 | 1 | -0/+15 |
| | |\ \ \ | |||||
| | | * \ \ | Merge N-MR1 to remote | Lalit Kansara | 2016-12-06 | 1 | -0/+15 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | Don't reject OS version "upgrades" to zero. | Shawn Willden | 2016-09-02 | 1 | -0/+15 |
| | | | |/ | |||||
| | | | * | 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 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | * | \ \ \ \ \ \ \ | Promotion of android-framework.lnx.2.0-00016. | Linux Build Service Account | 2016-10-28 | 4 | -1/+54 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Merge 85a0b46b25d6411b62f0badf3904f9cd22aa5f73 on remote branch | Linux Build Service Account | 2016-11-07 | 4 | -1/+54 |
| |\| | | | | | | | | | | | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Promotion of android-framework.lnx.2.0.c1-00004. | Linux Build Service Account | 2016-11-03 | 4 | -1/+54 |
| |/| | | | | | | | | | | |/ / / / / / / / / | |||||
| | * / / / / / / / / | keymaster: Enable Soter for Android N | Shivaprasad Hongal | 2016-10-18 | 4 | -1/+54 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | 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 |
| |/ / / / / / / | |||||
 |
index : android_system_keymaster | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |