summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bpfmt.Elliott Hughes2018-02-161-1/+4
* Merge "add null pointer check for msg buffer"Yan, Shaopu2017-11-281-0/+5
|\
| * add null pointer check for msg bufferYan, Shaopu2017-11-281-0/+5
* | Merge commit 'a63ccea6abc7ea02e2d98e41c80793ca97237bd3' fromXin Li2017-11-141-0/+3
|\ \ | |/ |/|
| * Merge "Keymaster: Move test to std::unique_ptr" am: 81348ffa9e am: 346d7e1405Andreas Gampe2017-10-021-15/+15
| |\
| | * Merge "Keymaster: Move test to std::unique_ptr"Andreas Gampe2017-10-021-15/+15
| | |\
| * | | Merge "Add missing include for readv." am: 1f6a807bac am: 831140358dChristopher Ferris2017-08-261-0/+1
| |\| |
| | * | Merge "Add missing include for readv."Christopher Ferris2017-08-261-0/+1
| | |\ \
| * | \ \ Merge "Move trusty reference implementations to /vendor" into oc-mr1-devHung-ying Tyan2017-08-221-0/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Move trusty reference implementations to /vendorHung-ying Tyan2017-08-211-0/+3
| | * | | Revert "Move trusty reference implementations to /vendor"Hung-ying Tyan2017-08-111-2/+0
| | * | | Move trusty reference implementations to /vendorHung-ying Tyan2017-08-091-0/+2
| * | | | Merge "Pass in message_version_ received from the secure side." am: 1a955faab...Jocelyn Bohr2017-08-151-18/+18
| |\ \ \ \
| * \ \ \ \ Merge "Enable non-secure side to receive messages > 4K" am: 28fa8b0924 am: 92...Jocelyn Bohr2017-08-113-26/+43
| |\ \ \ \ \
| * \ \ \ \ \ Merge "Return correct error code when finish input length is too long." am: 9...Jocelyn Bohr2017-08-031-1/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "system/core: use proper nativehelper headers" am: 4f59afe9fa am: 6208c...Steven Moreland2017-07-191-1/+1
| |\ \ \ \ \ \
| * | | | | | | trusty*: Android.mk -> Android.bpSteven Moreland2017-05-082-69/+68
| * | | | | | | Rename libkeymaster to libkeymaster_stagingJanis Danisevskis2017-05-041-1/+1
| * | | | | | | libkeymaster1 splitJanis Danisevskis2017-05-031-1/+2
| * | | | | | | Revert "libkeymaster1 split"Janis Danisevskis2017-05-021-2/+1
| * | | | | | | libkeymaster1 splitJanis Danisevskis2017-05-011-1/+2
* | | | | | | | Use -Werror in system/coreChih-Hung Hsieh2017-11-012-1/+1
* | | | | | | | Add missing includes.Dan Albert2017-10-171-0/+1
* | | | | | | | libkeymaster1 splitJanis Danisevskis2017-10-131-1/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Keymaster: Move test to std::unique_ptrAndreas Gampe2017-10-021-15/+15
| |_|_|_|_|/ |/| | | | |
* | | | | | Add missing include for readv.Christopher Ferris2017-08-251-0/+1
| |_|_|_|/ |/| | | |
* | | | | Merge "Pass in message_version_ received from the secure side."Treehugger Robot2017-08-151-18/+18
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Pass in message_version_ received from the secure side.Jocelyn Bohr2017-08-111-18/+18
| | |_|/ | |/| |
* | | | Merge "Enable non-secure side to receive messages > 4K"Treehugger Robot2017-08-113-26/+43
|\ \ \ \ | |/ / / |/| | |
| * | | Enable non-secure side to receive messages > 4KJocelyn Bohr2017-08-103-26/+43
| | |/ | |/|
* / | Return correct error code when finish input length is too long.Jocelyn Bohr2017-08-031-1/+3
|/ /
* | system/core: use proper nativehelper headersSteven Moreland2017-07-181-1/+1
* | trusty*: Android.mk -> Android.bpSteven Moreland2017-05-082-68/+67
|/
* trusty: keymaster: update device tests to use 2.0 APIJocelyn Bohr2017-04-102-98/+133
* trusty: keymaster: Implement abortJocelyn Bohr2017-04-101-1/+9
* trusty: keymaster: Implement finishJocelyn Bohr2017-04-101-0/+51
* trusty: keymaster: Implement updateJocelyn Bohr2017-04-101-0/+52
* trusty: keymaster: Implement beginJocelyn Bohr2017-04-101-0/+35
* trusty: keymaster: Implement upgrade_keyJocelyn Bohr2017-04-102-0/+29
* trusty: keymaster: Implement attest_keyJocelyn Bohr2017-04-102-0/+59
* trusty: keymaster: Implement export_keyJocelyn Bohr2017-04-101-0/+31
* trusty: keymaster: Implement import_keyJocelyn Bohr2017-04-101-0/+36
* trusty: keymaster: Implement get_key_characteristicsJocelyn Bohr2017-04-101-0/+36
* trusty: keymaster: Implement generate_keyJocelyn Bohr2017-04-101-0/+47
* trusty: keymaster: Implement add_rng_entropyJocelyn Bohr2017-04-101-1/+9
* trusty: keymaster: Implement configureJocelyn Bohr2017-04-104-4/+27
* trusty: keymaster: Begin update from Keymaster 0.3 to 2.0Jocelyn Bohr2017-04-106-458/+337
* liblog: use log/log.h when utilizing ALOG macrosMark Salyzyn2017-01-112-2/+2
* system/core: preparation to pull back interfaces from android/log.hMark Salyzyn2016-10-201-0/+1
* system/core Replace cutils/log.h with android/log.hMark Salyzyn2016-09-302-11/+9