summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't check token for NO_AUTH_REQUIREDstaging/lineage-17.0_merge-android-10.0.0_r9lineage-17.1Matthew Maurer2019-12-141-1/+9
| | | | | | | | | | IF NO_AUTH_REQUIRED or AUTH_TIMEOUT is specified, we don't need to check the auth token. We began checking the auth token even in those cases when the TRUSTED_CONFIRMATION_REQUIRED tag was introduced because the TRUSTED_CONFIRMATION_REQUIRED tag must still be checked in those cases. Bug: 129569848 Change-Id: I7b1fe55527f344759480330c2bb6f0a75ef15cfc
* Merge "Many operations could have been const" am: 98bbd5fe31 am: 63341ee42eMatthew Maurer2019-04-0314-25/+26
|\ | | | | | | | | | | am: b3d5d38029 Change-Id: I29e37250a76875927d1c2ce35bb13c6eed214137
| * Merge "Many operations could have been const" am: 98bbd5fe31Matthew Maurer2019-04-0314-25/+26
| |\ | | | | | | | | | | | | | | | am: 63341ee42e Change-Id: I7ce4f3416ed4c2cb0ed1aba9ae7d2b2b539def2d
| | * Merge "Many operations could have been const"Matthew Maurer2019-04-0314-25/+26
| | |\ | | | | | | | | | | | | | | | | | | | | am: 98bbd5fe31 Change-Id: Ia5eadbe56fc319a539e0c6d1f349a0f302f78b0b
| | | * Merge "Many operations could have been const"Matthew Maurer2019-04-0314-25/+26
| | | |\
| | | | * Many operations could have been constMatthew Maurer2019-04-0214-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only tested by building because the only change is to annotate with consts. Change-Id: Ie353e9050b5ee3261fb6420a7f6ee12543d2bc79 Test: build
* | | | | Enforce TRUSTED_CONFIRMATION_REQUIRED am: b2a4f0b195 am: d1091e1d50Matthew Maurer2019-04-035-5/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 73c7ed6a6f Change-Id: Ib4604745b12b9a9275c6aa198e5be00e2b0c9c31
| * | | | Enforce TRUSTED_CONFIRMATION_REQUIRED am: b2a4f0b195Matthew Maurer2019-04-035-5/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d1091e1d50 Change-Id: Icef070ae345b858d8086730153ca1f02c9b85ab2
| | * | | Enforce TRUSTED_CONFIRMATION_REQUIREDMatthew Maurer2019-04-035-5/+29
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: b2a4f0b195 Change-Id: Iaa757b04f02645c5eba96745e17b97e76fe89eff
| | | * | Enforce TRUSTED_CONFIRMATION_REQUIREDMatthew Maurer2019-03-255-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now we just automatically fail because we have no MAC to validate. In the future, this is where we will check the MAC from the trusted confirmation service. Bug: 128851722 Test: Keymaster VTS 4.0 + Trusty Change-Id: Ib0fb608d0bb0340c937b4e2dc5e902cd6339ee79
* | | | | Fix ImportWrappedKeyRequest Serialization am: 4516ca7cc0 am: d33899190fMatthew Maurer2019-03-291-4/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 135c773309 Change-Id: Ib31a55dd5fab5299a9d4f750a7856133d23d41d0
| * | | | Fix ImportWrappedKeyRequest Serialization am: 4516ca7cc0Matthew Maurer2019-03-291-4/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d33899190f Change-Id: Ibf892bfd9ffbe50f513a6a2560bdaf14828a311f
| | * | | Fix ImportWrappedKeyRequest SerializationMatthew Maurer2019-03-291-4/+5
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4516ca7cc0 Change-Id: I13920ecf0b7903d8ccd7fd208019ed2d5cb250c9
| | | * | Fix ImportWrappedKeyRequest SerializationMatthew Maurer2019-03-181-4/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SerializedSize is missing the biometric_sid and password_sid fields, and Serialize forgets to update the buffer pointer after each append. Bug: 128851694 Test: VTS 4.0 against Trusty implementation Change-Id: Ie4d3eb918c1d0344c7eaed2087050f446cc892f1
* | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: 0bd1ca7706 Change-Id: I9bcbb81e1bc016e36fceda624535801b92cb576b
| * | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | | | | | | | | | | | | | | | | | Bug: 126125118 Change-Id: I63c3541cb55665b33428703cc9b21a638560f43b
| | * | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: Ia538a9c28796f1fb28c29721976140b81059b730
* | | | | Fix issue where hiding copy constructor deletes move constructor. am: ↵Nick Bray2019-02-072-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b12e5e65b am: 996578be59 am: 22d67982fd Change-Id: I12431c76e7639a204bffff2b05fc211212b766ac
| * | | | Fix issue where hiding copy constructor deletes move constructor. am: 3b12e5e65bNick Bray2019-02-072-7/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 996578be59 Change-Id: Ic1c7017503466cdb1df0ab77080823232804240f
| | * | | Fix issue where hiding copy constructor deletes move constructor.Nick Bray2019-02-072-7/+7
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | am: 3b12e5e65b Change-Id: Icaa9d8435e9915b8804979ccdeec8eb1dd6337c8
| | | * | Fix issue where hiding copy constructor deletes move constructor.Nick Bray2019-02-072-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hiding the copy constructor for Serializable meant the default move constructor was implicitly deleted. A strict reading of the spec would mean that subclasses should not be able to default their move constructors. This issue was revealed by -Wdefaulted-function-deleted. Bug: 123093254 Change-Id: I3cb4917dd37ae9f72d673993c9249e29c36f40e6
* | | | | Explicitly include log/log.h instead of cutils/log.h am: 23e024aec0 am: ↵Sasha Smundak2019-01-312-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b82103552 am: a6c5f426fd Change-Id: Ia3621a5ed5cf9b6a9c1c094fabef068a97bb28cb
| * | | | Explicitly include log/log.h instead of cutils/log.h am: 23e024aec0Sasha Smundak2019-01-312-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7b82103552 Change-Id: I49577518ba94b2878f161e5d78730950bfabeebe
| | * | | Explicitly include log/log.h instead of cutils/log.hSasha Smundak2019-01-312-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 23e024aec0 Change-Id: I241d50b275052ffd1f0fc79148e887c38ae6ff99
| | | * | Explicitly include log/log.h instead of cutils/log.hSasha Smundak2019-01-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminates the warning. Test: treehugger Change-Id: I81ef6789d7609d5310c3da6a6dcf9b17eca2fa14
* | | | | Merge "Remove extraneous semicolon" am: 5800125e5c am: aa47f72421Pirama Arumuga Nainar2019-01-181-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3deffa0791 Change-Id: I99c716f5dc1f50da228ad9a3e29672d83d13c26a
| * | | | Merge "Remove extraneous semicolon" am: 5800125e5cPirama Arumuga Nainar2019-01-181-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: aa47f72421 Change-Id: Ia3644c9a10263050a02acb4597ff3c4cad3e0597
| | * | | Merge "Remove extraneous semicolon"Pirama Arumuga Nainar2019-01-181-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5800125e5c Change-Id: I1143b3b160cd560251dbc7a954190c49838cdf9b
| | | * | Merge "Remove extraneous semicolon"Treehugger Robot2019-01-181-1/+1
| | | |\ \
| | | | * | Remove extraneous semicolonPirama Arumuga Nainar2019-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/122481018 Upcoming clang update has a warning, -Wextra-semi-stmt, that warns about extra semicolons. Remove extra semi-colon after a switch statement. Test: Build with new Clang. Change-Id: Id15fed5a81103b3139cfdf72b45f06590b0fa182
* | | | | | Fix/suppress system/keymaster google-explicit-constructor warnings am: ↵Chih-Hung Hsieh2019-01-1817-47/+56
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82ac34109e am: 6d8f758626 am: 6e1cc13187 Change-Id: I7ab1f13f5da1a5a8e4b2db8092d102a7602cdeff
| * | | | | Fix/suppress system/keymaster google-explicit-constructor warnings am: ↵Chih-Hung Hsieh2019-01-1817-47/+56
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 82ac34109e am: 6d8f758626 Change-Id: Idbd251d7593bd5010865515bbdb66c34e196347e
| | * | | Fix/suppress system/keymaster google-explicit-constructor warningsChih-Hung Hsieh2019-01-1817-47/+56
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 82ac34109e Change-Id: I28386fe8f5a84a20715281fcd0e3044a514c03ea
| | | * | Fix/suppress system/keymaster google-explicit-constructor warningsChih-Hung Hsieh2019-01-1117-47/+56
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add explicit to conversion constructors/operators * Use NOLINT or NOLINTNEXTLINE to suppress warnings on intended converters * Some source code format changed by clang-format Bug: 28341362 Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,google-explicit-constructor Change-Id: Icd9fbdb0ea7bc5b75015b07d73aaa21ae5ee8be7
* | | | Merge "Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIRED" am: ↵Janis Danisevskis2019-01-081-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b4d64806c am: e7f05c6fb9 am: 1d336a9fcc Change-Id: I915d71124dbbb4d444cd458f7aeb658e1fc336ea
| * | | Merge "Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIRED" am: 2b4d64806cJanis Danisevskis2019-01-081-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: e7f05c6fb9 Change-Id: Id9a3a8ec1462c0a42025757fcb2cfd281d21a416
| | * | Merge "Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIRED"Janis Danisevskis2019-01-081-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | am: 2b4d64806c Change-Id: Id626d4b3be5ec1c13bc7ea4c223f0c912bdb9a3f
| | | * Merge "Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIRED"Treehugger Robot2019-01-091-0/+1
| | | |\
| | | | * Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIREDJanis Danisevskis2018-11-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Test: Build with -O0 Change-Id: I3ac50d6d972a12e7667a4ee933f5d62c26babc94
* | | | | Merge "Align ARM Neon blocks to 16 bytes" am: bf1f16488d am: 1f6ad22ce4Mustafa Yigit Bilgen2018-12-031-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: df0fac0f9c Change-Id: I3ca77f508f5ae8c94053757b1265cd348e51f169
| * | | | Merge "Align ARM Neon blocks to 16 bytes" am: bf1f16488dMustafa Yigit Bilgen2018-12-031-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1f6ad22ce4 Change-Id: Iba1c5752405c174858df45c16bd3760163523444
| | * | | Merge "Align ARM Neon blocks to 16 bytes"Mustafa Yigit Bilgen2018-12-031-1/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: bf1f16488d Change-Id: I530f8be5227b841494f192133afad0d9f6fbc625
| | | * | Merge "Align ARM Neon blocks to 16 bytes"Treehugger Robot2018-12-041-1/+3
| | | |\ \
| | | | * | Align ARM Neon blocks to 16 bytesMustafa Yigit Bilgen2018-11-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When available, OCB algorithms use ARM Neon instructions to efficiently move and manipulate data. However, ARM requires the data used by these instructions to be aligned to 16 bytes. Executing Neon instructions without proper alignment causes an alignment fault - which is fatal. Add aligned keyword and use memalign to force 16 byte alignment where required. Change-Id: I0d972d77d521fd57007771a361910d467a821c2c
* | | | | | Add attestation_utils.cpp to libkeymaster_portable am: 01a9b8b418 am: 2720e0b01aMustafa Yigit Bilgen2018-12-031-4/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f4ccf27317 Change-Id: I671a22143d0e59261a3b1865490d88dbec965dcf
| * | | | | Add attestation_utils.cpp to libkeymaster_portable am: 01a9b8b418Mustafa Yigit Bilgen2018-12-031-4/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2720e0b01a Change-Id: Ic97b8dc4c95bcc8197c145b13643ec6ad1fc7e54
| | * | | | Add attestation_utils.cpp to libkeymaster_portableMustafa Yigit Bilgen2018-12-031-4/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 01a9b8b418 Change-Id: Ic4e562972c658a8a73abb3c8607a10f3cbe3b778
| | | * | | Add attestation_utils.cpp to libkeymaster_portableMustafa Yigit Bilgen2018-12-031-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows calling the OpenSSL-based generate_attestation() function from a TEE implementation that uses the libkeymaster_portable static library. Change-Id: If478029b1aea26a9b206118c6d3930940d705912
* | | | | | Added missing allocation check in attestation_utils.cpp am: ff5d9551d5 am: ↵Janis Danisevskis2018-12-031-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d78de2340e am: 9c4b8e3d01 Change-Id: I0963dbd30c2d48d5c3cc5c54885072cd05bb348f
| * | | | | Added missing allocation check in attestation_utils.cpp am: ff5d9551d5Janis Danisevskis2018-12-031-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d78de2340e Change-Id: Ief7e83b1524923d99dd4f0eb0274dd4c5dd994c3
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-27 18:21:00 +0000