Skip to content

Update dependencies to mbedtls 4.0 and tinycbor 7.0#137

Merged
Harry-Chen merged 4 commits intodevfrom
mbedtls-4
Mar 12, 2026
Merged

Update dependencies to mbedtls 4.0 and tinycbor 7.0#137
Harry-Chen merged 4 commits intodevfrom
mbedtls-4

Conversation

@Harry-Chen
Copy link
Copy Markdown
Contributor

This pull request updates the build system to use tinycbor as an external submodule and removes direct source file references. It also updates the canokey-crypto and tinycbor submodules to newer commits. The most important changes are grouped below:

Build system changes:

  • Added tinycbor as an external submodule in CMakeLists.txt, enabling freestanding mode and disabling shared libraries. ([CMakeLists.txtR37-R41](https://github.com/canokeys/canokey-core/pull/137/files#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aR37-R41))
  • Removed direct references to tinycbor source files from the SRC variable and from the include directories in CMakeLists.txt, relying on the submodule build instead. ([[1]](https://github.com/canokeys/canokey-core/pull/137/files#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aL48-L49), [[2]](https://github.com/canokeys/canokey-core/pull/137/files#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aL70-R80))
  • Linked tinycbor as a library dependency to canokey-core in CMakeLists.txt. ([CMakeLists.txtL70-R80](https://github.com/canokeys/canokey-core/pull/137/files#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aL70-R80))

Submodule updates:

  • Updated the canokey-crypto submodule to commit 2217732a29d750400778900d17adf8aa6dd77bda. ([canokey-cryptoL1-R1](https://github.com/canokeys/canokey-core/pull/137/files#diff-b3ff5eea6e5ba1bb9bb5256b9fae5c2172f9b792d550f872b6cb58fd73d60f53L1-R1))
  • Updated the tinycbor submodule to commit 6442e749ca811e24afad1551338a45c75e09808f. ([tinycborL1-R1](https://github.com/canokeys/canokey-core/pull/137/files#diff-89bad368485210ab514b6f6caa2f8d6625b75bae95fc000c9ae7d6b4c58f36d5L1-R1))

Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
…isting

tinycbor 7.0 provides its own CMakeLists.txt with generate_export_header
and configure_file for version/export headers. Switch from manually
listing tinycbor source files to add_subdirectory + target_link_libraries.

Options set: static lib, no floating-point, no tools/tests/examples.
Copilot AI review requested due to automatic review settings March 12, 2026 16:40
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the build to consume tinycbor via its CMake subdirectory (instead of compiling its sources directly) and bumps the canokey-crypto/tinycbor submodules to newer commits aligned with mbedtls 4.0 + tinycbor 7.0.

Changes:

  • Add tinycbor as a CMake subdirectory with freestanding/static configuration, and link it into canokey-core.
  • Remove direct compilation and include-path references to tinycbor/src from the top-level build.
  • Update canokey-crypto and tinycbor submodule SHAs.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File Description
CMakeLists.txt Builds tinycbor as a subproject and links it to canokey-core, removing direct source/include references.
tinycbor Updates the tinycbor submodule commit pointer.
canokey-crypto Updates the canokey-crypto submodule commit pointer.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@Harry-Chen Harry-Chen merged commit 9a81bab into dev Mar 12, 2026
7 of 9 checks passed
@Harry-Chen Harry-Chen deleted the mbedtls-4 branch March 12, 2026 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants