aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-21Add input validation for 'parseRecursively' method.android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Hasini Gunasinghe
Bug: 192743373 Test: To be verified with fuzzer test case. Merged-In: If052fcb2b2bbc5e0bfc8cfccc51cef11b9914017 Change-Id: I0b553d58863aaa85004a7bc576fb524df31af44a
2021-10-08[automerger skipped] Merge Android 12 am: 808b94ded1 -s ours am: 81552a0a16 ↵Xin Li
-s ours am: a1b9cc16db -s ours am skip reason: Merged-In I924b3ddd6fd350227c02d9a15857de5102311a32 with SHA-1 3d50375056 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1847436 Change-Id: Id3d0415a8f4d3eacb9e4f2a65758fa13c34aa916
2021-10-08[automerger skipped] Merge Android 12 am: 808b94ded1 -s ours am: 81552a0a16 ↵Xin Li
-s ours am skip reason: Merged-In I924b3ddd6fd350227c02d9a15857de5102311a32 with SHA-1 3d50375056 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1847436 Change-Id: Ie8842b5695565100b8ae992672a63ee5689e5467
2021-10-08[automerger skipped] Merge Android 12 am: 808b94ded1 -s oursXin Li
am skip reason: Merged-In I924b3ddd6fd350227c02d9a15857de5102311a32 with SHA-1 3d50375056 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1847436 Change-Id: I9c4068309bd2e3825f7125146cbbcdbe212b5aaf
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I924b3ddd6fd350227c02d9a15857de5102311a32 Change-Id: I4da905f9e98fe1fe675a24a859939a9fcdcdde73
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
3d50375056 -s ours am: 3a4281c96e -s ours am skip reason: Merged-In Ia7a8b4e355aa9086135422fd1e45996ab1731108 with SHA-1 d7ace4469d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15571663 Change-Id: I177beffffd68046ae63d815f7d0938e7bd6dfeee
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
3d50375056 -s ours am skip reason: Merged-In Ia7a8b4e355aa9086135422fd1e45996ab1731108 with SHA-1 d7ace4469d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15571663 Change-Id: I8f90e9485dd89c62154f3c6e1acbbfbf1e54b606
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: Ia7a8b4e355aa9086135422fd1e45996ab1731108 Change-Id: I924b3ddd6fd350227c02d9a15857de5102311a32
2021-07-09Don't allow implicit conversion to Array am: b0c9795e04 am: 1b23995a6bSeth Moore
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1753047 Change-Id: Ia7a8b4e355aa9086135422fd1e45996ab1731108
2021-07-09Don't allow implicit conversion to Array am: b0c9795e04Seth Moore
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1753047 Change-Id: I3b772f0a5e1d8c2ece190bcc6bc2bf41f499f99f
2021-06-30Don't allow implicit conversion to Arrayandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Seth Moore
The variadic Array constructor would implicitly make an Array object from a single input that is convertable to an Item. This leads to surprising behaviors wherein Arrays could be created unintentionally. Fix this by making the variadic constructor only work for more than one argument. Add an additional, single-item constructor that is explicit. Bug: 191778240 Test: cppbor_host_test_external Change-Id: Ifadc6d3137ee285a81076a4125b6053f1d7c21c4
2021-06-30Check for integer overflow in cppbor::parseRecursively. am: 4907264bdcShawn Willden
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libcppbor/+/15110385 Change-Id: Ice7fdf01bd8dfd21188cb2f0385b5bba1b6c4a00
2021-06-25Check for integer overflow in cppbor::parseRecursively.android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devShawn Willden
Bug: 191303307 Test: Fuzzer from bug Change-Id: I98830ec1bd77f152266f35a585d286be13a2551b
2021-06-03Add libcppcbor to library build system am: 10ca06966b am: 7d548df919Stephen Crane
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1536784 Change-Id: Ia29cabef2cbfd9320e596e9ab4c55515294e5c0e
2021-06-03Add libcppcbor to library build system am: 10ca06966bStephen Crane
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1536784 Change-Id: I8003ef670f9ec658392ffeb4496df7aaae7cf15d
2021-04-27Add libcppcbor to library build systemStephen Crane
Switch to building libcppcbor with the library.mk system instead of as a generic lk module. Test: build.py qemu-generic-arm64-test-debug Change-Id: I04b91b6c18480bdc9018be18aebaf9b40bdefedf
2021-04-21Merge "Remove CONTRIBUTING.md" am: 8f773c2103 am: 850761c661 am: ebb61a2708Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1670288 Change-Id: I501f267ae724235023bae64ea7936f1dcdf1e901
2021-04-21Merge "Remove CONTRIBUTING.md" am: 8f773c2103 am: 850761c661Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1670288 Change-Id: I187374c138a0124ffd5efac3ad3dd558136bab66
2021-04-21Merge "Remove CONTRIBUTING.md" am: 8f773c2103Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1670288 Change-Id: I3e6410ec4e3dfddf1c8d00241c175ad6307f39df
2021-04-21Merge "Remove CONTRIBUTING.md"android-s-beta-2android-s-beta-1Treehugger Robot
2021-04-15Fix integer cast in handleNint am: a7ca25a181 am: 33060560da am: 02e6c572b9Andrei Homescu
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1663840 Change-Id: I10b3f39467e855be7fcdf0be9a1006962a2580bf
2021-04-15Fix integer cast in handleNint am: a7ca25a181 am: 33060560daAndrei Homescu
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1663840 Change-Id: I393f03676542a63b9d0cb3d34b85ad5dc0b60e3d
2021-04-15Fix integer cast in handleNint am: a7ca25a181Andrei Homescu
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1663840 Change-Id: I8e27a73ec953c0db8a44fbff11c5dc81b26e11b0
2021-04-09Fix integer cast in handleNintAndrei Homescu
This fixes an incorrect integer cast in the handleNint function in cppbor_parse.cpp which would trigger UBSAN failures in the Trusty apploader. Change-Id: Id35865e524c9837d907fe352feac783b3f7f36b0
2021-04-09Make const overloads available in sub-classes. am: f3e77b2781 am: 05f22c3841 ↵Max Bires
am: 079f406f9f Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1670287 Change-Id: I63f44e5294f2a799d12a9aa2ee6120f6361864f6
2021-04-08Make const overloads available in sub-classes. am: f3e77b2781 am: 05f22c3841Max Bires
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1670287 Change-Id: I331cd866b2abb1b9cbe3021d40be5a798691c2d7
2021-04-08Make const overloads available in sub-classes. am: f3e77b2781Max Bires
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1670287 Change-Id: I817c04110708942a2977487603f852f949160529
2021-04-08Remove CONTRIBUTING.mdMax Bires
AOSP is the upstream source for this library. Test: Purple is a good color for a bike shed. Change-Id: I6be4c7ec47b15cc5fbed8091555613ef22623c28
2021-04-08Make const overloads available in sub-classes.Max Bires
Due to the overloading behavior in sub-classes, access to the methods returning const types in Item were not accessible from the Item subclasses. This change adds the using statements necessary to fix that. Test: cd hardware/interfaces/identity && mm -j48 Change-Id: I40bff6470c5fecfb308fec527540a8fbf1abf91a
2021-04-01Error on unknown simple value am: bdc577b46b am: 07613905aa am: 09e3750c14Andrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1658065 Change-Id: Ifad4b06d9fa793eb17df193ec39497a1f9ccad30
2021-04-01Reject reserved values and indefinite lengths am: 42a7aa8fbf am: f816fae5dd ↵Andrew Scull
am: 57bba0cf18 Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1658064 Change-Id: I5433de3cbb5e69797f3f768c0a7436dbb66c0c79
2021-04-01Error on unknown simple value am: bdc577b46b am: 07613905aaAndrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1658065 Change-Id: Ib0c56ae07f6d6958df227d8978f7eee1aa6a6cbf
2021-04-01Reject reserved values and indefinite lengths am: 42a7aa8fbf am: f816fae5ddAndrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1658064 Change-Id: I4992142bb192776d9cacf5617084470b47c37ddd
2021-04-01Error on unknown simple value am: bdc577b46bAndrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1658065 Change-Id: I382cf2f91896465db2fbdc67e7d6afb4ee51bf61
2021-04-01Reject reserved values and indefinite lengths am: 42a7aa8fbfAndrew Scull
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1658064 Change-Id: I643cd7fc1fa0f5e7430adabc73b7a2536d14bf0f
2021-03-30Error on unknown simple valueAndrew Scull
Null, true and false are handled but any other simple value, or floating pointer value, would otherwise reach the CHECK() that was expected to be unreachable. Instead, error when an unhandled value is seen. Test: cppbor_host_test_external Change-Id: Idb1099bbc51649e5eb8f5fb4fa60553e8cbe7e8f
2021-03-30Reject reserved values and indefinite lengthsAndrew Scull
RFC 8949 defines additional information values 28, 29, 30 and 31 as either reserved or indicating indefinite length values. Reject all of these. Test: cppbor_host_test_external Change-Id: Ic9ae7630c8f75d060e4199d375c1f696699a4f66
2021-03-25Add view items for zero-copy parsing of CBOR strings am: 4d171a791a am: ↵Andrei Homescu
decff6ea66 am: 7da24633c1 Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1588192 Change-Id: I95db2120fe0bc1c98b27a914bbe1193d6062d775
2021-03-25Add view items for zero-copy parsing of CBOR strings am: 4d171a791a am: ↵Andrei Homescu
decff6ea66 Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1588192 Change-Id: I86db18f07d7f04acc13f87d75006fc7558f8a544
2021-03-25Add view items for zero-copy parsing of CBOR strings am: 4d171a791aAndrei Homescu
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1588192 Change-Id: I97ebf04460b75af783b1759a8e5816bc198cf321
2021-03-11Add view items for zero-copy parsing of CBOR stringsAndrei Homescu
This CL adds two new ViewTstr and ViewBstr Item types that hold strings as string_view and basic_string_view<uint8_t> types instead of std::string or std::vector<uint8_t>, respectively. This allows for zero-copy parsing of CBOR (mainly strings), which is useful in low-memory environments like the apploader where CBOR data can contain large bstr values. Bug: 115420908 Test: cppbor_host_test_external Change-Id: I69322f0de258e3583cbd842ce240398504a1973f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ad80fb83f5 -s ↵Xin Li
ours am: 2fd1541001 -s ours am skip reason: Change-Id Iaa423f28a08a8b8619ceff179b69b7d102a596ce with SHA-1 c285326084 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I19b81335d4263ca4d5ced139f51afd61c8327df5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ad80fb83f5 -s oursXin Li
am skip reason: Change-Id Iaa423f28a08a8b8619ceff179b69b7d102a596ce with SHA-1 c285326084 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8ea3da8ba7194bb4e8391b9542a1f3b02d094478
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Iaa423f28a08a8b8619ceff179b69b7d102a596ce Change-Id: I6a852dd1175a92e556ba415cf48822ae6ab607eb
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libcppbor am: 382930dc90 am: ↵Bob Badour
eb3be5a339 am: d9c666acbe Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1588871 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I57406a64386c65991f502bbcf44821e375b0c363
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libcppbor am: 382930dc90 am: ↵Bob Badour
eb3be5a339 Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1588871 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I715eebf247da2adadd0e0055e08c042012bdafd9
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/libcppbor am: 382930dc90Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1588871 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I68b59e51881ce2565f9791ee5d9ce6ab845704fc
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libcppborandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iaf70ec58fa73969cf9d7baeac57f56d745475e40
2020-12-16Change semantic tagging. am: 315d859ec4 am: 01589c6c88 am: c285326084Shawn Willden
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1515385 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d7b8d5850ea9d48126643d7e1a77344f859e6e1
2020-12-16Change semantic tagging. am: 315d859ec4 am: 01589c6c88Shawn Willden
Original change: https://android-review.googlesource.com/c/platform/external/libcppbor/+/1515385 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaa423f28a08a8b8619ceff179b69b7d102a596ce
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 23:18:07 +0000