summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-06-18Merge "Revert^2 "keymaster: add 'x' to format string to cause printing"" ↵HEADmastermainTreehugger Robot
into main
2024-06-18Revert^2 "keymaster: add 'x' to format string to cause printing"Mike McTernan
This reverts commit 67d7120257e5f811595b45fc53d1c0a11a51aa7c. Reason for revert: Unlikely culprit for a build infra failure. Change-Id: I718dcae2575285c06689288b61b54d897a1f0887
2024-06-18Merge "Revert "keymaster: add 'x' to format string to cause printing"" into mainPODISHETTY KUMAR
2024-06-18Revert "keymaster: add 'x' to format string to cause printing"PODISHETTY KUMAR
This reverts commit abf0def0e8ed49a86abbbb932c7c55e4b45a8baa. Reason for revert: <Dorid monitor: Likely culprit for b/347867420 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.> Change-Id: Ic549c78ddc821e7e6a60b361a093825e7c15a8c3
2024-06-18Merge "keymaster: add 'x' to format string to cause printing" into mainTreehugger Robot
2024-06-17keymaster: add 'x' to format string to cause printingMike McTernan
Add extended 'x' qualifier to indicate that the patch value should be printed in Trusty builds. Bug: 347666817 Test: tested on device by forcing log point to log Change-Id: I10ff5642ce387c1ce0ef21ba6a5fd125ab32d38f
2024-06-12Avoid test abort if fuzzer finds valid inputs to importKey API. am: a0c4066427Rajesh Nyamagoud
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/3126934 Change-Id: Ic307101ac1ce25100d70fc53be21de16faf387b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-11Avoid test abort if fuzzer finds valid inputs to importKey API.Rajesh Nyamagoud
Bug: 316115727 Test: k4_AndroidKeymaster4Device_fuzzer Change-Id: I46e3200b8e19ee30836e540757fe304e6e996f98
2024-05-24Merge "Drop configuration fuzzer" into main am: 522862925cDavid Drysdale
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/3097298 Change-Id: Ibb94608846bdcef83bff34df1c79674a510ebf5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24Merge "Drop configuration fuzzer" into mainDavid Drysdale
2024-05-22android_keymaster.cpp: Fix compiler warning am: 536357d615Alan Rosenthal
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/3097437 Change-Id: Ia613e08133bf95474302e3d7b9ac97c9c4ff149d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22android_keymaster.cpp: Fix compiler warningAlan Rosenthal
``` warning: format specifies type 'int' but the argument has type 'KmVersion' ``` Test: presubmit passes Change-Id: I4174d92757e613a73a0c3986e1bb2af747950a16
2024-05-22Drop configuration fuzzerDavid Drysdale
An attacker would have to be able to replace the values of ro. system properties to reach the code that this fuzzer exercises. Test: TreeHugger Bug: 306713158 Bug: 258884617 Change-Id: I57d774c7c2511505a184474c29bf99f0e51d1c6d
2024-05-10Merge "Allow type conversion from KmVersion to int" into main am: d0774658d4Aditya Kumar
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2841834 Change-Id: If62ba231c91b5b8f028519c8d1861705e9befbc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-10Merge "Allow type conversion from KmVersion to int" into mainAditya Kumar
2024-04-29Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-futureXin Li
Bug: 337098550 Merged-In: I8eda4b0eeb5b8ec5126e29c7b8860946ad7e5d98 Change-Id: I7d73a93a7f58be5602272fce631d6eef7b3473a2
2024-04-22Support 64-bit certificate times am: 4a62b1c3b2Andrei Homescu
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/3047942 Change-Id: I8eda4b0eeb5b8ec5126e29c7b8860946ad7e5d98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19Support 64-bit certificate timesAndrei Homescu
The KeyMint VTS tests send some 64-bit before/after time values. Switch from time_t to int64_t to fix test breakage on 32-bit Trusty builds. Bug: 334992641 Test: qemu-generic-arm64u32-test-debug: \ VtsAidlKeyMintTargetTest \ --gtest_filter="*WithSpecified*" Change-Id: I6e7c3e13102d3720394f595cba3630aae976e2de
2024-03-29Remove unnecessary "_external" suffix from libcppbor am: 65b109b10dShawn Willden
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/3019945 Change-Id: I14b54cac8056ca73ef968a53d6c925d229ef42c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-28Remove unnecessary "_external" suffix from libcppborShawn Willden
Test: Build Change-Id: I490572164cdab623782f58bfb054e47ac94fe12c
2024-02-13Allow type conversion from KmVersion to intAdityaK
To get around the compiler error error: format specifies type int but the argument has type KmVersion Bug: b/312565119 Change-Id: I09a8db25dff7d7b524a08d2665f047be986d0d24
2024-02-13Merge "Replace basic_string_view<uint8_t> with std::span" into main am: ↵Ryan Prichard
06c5483c92 am: 1de0f0905e Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2959242 Change-Id: Ic789853c1049922d8b49a7d6e4e1e7418e362f82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13Merge "Replace basic_string_view<uint8_t> with std::span" into main am: ↵Ryan Prichard
06c5483c92 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2959242 Change-Id: Iabe6cfc538b9219807d0ea9000ecdc558881296f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13Merge "Replace basic_string_view<uint8_t> with std::span" into mainRyan Prichard
2024-02-13Migrate Test Targets to New Android Ownership Model am: efa69932ed am: ↵Aditya Choudhary
fe1f69ca49 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2946548 Change-Id: I4e19a84b02e9706557b37cbbdc23caf9348b0c50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-13Migrate Test Targets to New Android Ownership Model am: efa69932edAditya Choudhary
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2946548 Change-Id: If9e36bdfb5cab633a63983d81e80f1fda868f2f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-12Replace basic_string_view<uint8_t> with std::spanRyan Prichard
In newer versions of libc++, std::char_traits<T> is no longer defined for non-character types, and a result, std::basic_string_view<uint8_t> is also no longer defined. See https://discourse.llvm.org/t/deprecating-std-string-t-for-non-character-t/66779. Bug: 175635923 Test: m MODULES-IN-system-keymaster Change-Id: Iad46abe378c2a1201b769601cd743cebb497d036
2024-02-02Migrate Test Targets to New Android Ownership ModelAditya Choudhary
This CL is created as a best effort to migrate test targets to the new Android ownership model. It is based on historical data from repository history and insights from git blame. Given the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary attribution in this CL, please create a new CL to fix that. For detailed guidelines and further information on the migration please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: I72722c21119c5167a4b9930ab7849f25d97ef23f
2023-12-05Fix C++20 build am: 693745f801 am: 244ee0642c am: c5278f0a76Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2858029 Change-Id: I8f6b2059b101b881c8ae1a46c8d2faca14d22256 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Fix C++20 build am: 693745f801 am: 813b3f8eb4 am: 9baff9c12eTomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2858029 Change-Id: I255382c4fe3923e9059ddf5cd2154ac0944b50dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Fix C++20 build am: 693745f801 am: 244ee0642cTomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2858029 Change-Id: I5b5ee26fa2c6cb14a781ac16b96302c2ddb1b976 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Fix C++20 build am: 693745f801 am: 813b3f8eb4Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2858029 Change-Id: Ib420511567dfd762f2e3ccd6c5caf63721804dd4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Fix C++20 build am: 693745f801Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2858029 Change-Id: I0f03b31b16e1210a0f0cfd269d62ae6e14570141 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Fix C++20 build am: 693745f801Tomasz Wasilczyk
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2858029 Change-Id: I4c04bdd4dc85dda1f87da5405ecc859246c07c8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Fix C++20 buildTomasz Wasilczyk
The warning/error here was about using bitwise operator on incompatible enum values. Bug: 311052584 Test: trusty/vendor/google/aosp/scripts/build.py generic-arm64-test-debug Change-Id: I5de60907ebb22bcc6d02b09ca9ce1151cfc0b9f5
2023-10-07[automerger skipped] Merge Android 14 am: 0b267890b7 -s ours am: 49e25a42b6 ↵Xin Li
-s ours am: fef7dc670a -s ours am: aaa7cd0c47 -s ours am: 587210b400 -s ours am skip reason: Merged-In Ie85684084c9820814ba4bfb9e3a46e297f6f3e3a with SHA-1 77ec0e4279 is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2775064 Change-Id: Icf28b851a07564c239b0d51d9d9b929e770f2102 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0b267890b7 -s ours am: 49e25a42b6 ↵Xin Li
-s ours am: fef7dc670a -s ours am: aaa7cd0c47 -s ours am skip reason: Merged-In Ie85684084c9820814ba4bfb9e3a46e297f6f3e3a with SHA-1 77ec0e4279 is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2775064 Change-Id: I9766eb2d49e5dea71cdafc6634bb2d341a133295 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0b267890b7 -s ours am: 49e25a42b6 ↵Xin Li
-s ours am: fef7dc670a -s ours am skip reason: Merged-In Ie85684084c9820814ba4bfb9e3a46e297f6f3e3a with SHA-1 77ec0e4279 is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2775064 Change-Id: Ia155a3e29b9e14f73fe111386df4bad69e0303c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0b267890b7 -s ours am: 49e25a42b6 ↵Xin Li
-s ours am skip reason: Merged-In Ie85684084c9820814ba4bfb9e3a46e297f6f3e3a with SHA-1 77ec0e4279 is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2775064 Change-Id: Iaeff1ada030a85c1d88039d09dbd479b72d9dc5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 0b267890b7 -s oursXin Li
am skip reason: Merged-In Ie85684084c9820814ba4bfb9e3a46e297f6f3e3a with SHA-1 77ec0e4279 is already in history Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2775064 Change-Id: Ic6e62d96c570cd661d06fcac4147025bc4f4be80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: Ie85684084c9820814ba4bfb9e3a46e297f6f3e3a Change-Id: I944e2992d52bc969a43c5eb8afae6678fcccc383
2023-09-13Fix asymmetric secure key import am: 77ec0e4279 am: fd8e66c99d am: ↵Tri Vo
da32162373 am: 324f63e6a7 am: bda4023993 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2748557 Change-Id: I8dc2b8cb00e07f7c977622c239f3cf7ee96345e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Fix asymmetric secure key import am: 77ec0e4279 am: fd8e66c99d am: ↵Tri Vo
da32162373 am: 324f63e6a7 Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2748557 Change-Id: I7d1ef54b76ca91ec8ee9970686f6e41c220d5a3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Fix asymmetric secure key import am: 77ec0e4279 am: fd8e66c99d am: da32162373Tri Vo
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2748557 Change-Id: I58c4531bc796915ea214ac100b82c4421f6a019d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Fix asymmetric secure key import am: 77ec0e4279 am: fd8e66c99dTri Vo
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2748557 Change-Id: I88f2e9c25efb8814154ca2272a7fd2c56a65f916 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Fix asymmetric secure key import am: 77ec0e4279tmp_amf_298295554Tri Vo
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2748557 Change-Id: Ia1ea2078755198d5a916113a11196df40ac63e9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12Fix asymmetric secure key importTri Vo
Bug: 292534977 Test: atest android.keystore.cts.ImportWrappedKeyTest Change-Id: Ie85684084c9820814ba4bfb9e3a46e297f6f3e3a
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: c06ff74734 -s ours ↵Xin Li
am: 69f84ddd4e -s ours am: 103bcc1511 -s ours am: 3f755e541f -s ours am skip reason: Merged-In Ia6eb37d86814b7500975fb147344ce5c2ad92dc7 with SHA-1 25ddf50eeb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/24182892 Change-Id: I5875584882445911e43cecab22e603c188f4575d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: c06ff74734 -s ours ↵Xin Li
am: 69f84ddd4e -s ours am: 103bcc1511 -s ours am skip reason: Merged-In Ia6eb37d86814b7500975fb147344ce5c2ad92dc7 with SHA-1 25ddf50eeb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/24182892 Change-Id: Ib36ec2f74f29accdbeaae5d37ed22439e363a0bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: c06ff74734 -s ours ↵Xin Li
am: 69f84ddd4e -s ours am skip reason: Merged-In Ia6eb37d86814b7500975fb147344ce5c2ad92dc7 with SHA-1 25ddf50eeb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/24182892 Change-Id: I1482bbebb69d544dece49be243fde6239c72c1a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 13:15:27 +0000