git: 10ff414c14ee - main - Import libcbor at 'contrib/libcbor/'
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 07 Oct 2021 00:26:52 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=10ff414c14eef433d8157f0c17904d740693933b
commit 10ff414c14eef433d8157f0c17904d740693933b
Merge: 293663f4da9e 5b2defbd2a1a
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-10-07 00:26:10 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-10-07 00:26:10 +0000
Import libcbor at 'contrib/libcbor/'
git-subtree-dir: contrib/libcbor
git-subtree-mainline: 293663f4da9e8b8aeb106ce3b73a8ed2aa2a8a90
git-subtree-split: 5b2defbd2a1aa991bd0a2855eef8e15107572747
contrib/libcbor/.clang-format | 151 ++
contrib/libcbor/.github/workflows/fuzz.yml | 23 +
contrib/libcbor/.gitignore | 8 +
contrib/libcbor/.travis.yml | 66 +
contrib/libcbor/CHANGELOG.md | 109 +
contrib/libcbor/CMakeLists.txt | 159 ++
contrib/libcbor/CMakeModules/FindCJSON.cmake | 9 +
contrib/libcbor/CMakeModules/FindCMocka.cmake | 49 +
contrib/libcbor/CMakeModules/LibFindMacros.cmake | 120 +
contrib/libcbor/Doxyfile | 2417 ++++++++++++++++++++
contrib/libcbor/LICENSE.md | 21 +
contrib/libcbor/README.md | 122 +
contrib/libcbor/appveyor.yml | 27 +
contrib/libcbor/clang-format.sh | 17 +
contrib/libcbor/codecov.yml | 2 +
contrib/libcbor/doc/Makefile | 180 ++
contrib/libcbor/doc/doxy_frontpage.md | 37 +
contrib/libcbor/doc/make.bat | 242 ++
contrib/libcbor/doc/source/api.rst | 39 +
contrib/libcbor/doc/source/api/decoding.rst | 53 +
contrib/libcbor/doc/source/api/encoding.rst | 23 +
.../doc/source/api/item_reference_counting.rst | 41 +
contrib/libcbor/doc/source/api/item_types.rst | 41 +
contrib/libcbor/doc/source/api/type_0_1.rst | 91 +
contrib/libcbor/doc/source/api/type_2.rst | 66 +
contrib/libcbor/doc/source/api/type_3.rst | 55 +
contrib/libcbor/doc/source/api/type_4.rst | 62 +
contrib/libcbor/doc/source/api/type_5.rst | 44 +
contrib/libcbor/doc/source/api/type_6.rst | 21 +
contrib/libcbor/doc/source/api/type_7.rst | 75 +
contrib/libcbor/doc/source/changelog.rst | 4 +
contrib/libcbor/doc/source/conf.py | 296 +++
contrib/libcbor/doc/source/development.rst | 143 ++
contrib/libcbor/doc/source/getting_started.rst | 190 ++
contrib/libcbor/doc/source/img/win_1.png | Bin 0 -> 29291 bytes
contrib/libcbor/doc/source/img/win_2.png | Bin 0 -> 20179 bytes
contrib/libcbor/doc/source/img/win_3.png | Bin 0 -> 47224 bytes
contrib/libcbor/doc/source/img/win_4.png | Bin 0 -> 11272 bytes
contrib/libcbor/doc/source/img/win_5.png | Bin 0 -> 29490 bytes
contrib/libcbor/doc/source/img/win_6.png | Bin 0 -> 25195 bytes
contrib/libcbor/doc/source/index.rst | 40 +
contrib/libcbor/doc/source/internal.rst | 128 ++
contrib/libcbor/doc/source/requirements.txt | 39 +
contrib/libcbor/doc/source/rfc_conformance.rst | 17 +
contrib/libcbor/doc/source/streaming.rst | 13 +
contrib/libcbor/doc/source/streaming/decoding.rst | 40 +
contrib/libcbor/doc/source/streaming/encoding.rst | 4 +
contrib/libcbor/doc/source/tests.rst | 39 +
contrib/libcbor/doc/source/using.rst | 173 ++
contrib/libcbor/examples/CMakeLists.txt | 25 +
contrib/libcbor/examples/cjson2cbor.c | 145 ++
contrib/libcbor/examples/create_items.c | 33 +
contrib/libcbor/examples/data/floats.cbor | Bin 0 -> 39 bytes
contrib/libcbor/examples/data/indef_string.cbor | 1 +
contrib/libcbor/examples/data/integer.cbor | 1 +
contrib/libcbor/examples/data/json_example.json | 6 +
contrib/libcbor/examples/data/map.cbor | Bin 0 -> 26 bytes
contrib/libcbor/examples/data/nested_array.cbor | 1 +
contrib/libcbor/examples/data/tagged_date.cbor | 1 +
contrib/libcbor/examples/hello.c | 16 +
contrib/libcbor/examples/readfile.c | 78 +
contrib/libcbor/examples/sort.c | 41 +
contrib/libcbor/examples/streaming_parser.c | 58 +
contrib/libcbor/misc/bytes.rb | 3 +
contrib/libcbor/misc/file_to_bytes.rb | 5 +
contrib/libcbor/misc/hooks/pre-commit | 18 +
contrib/libcbor/misc/repeat.rb | 3 +
contrib/libcbor/misc/seq.rb | 3 +
contrib/libcbor/misc/update_version.py | 38 +
contrib/libcbor/oss-fuzz/build.sh | 28 +
contrib/libcbor/oss-fuzz/cbor_load_fuzzer.cc | 37 +
contrib/libcbor/release.sh | 75 +
contrib/libcbor/src/CMakeLists.txt | 45 +
contrib/libcbor/src/allocators.c | 19 +
contrib/libcbor/src/cbor.c | 345 +++
contrib/libcbor/src/cbor.h | 68 +
contrib/libcbor/src/cbor/arrays.c | 135 ++
contrib/libcbor/src/cbor/arrays.h | 116 +
contrib/libcbor/src/cbor/bytestrings.c | 117 +
contrib/libcbor/src/cbor/bytestrings.h | 132 ++
contrib/libcbor/src/cbor/callbacks.c | 116 +
contrib/libcbor/src/cbor/callbacks.h | 187 ++
contrib/libcbor/src/cbor/common.c | 160 ++
contrib/libcbor/src/cbor/common.h | 303 +++
contrib/libcbor/src/cbor/configuration.h.in | 16 +
contrib/libcbor/src/cbor/data.h | 255 +++
contrib/libcbor/src/cbor/encoding.c | 192 ++
contrib/libcbor/src/cbor/encoding.h | 109 +
contrib/libcbor/src/cbor/floats_ctrls.c | 189 ++
contrib/libcbor/src/cbor/floats_ctrls.h | 212 ++
.../libcbor/src/cbor/internal/builder_callbacks.c | 389 ++++
.../libcbor/src/cbor/internal/builder_callbacks.h | 81 +
contrib/libcbor/src/cbor/internal/encoders.c | 98 +
contrib/libcbor/src/cbor/internal/encoders.h | 36 +
contrib/libcbor/src/cbor/internal/loaders.c | 80 +
contrib/libcbor/src/cbor/internal/loaders.h | 36 +
contrib/libcbor/src/cbor/internal/memory_utils.c | 44 +
contrib/libcbor/src/cbor/internal/memory_utils.h | 39 +
contrib/libcbor/src/cbor/internal/stack.c | 33 +
contrib/libcbor/src/cbor/internal/stack.h | 41 +
contrib/libcbor/src/cbor/internal/unicode.c | 94 +
contrib/libcbor/src/cbor/internal/unicode.h | 32 +
contrib/libcbor/src/cbor/ints.c | 191 ++
contrib/libcbor/src/cbor/ints.h | 210 ++
contrib/libcbor/src/cbor/maps.c | 125 +
contrib/libcbor/src/cbor/maps.h | 112 +
contrib/libcbor/src/cbor/serialization.c | 286 +++
contrib/libcbor/src/cbor/serialization.h | 135 ++
contrib/libcbor/src/cbor/streaming.c | 664 ++++++
contrib/libcbor/src/cbor/streaming.h | 37 +
contrib/libcbor/src/cbor/strings.c | 133 ++
contrib/libcbor/src/cbor/strings.h | 153 ++
contrib/libcbor/src/cbor/tags.c | 43 +
contrib/libcbor/src/cbor/tags.h | 65 +
contrib/libcbor/src/libcbor.pc.in | 11 +
contrib/libcbor/test/CMakeLists.txt | 29 +
contrib/libcbor/test/assertions.c | 53 +
contrib/libcbor/test/assertions.h | 34 +
contrib/libcbor/test/bad_inputs_test.c | 121 +
contrib/libcbor/test/callbacks_test.c | 40 +
contrib/libcbor/test/cbor_serialize_test.c | 323 +++
contrib/libcbor/test/cbor_stream_decode_test.c | 599 +++++
contrib/libcbor/test/copy_test.c | 207 ++
contrib/libcbor/test/cpp_linkage_test.cpp | 11 +
contrib/libcbor/test/data/callbacks.cbor | Bin 0 -> 79 bytes
contrib/libcbor/test/data/callbacks.diag | 1 +
contrib/libcbor/test/data/pretty.cbor | 3 +
contrib/libcbor/test/data/pretty.diag | 1 +
contrib/libcbor/test/fuzz_test.c | 87 +
contrib/libcbor/test/memory_allocation_test.c | 277 +++
contrib/libcbor/test/pretty_printer_test.c | 43 +
contrib/libcbor/test/stack_over_limit_test.c | 35 +
contrib/libcbor/test/stream_expectations.c | 317 +++
contrib/libcbor/test/stream_expectations.h | 151 ++
contrib/libcbor/test/type_0_encoders_test.c | 74 +
contrib/libcbor/test/type_0_test.c | 147 ++
contrib/libcbor/test/type_1_encoders_test.c | 75 +
contrib/libcbor/test/type_1_test.c | 102 +
contrib/libcbor/test/type_2_encoders_test.c | 41 +
contrib/libcbor/test/type_2_test.c | 327 +++
contrib/libcbor/test/type_3_encoders_test.c | 41 +
contrib/libcbor/test/type_3_test.c | 242 ++
contrib/libcbor/test/type_4_encoders_test.c | 55 +
contrib/libcbor/test/type_4_test.c | 127 +
contrib/libcbor/test/type_5_encoders_test.c | 40 +
contrib/libcbor/test/type_5_test.c | 190 ++
contrib/libcbor/test/type_6_encoders_test.c | 35 +
contrib/libcbor/test/type_6_test.c | 117 +
contrib/libcbor/test/type_7_encoders_test.c | 109 +
contrib/libcbor/test/type_7_test.c | 111 +
contrib/libcbor/test/unicode_test.c | 41 +
151 files changed, 16202 insertions(+)
diff --cc contrib/libcbor/.clang-format
index 000000000000,000000000000..de0dc5e77907
new file mode 100644
--- /dev/null
+++ b/contrib/libcbor/.clang-format
@@@ -1,0 -1,0 +1,151 @@@
++---
++Language: Cpp
++# BasedOnStyle: Google
++AccessModifierOffset: -1
++AlignAfterOpenBracket: Align
++AlignConsecutiveAssignments: false
++AlignConsecutiveDeclarations: false
++AlignEscapedNewlines: Left
++AlignOperands: true
++AlignTrailingComments: true
++AllowAllParametersOfDeclarationOnNextLine: true
++AllowShortBlocksOnASingleLine: false
++AllowShortCaseLabelsOnASingleLine: false
++AllowShortFunctionsOnASingleLine: All
++AllowShortIfStatementsOnASingleLine: true
++AllowShortLoopsOnASingleLine: true
++AlwaysBreakAfterDefinitionReturnType: None
++AlwaysBreakAfterReturnType: None
++AlwaysBreakBeforeMultilineStrings: true
++AlwaysBreakTemplateDeclarations: true
++BinPackArguments: true
++BinPackParameters: true
++BraceWrapping:
++ AfterClass: false
++ AfterControlStatement: false
++ AfterEnum: false
++ AfterFunction: false
++ AfterNamespace: false
++ AfterObjCDeclaration: false
++ AfterStruct: false
++ AfterUnion: false
++ AfterExternBlock: false
++ BeforeCatch: false
++ BeforeElse: false
++ IndentBraces: false
++ SplitEmptyFunction: true
++ SplitEmptyRecord: true
++ SplitEmptyNamespace: true
++BreakBeforeBinaryOperators: None
++BreakBeforeBraces: Attach
++BreakBeforeInheritanceComma: false
++BreakInheritanceList: BeforeColon
++BreakBeforeTernaryOperators: true
++BreakConstructorInitializersBeforeComma: false
++BreakConstructorInitializers: BeforeColon
++BreakAfterJavaFieldAnnotations: false
++BreakStringLiterals: true
++ColumnLimit: 80
++CommentPragmas: '^ IWYU pragma:'
++CompactNamespaces: false
++ConstructorInitializerAllOnOneLineOrOnePerLine: true
++ConstructorInitializerIndentWidth: 4
++ContinuationIndentWidth: 4
++Cpp11BracedListStyle: true
++DerivePointerAlignment: true
++DisableFormat: false
++ExperimentalAutoDetectBinPacking: false
++FixNamespaceComments: true
++ForEachMacros:
++ - foreach
++ - Q_FOREACH
++ - BOOST_FOREACH
++IncludeBlocks: Preserve
++IncludeCategories:
++ - Regex: '^<ext/.*\.h>'
++ Priority: 2
++ - Regex: '^<.*\.h>'
++ Priority: 1
++ - Regex: '^<.*'
++ Priority: 2
++ - Regex: '.*'
++ Priority: 3
++IncludeIsMainRegex: '([-_](test|unittest))?$'
++IndentCaseLabels: true
++IndentPPDirectives: None
++IndentWidth: 2
++IndentWrappedFunctionNames: false
++JavaScriptQuotes: Leave
++JavaScriptWrapImports: true
++KeepEmptyLinesAtTheStartOfBlocks: false
++MacroBlockBegin: ''
++MacroBlockEnd: ''
++MaxEmptyLinesToKeep: 1
++NamespaceIndentation: None
++ObjCBinPackProtocolList: Never
++ObjCBlockIndentWidth: 2
++ObjCSpaceAfterProperty: false
++ObjCSpaceBeforeProtocolList: true
++PenaltyBreakAssignment: 2
++PenaltyBreakBeforeFirstCallParameter: 1
++PenaltyBreakComment: 300
++PenaltyBreakFirstLessLess: 120
++PenaltyBreakString: 1000
++PenaltyBreakTemplateDeclaration: 10
++PenaltyExcessCharacter: 1000000
++PenaltyReturnTypeOnItsOwnLine: 200
++PointerAlignment: Left
++RawStringFormats:
++ - Language: Cpp
++ Delimiters:
++ - cc
++ - CC
++ - cpp
++ - Cpp
++ - CPP
++ - 'c++'
++ - 'C++'
++ CanonicalDelimiter: ''
++ BasedOnStyle: google
++ - Language: TextProto
++ Delimiters:
++ - pb
++ - PB
++ - proto
++ - PROTO
++ EnclosingFunctions:
++ - EqualsProto
++ - EquivToProto
++ - PARSE_PARTIAL_TEXT_PROTO
++ - PARSE_TEST_PROTO
++ - PARSE_TEXT_PROTO
++ - ParseTextOrDie
++ - ParseTextProtoOrDie
++ CanonicalDelimiter: ''
++ BasedOnStyle: google
++ReflowComments: true
++SortIncludes: true
++SortUsingDeclarations: true
++SpaceAfterCStyleCast: false
++SpaceAfterTemplateKeyword: true
++SpaceBeforeAssignmentOperators: true
++SpaceBeforeCpp11BracedList: false
++SpaceBeforeCtorInitializerColon: true
++SpaceBeforeInheritanceColon: true
++SpaceBeforeParens: ControlStatements
++SpaceBeforeRangeBasedForLoopColon: true
++SpaceInEmptyParentheses: false
++SpacesBeforeTrailingComments: 2
++SpacesInAngles: false
++SpacesInContainerLiterals: true
++SpacesInCStyleCastParentheses: false
++SpacesInParentheses: false
++SpacesInSquareBrackets: false
++Standard: Auto
++StatementMacros:
++ - Q_UNUSED
++ - QT_REQUIRE_VERSION
++TabWidth: 8
++UseTab: Never
++...
++
diff --cc contrib/libcbor/.github/workflows/fuzz.yml
index 000000000000,c5275121868f..c5275121868f
mode 000000,100644..100644
--- a/contrib/libcbor/.github/workflows/fuzz.yml
+++ b/contrib/libcbor/.github/workflows/fuzz.yml
diff --cc contrib/libcbor/.gitignore
index 000000000000,000000000000..b6fe00f938ad
new file mode 100644
--- /dev/null
+++ b/contrib/libcbor/.gitignore
@@@ -1,0 -1,0 +1,8 @@@
++build
++*~
++nbproject
++.idea
++doxygen_docs
++*/*.out
++cmake-build-debug
++venv
diff --cc contrib/libcbor/.travis.yml
index 000000000000,288de2903399..288de2903399
mode 000000,100644..100644
--- a/contrib/libcbor/.travis.yml
+++ b/contrib/libcbor/.travis.yml
diff --cc contrib/libcbor/CHANGELOG.md
index 000000000000,0f13a45d6b24..0f13a45d6b24
mode 000000,100644..100644
--- a/contrib/libcbor/CHANGELOG.md
+++ b/contrib/libcbor/CHANGELOG.md
diff --cc contrib/libcbor/CMakeLists.txt
index 000000000000,edba03720d2f..edba03720d2f
mode 000000,100644..100644
--- a/contrib/libcbor/CMakeLists.txt
+++ b/contrib/libcbor/CMakeLists.txt
diff --cc contrib/libcbor/CMakeModules/FindCJSON.cmake
index 000000000000,e0629057def7..e0629057def7
mode 000000,100644..100644
--- a/contrib/libcbor/CMakeModules/FindCJSON.cmake
+++ b/contrib/libcbor/CMakeModules/FindCJSON.cmake
diff --cc contrib/libcbor/CMakeModules/FindCMocka.cmake
index 000000000000,770b44afc426..770b44afc426
mode 000000,100644..100644
--- a/contrib/libcbor/CMakeModules/FindCMocka.cmake
+++ b/contrib/libcbor/CMakeModules/FindCMocka.cmake
diff --cc contrib/libcbor/CMakeModules/LibFindMacros.cmake
index 000000000000,baea8c2be928..baea8c2be928
mode 000000,100644..100644
--- a/contrib/libcbor/CMakeModules/LibFindMacros.cmake
+++ b/contrib/libcbor/CMakeModules/LibFindMacros.cmake
diff --cc contrib/libcbor/Doxyfile
index 000000000000,b197d2bcdedc..b197d2bcdedc
mode 000000,100644..100644
--- a/contrib/libcbor/Doxyfile
+++ b/contrib/libcbor/Doxyfile
diff --cc contrib/libcbor/LICENSE.md
index 000000000000,49e9b5390364..49e9b5390364
mode 000000,100644..100644
--- a/contrib/libcbor/LICENSE.md
+++ b/contrib/libcbor/LICENSE.md
diff --cc contrib/libcbor/README.md
index 000000000000,000000000000..cffae9191d01
new file mode 100644
--- /dev/null
+++ b/contrib/libcbor/README.md
@@@ -1,0 -1,0 +1,122 @@@
++# [libcbor](https://github.com/PJK/libcbor)
++
++[](https://travis-ci.org/PJK/libcbor)
++[](https://ci.appveyor.com/project/PJK/libcbor)
++[](https://readthedocs.org/projects/libcbor/?badge=latest)
++[](https://repology.org/project/libcbor/versions)
++[](https://codecov.io/gh/PJK/libcbor)
++
++**libcbor** is a C library for parsing and generating [CBOR](http://tools.ietf.org/html/rfc7049), the general-purpose schema-less binary data format.
++
++## Main features
++ - Complete RFC conformance
++ - Robust C99 implementation
++ - Layered architecture offers both control and convenience
++ - Flexible memory management
++ - No shared global state - threading friendly
++ - Proper handling of UTF-8
++ - Full support for streams & incremental processing
++ - Extensive documentation and test suite
++ - No runtime dependencies, small footprint
++
++## Getting started
++
++### Compile from source
++
++```bash
++git clone https://github.com/PJK/libcbor
++cmake -DCMAKE_BUILD_TYPE=Release -DCBOR_CUSTOM_ALLOC=ON libcbor
++make
++make install
++```
++
++### Homebrew
++
++```bash
++brew install libcbor
++```
++
++### Ubuntu 18.04 and above
++
++```bash
++sudo add-apt-repository universe
++sudo apt-get install libcbor-dev
++```
++
++### Fedora & RPM friends
++
++```bash
++yum install libcbor-devel
++```
++
++### Others
++
++<details>
++ <summary>Packaged libcbor is available from 15+ major repositories. Click here for more detail</summary>
++
++ [](https://repology.org/project/libcbor/versions)
++</details>
++
++## Usage example
++
++```c
++#include <cbor.h>
++#include <stdio.h>
++
++int main(int argc, char * argv[])
++{
++ /* Preallocate the map structure */
++ cbor_item_t * root = cbor_new_definite_map(2);
++ /* Add the content */
++ cbor_map_add(root, (struct cbor_pair) {
++ .key = cbor_move(cbor_build_string("Is CBOR awesome?")),
++ .value = cbor_move(cbor_build_bool(true))
++ });
++ cbor_map_add(root, (struct cbor_pair) {
++ .key = cbor_move(cbor_build_uint8(42)),
++ .value = cbor_move(cbor_build_string("Is the answer"))
++ });
++ /* Output: `length` bytes of data in the `buffer` */
++ unsigned char * buffer;
++ size_t buffer_size,
++ length = cbor_serialize_alloc(root, &buffer, &buffer_size);
++
++ fwrite(buffer, 1, length, stdout);
++ free(buffer);
++
++ fflush(stdout);
++ cbor_decref(&root);
++}
++```
++
++## Documentation
++Get the latest documentation at [libcbor.readthedocs.org](http://libcbor.readthedocs.org/)
++
++## Contributions
++
++All bug reports and contributions are welcome. Please see https://github.com/PJK/libcbor for more info.
++
++Kudos to all the [contributors](https://github.com/PJK/libcbor/graphs/contributors)!
++
++## License
++The MIT License (MIT)
++
++Copyright (c) Pavel Kalvoda, 2014-2020
++
++Permission is hereby granted, free of charge, to any person obtaining a copy
++of this software and associated documentation files (the "Software"), to deal
++in the Software without restriction, including without limitation the rights
++to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++copies of the Software, and to permit persons to whom the Software is
++furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all
++copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++SOFTWARE.
diff --cc contrib/libcbor/appveyor.yml
index 000000000000,452ced5666b7..452ced5666b7
mode 000000,100644..100644
--- a/contrib/libcbor/appveyor.yml
+++ b/contrib/libcbor/appveyor.yml
diff --cc contrib/libcbor/clang-format.sh
index 000000000000,e4076500c4f0..e4076500c4f0
mode 000000,100755..100755
--- a/contrib/libcbor/clang-format.sh
+++ b/contrib/libcbor/clang-format.sh
diff --cc contrib/libcbor/codecov.yml
index 000000000000,e374997dcd15..e374997dcd15
mode 000000,100644..100644
--- a/contrib/libcbor/codecov.yml
+++ b/contrib/libcbor/codecov.yml
diff --cc contrib/libcbor/doc/Makefile
index 000000000000,97a6bdc99543..97a6bdc99543
mode 000000,100644..100644
--- a/contrib/libcbor/doc/Makefile
+++ b/contrib/libcbor/doc/Makefile
diff --cc contrib/libcbor/doc/doxy_frontpage.md
index 000000000000,30980c4872d4..30980c4872d4
mode 000000,100644..100644
--- a/contrib/libcbor/doc/doxy_frontpage.md
+++ b/contrib/libcbor/doc/doxy_frontpage.md
diff --cc contrib/libcbor/doc/make.bat
index 000000000000,b3647968e8a5..b3647968e8a5
mode 000000,100644..100644
--- a/contrib/libcbor/doc/make.bat
+++ b/contrib/libcbor/doc/make.bat
diff --cc contrib/libcbor/doc/source/api.rst
index 000000000000,c25629115060..c25629115060
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api.rst
+++ b/contrib/libcbor/doc/source/api.rst
diff --cc contrib/libcbor/doc/source/api/decoding.rst
index 000000000000,e3a41f467a15..e3a41f467a15
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/decoding.rst
+++ b/contrib/libcbor/doc/source/api/decoding.rst
diff --cc contrib/libcbor/doc/source/api/encoding.rst
index 000000000000,af6bbbe7b9d3..af6bbbe7b9d3
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/encoding.rst
+++ b/contrib/libcbor/doc/source/api/encoding.rst
diff --cc contrib/libcbor/doc/source/api/item_reference_counting.rst
index 000000000000,0c0fa7257826..0c0fa7257826
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/item_reference_counting.rst
+++ b/contrib/libcbor/doc/source/api/item_reference_counting.rst
diff --cc contrib/libcbor/doc/source/api/item_types.rst
index 000000000000,1452b3e5f90e..1452b3e5f90e
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/item_types.rst
+++ b/contrib/libcbor/doc/source/api/item_types.rst
diff --cc contrib/libcbor/doc/source/api/type_0_1.rst
index 000000000000,4fc851dd1ed1..4fc851dd1ed1
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/type_0_1.rst
+++ b/contrib/libcbor/doc/source/api/type_0_1.rst
diff --cc contrib/libcbor/doc/source/api/type_2.rst
index 000000000000,17df5716ccc2..17df5716ccc2
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/type_2.rst
+++ b/contrib/libcbor/doc/source/api/type_2.rst
diff --cc contrib/libcbor/doc/source/api/type_3.rst
index 000000000000,abec24de40a3..abec24de40a3
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/type_3.rst
+++ b/contrib/libcbor/doc/source/api/type_3.rst
diff --cc contrib/libcbor/doc/source/api/type_4.rst
index 000000000000,c3bb88a9cd8a..c3bb88a9cd8a
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/type_4.rst
+++ b/contrib/libcbor/doc/source/api/type_4.rst
diff --cc contrib/libcbor/doc/source/api/type_5.rst
index 000000000000,c9b2e904af6e..c9b2e904af6e
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/type_5.rst
+++ b/contrib/libcbor/doc/source/api/type_5.rst
diff --cc contrib/libcbor/doc/source/api/type_6.rst
index 000000000000,e98457ceae2a..e98457ceae2a
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/type_6.rst
+++ b/contrib/libcbor/doc/source/api/type_6.rst
diff --cc contrib/libcbor/doc/source/api/type_7.rst
index 000000000000,d2e75c8bf0b3..d2e75c8bf0b3
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/api/type_7.rst
+++ b/contrib/libcbor/doc/source/api/type_7.rst
diff --cc contrib/libcbor/doc/source/changelog.rst
index 000000000000,89e7008afab2..89e7008afab2
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/changelog.rst
+++ b/contrib/libcbor/doc/source/changelog.rst
diff --cc contrib/libcbor/doc/source/conf.py
index 000000000000,3ca95bd6dd1f..3ca95bd6dd1f
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/conf.py
+++ b/contrib/libcbor/doc/source/conf.py
diff --cc contrib/libcbor/doc/source/development.rst
index 000000000000,13e91ef25762..13e91ef25762
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/development.rst
+++ b/contrib/libcbor/doc/source/development.rst
diff --cc contrib/libcbor/doc/source/getting_started.rst
index 000000000000,3e56f2c84c08..3e56f2c84c08
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/getting_started.rst
+++ b/contrib/libcbor/doc/source/getting_started.rst
diff --cc contrib/libcbor/doc/source/img/win_1.png
index 000000000000,1bc34e5f8de5..1bc34e5f8de5
mode 000000,100644..100644
Binary files differ
diff --cc contrib/libcbor/doc/source/img/win_2.png
index 000000000000,f6af59949df6..f6af59949df6
mode 000000,100644..100644
Binary files differ
diff --cc contrib/libcbor/doc/source/img/win_3.png
index 000000000000,68ba112cbae0..68ba112cbae0
mode 000000,100644..100644
Binary files differ
diff --cc contrib/libcbor/doc/source/img/win_4.png
index 000000000000,b274be7d530b..b274be7d530b
mode 000000,100644..100644
Binary files differ
diff --cc contrib/libcbor/doc/source/img/win_5.png
index 000000000000,dffeb882f744..dffeb882f744
mode 000000,100644..100644
Binary files differ
diff --cc contrib/libcbor/doc/source/img/win_6.png
index 000000000000,850e3e2f6cc8..850e3e2f6cc8
mode 000000,100644..100644
Binary files differ
diff --cc contrib/libcbor/doc/source/index.rst
index 000000000000,1922586097e3..1922586097e3
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/index.rst
+++ b/contrib/libcbor/doc/source/index.rst
diff --cc contrib/libcbor/doc/source/internal.rst
index 000000000000,2c62a82b2329..2c62a82b2329
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/internal.rst
+++ b/contrib/libcbor/doc/source/internal.rst
diff --cc contrib/libcbor/doc/source/requirements.txt
index 000000000000,461bb7e804d2..461bb7e804d2
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/requirements.txt
+++ b/contrib/libcbor/doc/source/requirements.txt
diff --cc contrib/libcbor/doc/source/rfc_conformance.rst
index 000000000000,817614835a1f..817614835a1f
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/rfc_conformance.rst
+++ b/contrib/libcbor/doc/source/rfc_conformance.rst
diff --cc contrib/libcbor/doc/source/streaming.rst
index 000000000000,8e3bb0d9bade..8e3bb0d9bade
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/streaming.rst
+++ b/contrib/libcbor/doc/source/streaming.rst
diff --cc contrib/libcbor/doc/source/streaming/decoding.rst
index 000000000000,70174aa2715d..70174aa2715d
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/streaming/decoding.rst
+++ b/contrib/libcbor/doc/source/streaming/decoding.rst
diff --cc contrib/libcbor/doc/source/streaming/encoding.rst
index 000000000000,8a56461d3584..8a56461d3584
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/streaming/encoding.rst
+++ b/contrib/libcbor/doc/source/streaming/encoding.rst
diff --cc contrib/libcbor/doc/source/tests.rst
index 000000000000,47357ba36cd6..47357ba36cd6
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/tests.rst
+++ b/contrib/libcbor/doc/source/tests.rst
diff --cc contrib/libcbor/doc/source/using.rst
index 000000000000,dbc09819d46b..dbc09819d46b
mode 000000,100644..100644
--- a/contrib/libcbor/doc/source/using.rst
+++ b/contrib/libcbor/doc/source/using.rst
diff --cc contrib/libcbor/examples/CMakeLists.txt
index 000000000000,d1ddfb17b28a..d1ddfb17b28a
mode 000000,100644..100644
--- a/contrib/libcbor/examples/CMakeLists.txt
+++ b/contrib/libcbor/examples/CMakeLists.txt
diff --cc contrib/libcbor/examples/cjson2cbor.c
index 000000000000,2e3071fb47c5..2e3071fb47c5
mode 000000,100644..100644
--- a/contrib/libcbor/examples/cjson2cbor.c
+++ b/contrib/libcbor/examples/cjson2cbor.c
diff --cc contrib/libcbor/examples/create_items.c
index 000000000000,b875720b5d91..b875720b5d91
mode 000000,100644..100644
--- a/contrib/libcbor/examples/create_items.c
+++ b/contrib/libcbor/examples/create_items.c
diff --cc contrib/libcbor/examples/data/floats.cbor
index 000000000000,afb5e4a92f4a..afb5e4a92f4a
mode 000000,100644..100644
Binary files differ
diff --cc contrib/libcbor/examples/data/indef_string.cbor
index 000000000000,ef51440cfe21..ef51440cfe21
mode 000000,100644..100644
--- a/contrib/libcbor/examples/data/indef_string.cbor
+++ b/contrib/libcbor/examples/data/indef_string.cbor
diff --cc contrib/libcbor/examples/data/integer.cbor
index 000000000000,d9ba7315ac8a..d9ba7315ac8a
mode 000000,100644..100644
--- a/contrib/libcbor/examples/data/integer.cbor
+++ b/contrib/libcbor/examples/data/integer.cbor
diff --cc contrib/libcbor/examples/data/json_example.json
index 000000000000,9646aad098d1..9646aad098d1
mode 000000,100644..100644
--- a/contrib/libcbor/examples/data/json_example.json
+++ b/contrib/libcbor/examples/data/json_example.json
diff --cc contrib/libcbor/examples/data/map.cbor
index 000000000000,699abb42b598..699abb42b598
mode 000000,100644..100644
Binary files differ
diff --cc contrib/libcbor/examples/data/nested_array.cbor
index 000000000000,6c9f0d7acf59..6c9f0d7acf59
mode 000000,100644..100644
--- a/contrib/libcbor/examples/data/nested_array.cbor
+++ b/contrib/libcbor/examples/data/nested_array.cbor
diff --cc contrib/libcbor/examples/data/tagged_date.cbor
index 000000000000,d2fbff8927a3..d2fbff8927a3
mode 000000,100644..100644
--- a/contrib/libcbor/examples/data/tagged_date.cbor
+++ b/contrib/libcbor/examples/data/tagged_date.cbor
diff --cc contrib/libcbor/examples/hello.c
index 000000000000,275267445dac..275267445dac
mode 000000,100644..100644
--- a/contrib/libcbor/examples/hello.c
+++ b/contrib/libcbor/examples/hello.c
diff --cc contrib/libcbor/examples/readfile.c
index 000000000000,213ee77f0fdd..213ee77f0fdd
mode 000000,100644..100644
--- a/contrib/libcbor/examples/readfile.c
+++ b/contrib/libcbor/examples/readfile.c
diff --cc contrib/libcbor/examples/sort.c
index 000000000000,d5e3aaff9dbe..d5e3aaff9dbe
mode 000000,100644..100644
--- a/contrib/libcbor/examples/sort.c
+++ b/contrib/libcbor/examples/sort.c
diff --cc contrib/libcbor/examples/streaming_parser.c
index 000000000000,fe3ab853d978..fe3ab853d978
mode 000000,100644..100644
--- a/contrib/libcbor/examples/streaming_parser.c
+++ b/contrib/libcbor/examples/streaming_parser.c
diff --cc contrib/libcbor/misc/bytes.rb
index 000000000000,ed453a4fcd81..ed453a4fcd81
mode 000000,100755..100755
--- a/contrib/libcbor/misc/bytes.rb
+++ b/contrib/libcbor/misc/bytes.rb
diff --cc contrib/libcbor/misc/file_to_bytes.rb
index 000000000000,047c91054f5e..047c91054f5e
mode 000000,100755..100755
--- a/contrib/libcbor/misc/file_to_bytes.rb
+++ b/contrib/libcbor/misc/file_to_bytes.rb
diff --cc contrib/libcbor/misc/hooks/pre-commit
index 000000000000,f3ac9f483799..f3ac9f483799
mode 000000,100755..100755
--- a/contrib/libcbor/misc/hooks/pre-commit
+++ b/contrib/libcbor/misc/hooks/pre-commit
diff --cc contrib/libcbor/misc/repeat.rb
index 000000000000,fa3da5dbdffb..fa3da5dbdffb
mode 000000,100755..100755
--- a/contrib/libcbor/misc/repeat.rb
+++ b/contrib/libcbor/misc/repeat.rb
diff --cc contrib/libcbor/misc/seq.rb
index 000000000000,0902eb0d96f5..0902eb0d96f5
mode 000000,100755..100755
--- a/contrib/libcbor/misc/seq.rb
+++ b/contrib/libcbor/misc/seq.rb
diff --cc contrib/libcbor/misc/update_version.py
index 000000000000,eb330215d375..eb330215d375
mode 000000,100755..100755
--- a/contrib/libcbor/misc/update_version.py
+++ b/contrib/libcbor/misc/update_version.py
diff --cc contrib/libcbor/oss-fuzz/build.sh
index 000000000000,4b19b7203f8b..4b19b7203f8b
mode 000000,100755..100755
--- a/contrib/libcbor/oss-fuzz/build.sh
+++ b/contrib/libcbor/oss-fuzz/build.sh
diff --cc contrib/libcbor/oss-fuzz/cbor_load_fuzzer.cc
index 000000000000,b32a082bb8a9..b32a082bb8a9
mode 000000,100644..100644
--- a/contrib/libcbor/oss-fuzz/cbor_load_fuzzer.cc
+++ b/contrib/libcbor/oss-fuzz/cbor_load_fuzzer.cc
diff --cc contrib/libcbor/release.sh
index 000000000000,2fd73d967c22..2fd73d967c22
mode 000000,100755..100755
--- a/contrib/libcbor/release.sh
+++ b/contrib/libcbor/release.sh
diff --cc contrib/libcbor/src/CMakeLists.txt
index 000000000000,2a1492bf6ee3..2a1492bf6ee3
mode 000000,100644..100644
--- a/contrib/libcbor/src/CMakeLists.txt
+++ b/contrib/libcbor/src/CMakeLists.txt
diff --cc contrib/libcbor/src/allocators.c
index 000000000000,43c5440ddb2a..43c5440ddb2a
mode 000000,100644..100644
--- a/contrib/libcbor/src/allocators.c
+++ b/contrib/libcbor/src/allocators.c
diff --cc contrib/libcbor/src/cbor.c
index 000000000000,76b892c6b709..76b892c6b709
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor.c
+++ b/contrib/libcbor/src/cbor.c
diff --cc contrib/libcbor/src/cbor.h
index 000000000000,d490e6c5862e..d490e6c5862e
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor.h
+++ b/contrib/libcbor/src/cbor.h
diff --cc contrib/libcbor/src/cbor/arrays.c
index 000000000000,c1d01afafee1..c1d01afafee1
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/arrays.c
+++ b/contrib/libcbor/src/cbor/arrays.c
diff --cc contrib/libcbor/src/cbor/arrays.h
index 000000000000,85fe51dcd8dc..85fe51dcd8dc
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/arrays.h
+++ b/contrib/libcbor/src/cbor/arrays.h
diff --cc contrib/libcbor/src/cbor/bytestrings.c
index 000000000000,75a737bd92ae..75a737bd92ae
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/bytestrings.c
+++ b/contrib/libcbor/src/cbor/bytestrings.c
diff --cc contrib/libcbor/src/cbor/bytestrings.h
index 000000000000,71483f708e26..71483f708e26
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/bytestrings.h
+++ b/contrib/libcbor/src/cbor/bytestrings.h
diff --cc contrib/libcbor/src/cbor/callbacks.c
index 000000000000,3f1f547a09ef..3f1f547a09ef
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/callbacks.c
+++ b/contrib/libcbor/src/cbor/callbacks.c
diff --cc contrib/libcbor/src/cbor/callbacks.h
index 000000000000,9e5965f2d921..9e5965f2d921
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/callbacks.h
+++ b/contrib/libcbor/src/cbor/callbacks.h
diff --cc contrib/libcbor/src/cbor/common.c
index 000000000000,7ccce38ac25b..7ccce38ac25b
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/common.c
+++ b/contrib/libcbor/src/cbor/common.c
diff --cc contrib/libcbor/src/cbor/common.h
index 000000000000,1f9b79e16d9d..1f9b79e16d9d
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/common.h
+++ b/contrib/libcbor/src/cbor/common.h
diff --cc contrib/libcbor/src/cbor/configuration.h.in
index 000000000000,6f65980aa8a2..6f65980aa8a2
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/configuration.h.in
+++ b/contrib/libcbor/src/cbor/configuration.h.in
diff --cc contrib/libcbor/src/cbor/data.h
index 000000000000,982e6a2c9987..982e6a2c9987
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/data.h
+++ b/contrib/libcbor/src/cbor/data.h
diff --cc contrib/libcbor/src/cbor/encoding.c
index 000000000000,19281520edd9..19281520edd9
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/encoding.c
+++ b/contrib/libcbor/src/cbor/encoding.c
diff --cc contrib/libcbor/src/cbor/encoding.h
index 000000000000,e4f2102b636a..e4f2102b636a
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/encoding.h
+++ b/contrib/libcbor/src/cbor/encoding.h
diff --cc contrib/libcbor/src/cbor/floats_ctrls.c
index 000000000000,b7e5fcef8530..b7e5fcef8530
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/floats_ctrls.c
+++ b/contrib/libcbor/src/cbor/floats_ctrls.c
diff --cc contrib/libcbor/src/cbor/floats_ctrls.h
index 000000000000,92eb8bc3eaa3..92eb8bc3eaa3
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/floats_ctrls.h
+++ b/contrib/libcbor/src/cbor/floats_ctrls.h
diff --cc contrib/libcbor/src/cbor/internal/builder_callbacks.c
index 000000000000,f6c571136162..f6c571136162
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/builder_callbacks.c
+++ b/contrib/libcbor/src/cbor/internal/builder_callbacks.c
diff --cc contrib/libcbor/src/cbor/internal/builder_callbacks.h
index 000000000000,a93afb1ca8f8..a93afb1ca8f8
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/builder_callbacks.h
+++ b/contrib/libcbor/src/cbor/internal/builder_callbacks.h
diff --cc contrib/libcbor/src/cbor/internal/encoders.c
index 000000000000,657e25c3987a..657e25c3987a
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/encoders.c
+++ b/contrib/libcbor/src/cbor/internal/encoders.c
diff --cc contrib/libcbor/src/cbor/internal/encoders.h
index 000000000000,14ad5015cb5a..14ad5015cb5a
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/encoders.h
+++ b/contrib/libcbor/src/cbor/internal/encoders.h
diff --cc contrib/libcbor/src/cbor/internal/loaders.c
index 000000000000,af00f135527f..af00f135527f
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/loaders.c
+++ b/contrib/libcbor/src/cbor/internal/loaders.c
diff --cc contrib/libcbor/src/cbor/internal/loaders.h
index 000000000000,a4c82b209f55..a4c82b209f55
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/loaders.h
+++ b/contrib/libcbor/src/cbor/internal/loaders.h
diff --cc contrib/libcbor/src/cbor/internal/memory_utils.c
index 000000000000,918b708e3313..918b708e3313
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/memory_utils.c
+++ b/contrib/libcbor/src/cbor/internal/memory_utils.c
diff --cc contrib/libcbor/src/cbor/internal/memory_utils.h
index 000000000000,c41ace67948f..c41ace67948f
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/memory_utils.h
+++ b/contrib/libcbor/src/cbor/internal/memory_utils.h
diff --cc contrib/libcbor/src/cbor/internal/stack.c
index 000000000000,79c9e5e5297e..79c9e5e5297e
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/stack.c
+++ b/contrib/libcbor/src/cbor/internal/stack.c
diff --cc contrib/libcbor/src/cbor/internal/stack.h
index 000000000000,42ed04429c7e..42ed04429c7e
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/stack.h
+++ b/contrib/libcbor/src/cbor/internal/stack.h
diff --cc contrib/libcbor/src/cbor/internal/unicode.c
index 000000000000,98b49728989e..98b49728989e
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/unicode.c
+++ b/contrib/libcbor/src/cbor/internal/unicode.c
diff --cc contrib/libcbor/src/cbor/internal/unicode.h
index 000000000000,5f6456029306..5f6456029306
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/internal/unicode.h
+++ b/contrib/libcbor/src/cbor/internal/unicode.h
diff --cc contrib/libcbor/src/cbor/ints.c
index 000000000000,880982e5a3e5..880982e5a3e5
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/ints.c
+++ b/contrib/libcbor/src/cbor/ints.c
diff --cc contrib/libcbor/src/cbor/ints.h
index 000000000000,fc7de600102e..fc7de600102e
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/ints.h
+++ b/contrib/libcbor/src/cbor/ints.h
diff --cc contrib/libcbor/src/cbor/maps.c
index 000000000000,45140e2cfa2b..45140e2cfa2b
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/maps.c
+++ b/contrib/libcbor/src/cbor/maps.c
diff --cc contrib/libcbor/src/cbor/maps.h
index 000000000000,370c6fcd4336..370c6fcd4336
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/maps.h
+++ b/contrib/libcbor/src/cbor/maps.h
diff --cc contrib/libcbor/src/cbor/serialization.c
index 000000000000,56a48176aab4..56a48176aab4
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/serialization.c
+++ b/contrib/libcbor/src/cbor/serialization.c
diff --cc contrib/libcbor/src/cbor/serialization.h
index 000000000000,3f7707afca61..3f7707afca61
mode 000000,100644..100644
--- a/contrib/libcbor/src/cbor/serialization.h
+++ b/contrib/libcbor/src/cbor/serialization.h
diff --cc contrib/libcbor/src/cbor/streaming.c
*** 213 LINES SKIPPED ***