Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/sys...stable/cm-13.0-ZNH0E | Steve Kondik | 2015-12-08 | 3 | -3/+48 |
|\ | |||||
| * | Return correct error from keymaster0engine for large RSA input | Shawn Willden | 2015-11-03 | 3 | -3/+48 |
* | | Merge tag 'android-6.0.0_r26' into cm-13.0 | Ricardo Cerqueira | 2015-11-05 | 49 | -847/+3083 |
|\ \ | |||||
| * \ | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-10-08 | 0 | -0/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-09-27 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-31 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-29 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-29 | 0 | -0/+0 |
| | | | |/| | | | |/|/ | |||||
| | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-15 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-08-01 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-30 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-29 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-25 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-23 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-15 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-11 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-08 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-dev | The Android Automerger | 2015-07-06 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| * | | | | | | | | | | | | | | Fix Shamu build breakage. | Shawn Willden | 2015-10-08 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / | |||||
| * / / / / / / / / / / / / | Add a faux library libkeymasterfiles to export source. | Shawn Willden | 2015-09-24 | 1 | -1/+13 |
| |/ / / / / / / / / / / / | |||||
| * / / / / / / / / / / / | Revert "Hack to work around broken bullhead keymaster app." | Jim Miller | 2015-08-14 | 1 | -8/+0 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Hack to work around broken bullhead keymaster app. | Shawn Willden | 2015-08-13 | 1 | -0/+8 |
| * | | | | | | | | | | | Do digesting, and sometimes padding, in SW when HW doesnt. | Shawn Willden | 2015-08-13 | 49 | -846/+3070 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-08-01 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-30 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-29 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-25 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-23 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | | |||||
| | | | | * | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-15 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | | | |||||
| | | | | | * | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-13 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | | | |||||
| | | | | | | * | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-08 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | |/| | | | |||||
| | | | | | | | * | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-02 | 0 | -0/+0 |
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | | | | | | | | |/| | | |||||
| | | | | | | | | * | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-07-01 | 0 | -0/+0 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | | * \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-27 | 0 | -0/+0 |
| | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | * \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-25 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | * | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-23 | 0 | -0/+0 |
| | | | | | | | | | | | |\| | |||||
| | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-18 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-17 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-16 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | * | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ | |||||
* | | | | | | | | | | | | | | | | | | Left-pad messages when doing "unpadded" RSA operations. | Shawn Willden | 2015-07-30 | 3 | -34/+125 |
|/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge "Revert "Revert "Report keymaster0 keys as hardware-backed, origin unkn... | Shawn Willden | 2015-07-29 | 3 | -9/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Revert "Revert "Report keymaster0 keys as hardware-backed, origin unknown."" | Shawn Willden | 2015-07-29 | 3 | -9/+21 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Make NONE mean NONE only (not ANY) | Shawn Willden | 2015-07-28 | 5 | -37/+91 |
* | | | | | | | | | | | | | | | | Merge "Use minimum 20 bytes salt for RSA PSS." into mnc-dev | Shawn Willden | 2015-07-28 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Use minimum 20 bytes salt for RSA PSS. | Shawn Willden | 2015-07-20 | 2 | -2/+2 |
| |/ / / / / / / / / / / / / / | |||||
* / / / / / / / / / / / / / / | Revert "Report keymaster0 keys as hardware-backed, origin unknown." | Shawn Willden | 2015-07-23 | 3 | -21/+9 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Report keymaster0 keys as hardware-backed, origin unknown. | Shawn Willden | 2015-07-16 | 3 | -9/+21 |
* | | | | | | | | | | | | | | Add support for KM_TAG_MIN_MAC_LENGTH. | Shawn Willden | 2015-07-16 | 14 | -159/+455 |
|/ / / / / / / / / / / / / | |||||
* / / / / / / / / / / / / | Use specified digest for RSA OAEP. | Shawn Willden | 2015-07-14 | 4 | -22/+96 |
|/ / / / / / / / / / / / |