summaryrefslogtreecommitdiffstats
path: root/keymaster/4.0
Commit message (Expand)AuthorAgeFilesLines
* Merge "Added VTS tests for clearing operation slots after service death." am:...Rob Barnes2019-10-013-5/+101
|\
| * Merge "Added VTS tests for clearing operation slots after service death."Rob Barnes2019-10-013-5/+101
| |\
| | * Added VTS tests for clearing operation slots after service death.Rob Barnes2019-09-103-5/+101
* | | Merge "Use libcrypto_static instead of libcrypto" am: c048c187be am: 06b758a9...Colin Cross2019-09-261-1/+1
|\| |
| * | Use libcrypto_static instead of libcryptoColin Cross2019-09-181-1/+1
* | | Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a am: 8c22c3862...Steven Moreland2019-09-062-2/+0
|\| |
| * | Remove libhwbinder/libhidltransport depsSteven Moreland2019-09-062-2/+0
* | | Merge "Adding testing functionality for TAG_ROLLBACK_RESISTANCE" am: 28a7fed6...Max Bires2019-08-231-63/+44
|\| |
| * | Merge "Adding testing functionality for TAG_ROLLBACK_RESISTANCE"Max Bires2019-08-231-63/+44
| |\|
| | * Adding testing functionality for TAG_ROLLBACK_RESISTANCEMax Bires2019-08-151-63/+44
* | | Merge "Add interface info to .rc files" am: 98d0f4d52c am: 37298a7616 am: 353...Felix2019-07-081-0/+1
|\| |
| * | Merge "Add interface info to .rc files"Felix2019-07-081-0/+1
| |\|
| | * Add interface info to .rc filesFelix2019-06-251-0/+1
| | * Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."Xin Li2019-05-171-0/+27
| | |\
* | | | Merge "keymaster: Relax testing under GSI" into qt-dev am: d10841a83d am: eec...nagendra modadugu2019-06-291-32/+45
|\| | |
| * | | Merge "keymaster: Relax testing under GSI" into qt-devnagendra modadugu2019-06-291-32/+45
| |\ \ \
| | * | | keymaster: Relax testing under GSInagendra modadugu2019-06-291-32/+45
| * | | | Merge "Increase leniency of attestation record timestamps" into qt-devGarret Kelly2019-06-251-2/+2
| |\| | |
* | | | | Merge "Increase leniency of attestation record timestamps" into qt-dev am: 6c...Garret Kelly2019-06-251-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge "Increase leniency of attestation record timestamps" into qt-dev am: 6c...Garret Kelly2019-06-251-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Increase leniency of attestation record timestampsGarret Kelly2019-06-241-2/+2
| * | | | Merge "Removing an extraneous test" into qt-devMax Bires2019-06-171-22/+0
| |\| | |
| | * | | Removing an extraneous testMax Bires2019-06-171-22/+0
* | | | | Keymaster memory management is inconsistentJanis Danisevskis2019-06-142-7/+6
* | | | | Merge "Removing an extraneous test"TreeHugger Robot2019-05-301-22/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Removing an extraneous testMax Bires2019-05-221-22/+0
| * | | | Expanding VTS test coverageMax Bires2019-04-085-10/+399
* | | | | Merge "listByInterface -> listManifestByInterface" am: 877c7f5ce1Steven Moreland2019-05-161-4/+4
|\ \ \ \ \
| * \ \ \ \ Merge "listByInterface -> listManifestByInterface"Steven Moreland2019-05-161-4/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "listByInterface -> listManifestByInterface"Treehugger Robot2019-05-161-4/+4
| | |\ \ \ \
| | | * | | | listByInterface -> listManifestByInterfaceSteven Moreland2019-05-131-4/+4
* | | | | | | Merge "Allow INVALID_INPUT_LENGTH for oversized messages" am: b397fc8e88Matthew Maurer2019-05-161-2/+4
|\| | | | | |
| * | | | | | Merge "Allow INVALID_INPUT_LENGTH for oversized messages"Matthew Maurer2019-05-161-2/+4
| |\| | | | |
| | * | | | | Merge "Allow INVALID_INPUT_LENGTH for oversized messages"Matthew Maurer2019-05-161-2/+4
| | |\ \ \ \ \
| | | * | | | | Allow INVALID_INPUT_LENGTH for oversized messagesMatthew Maurer2019-05-131-2/+4
* | | | | | | | Merge "Use SHA_2_256 for importWrappedKey" am: 0ce3156f97Matthew Maurer2019-05-161-26/+34
|\| | | | | | |
| * | | | | | | Merge "Use SHA_2_256 for importWrappedKey"Matthew Maurer2019-05-161-26/+34
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge "Use SHA_2_256 for importWrappedKey"Matthew Maurer2019-05-161-26/+34
| | |\ \ \ \ \
| | | * | | | | Use SHA_2_256 for importWrappedKeyMatthew Maurer2019-05-101-26/+34
| | | |/ / / /
| * | | | | | DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-ma...Xin Li2019-05-131-0/+27
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
* | | | | | | Verify mac change on time stamp change am: 33d75d090bJanis Danisevskis2019-05-091-0/+59
|\| | | | | |
| * | | | | | Verify mac change on time stamp changeJanis Danisevskis2019-05-091-0/+59
| | |_|/ / / | |/| | | |
| * | | | | Keymaster support: Verbose vendor errorsandroid-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseJanis Danisevskis2019-05-032-0/+19
| | |/ / / | |/| | |
* | | | | Merge "Make test expectation match comment" into qt-devGarret Kelly2019-05-031-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Make test expectation match commentGarret Kelly2019-05-011-1/+1
* | | | | Merge "Fix comparison between hex and binary values" into qt-devGarret Kelly2019-04-261-1/+1
|\| | | |
| * | | | Fix comparison between hex and binary valuesGarret Kelly2019-04-241-1/+1
* | | | | Correct IKeymasterDevice documentation. am: 744a37115aShawn Willden2019-04-231-9/+7
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Correct IKeymasterDevice documentation.Shawn Willden2019-04-191-9/+7
* | | | | Merge "Update hidl makefiles for bpfmt" am: ff0bd741caSteven Moreland2019-04-181-1/+0
|\| | | | | |/ / / |/| | |