summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* keystore: Fix SoterTest issuesHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001cm-13.0AnilKumar Chimata2016-08-201-1/+2
* keystore: Add SOTER support in keystoreMao Li2016-08-191-0/+25
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/sy...staging/cm-13.0+r22stable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2KSteve Kondik2016-03-100-0/+0
|\
| * keep history after reset to mnc-dr-devBaligh Uddin2016-01-250-0/+0
| |\
| | * Limit maximum number of concurrent keystore operations.Shawn Willden2015-11-022-12/+35
| | |\ | | |/ | |/|
| * | Limit maximum number of concurrent keystore operations.Shawn Willden2015-10-302-12/+35
| | * am 410ba59a: Fix failure to save master key on new profileChad Brubaker2015-10-121-4/+48
| | |\ | | |/ | |/|
| | * Prepare for BoringSSL update.Adam Langley2015-10-021-0/+3
* | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/sys...stable/cm-13.0-ZNH0ESteve Kondik2015-12-082-16/+83
|\ \ \
| * | | Limit maximum number of concurrent keystore operations.Shawn Willden2015-11-022-12/+35
| |/ /
| * / Fix failure to save master key on new profileChad Brubaker2015-10-091-4/+48
| |/
* | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-050-0/+0
|\|
| * Merge "Wrap incomplete keymaster1 implementations with sw keymaster." into mn...Shawn Willden2015-08-131-73/+175
| |\
| | * Wrap incomplete keymaster1 implementations with sw keymaster.Shawn Willden2015-08-101-73/+175
* | | Wrap incomplete keymaster1 implementations with sw keymaster.Shawn Willden2015-10-161-73/+175
* | | keystore: Read KeyBlob after type changeZhen Kong2015-10-061-0/+9
|/ /
* | am 8a2c33b6: (-s ours) am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am...Chad Brubaker2015-08-130-0/+0
|\ \
| * \ am 48d998cd: am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly che...Chad Brubaker2015-08-121-4/+4
| |\ \
| | * \ am aca71139: am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob m...Chad Brubaker2015-08-121-4/+4
| | |\ \
| | | * \ am 738d1e9d: am 1b8885ba: am 0d593526: Properly check for Blob max lengthChad Brubaker2015-08-121-4/+4
| | | |\ \
| | | | * \ am 1b8885ba: am 0d593526: Properly check for Blob max lengthChad Brubaker2015-08-121-4/+4
| | | | |\ \
| | | | | * \ am 0d593526: Properly check for Blob max lengthChad Brubaker2015-08-121-4/+4
| | | | | |\ \
| | | | | | * | Properly check for Blob max lengthChad Brubaker2015-08-121-4/+4
* | | | | | | | Properly check for Blob max lengthChad Brubaker2015-08-121-4/+4
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | am c761a1ed: (-s ours) am 63bc525c: am 853b8d79: am fd1ad379: am 1c73457a: am...Chad Brubaker2015-08-050-0/+0
|\| | | | | |
| * | | | | | am 63bc525c: am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecke...Chad Brubaker2015-08-051-1/+9
| |\| | | | |
| | * | | | | am 853b8d79: am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in B...Chad Brubaker2015-08-031-1/+9
| | |\| | | |
| | | * | | | am fd1ad379: am 1c73457a: am b124c9e8: Fix unchecked length in Blob creationChad Brubaker2015-08-031-1/+9
| | | |\| | |
| | | | * | | am 1c73457a: am b124c9e8: Fix unchecked length in Blob creationChad Brubaker2015-08-031-1/+9
| | | | |\| |
| | | | | * | am b124c9e8: Fix unchecked length in Blob creationChad Brubaker2015-08-031-1/+9
| | | | | |\|
| | | | | | * Fix unchecked length in Blob creationChad Brubaker2015-07-291-1/+9
* | | | | | | Fix unchecked length in Blob creationChad Brubaker2015-07-291-1/+9
* | | | | | | Add all digests and padding modes to legacy keysShawn Willden2015-07-271-4/+16
* | | | | | | Mark 0 length files as corruptChad Brubaker2015-07-171-1/+8
* | | | | | | Fix erroneous reporting of all tokens as timed out.Shawn Willden2015-06-301-3/+3
* | | | | | | Rename keymaster tag types to clarify that integers are unsigned.Shawn Willden2015-06-241-8/+8
* | | | | | | Merge "Abort operation pruning only if it fails to make space." into mnc-devAlex Klyubin2015-06-233-3/+17
|\ \ \ \ \ \ \
| * | | | | | | Abort operation pruning only if it fails to make space.Alex Klyubin2015-06-233-3/+17
* | | | | | | | Don't ignore errors from begin operation.Alex Klyubin2015-06-231-2/+3
|/ / / / / / /
* | | | | | | Fully support uint64 key validity dates.Alex Klyubin2015-06-231-6/+29
* | | | | | | Add keymaster authorization policy enforcement to keystore.Shawn Willden2015-06-195-17/+142
* | | | | | | Merge "Remove exist check from doLegacySignVerify" into mnc-devChad Brubaker2015-06-181-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Remove exist check from doLegacySignVerifyChad Brubaker2015-06-171-5/+5
* | | | | | | | Don't check authorizations for pubkey operations.Shawn Willden2015-06-175-24/+53
|/ / / / / / /
* | | | | | | Rewrite legacy methods in terms of new methodsChad Brubaker2015-06-082-233/+222
* | | | | | | Allow keymaster 0.3 keys to interopt with keymaster 1.0 methodsChad Brubaker2015-06-041-0/+6
* | | | | | | Merge "Add optional additional entropy to finish" into mnc-devChad Brubaker2015-06-043-7/+27
|\ \ \ \ \ \ \
| * | | | | | | Add optional additional entropy to finishChad Brubaker2015-06-043-7/+27
* | | | | | | | Merge "Use keymaster adapter to support older devices" into mnc-devChad Brubaker2015-06-031-6/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use keymaster adapter to support older devicesChad Brubaker2015-06-011-6/+14