Updated tinycbor submodule, to include Makefile fix #577
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
lgtm @conorpp |
|
@nickray, @conorpp, any chance this could be merged? I'd love to get rid of my fork (https://github.com/AlfioEmanueleFresta/xdg-credentials-portal/tree/master/solo). |
AlfioEmanueleFresta
force-pushed
the
master
branch
from
2519815 to
c12e6c7
Compare
AlfioEmanueleFresta
added a commit
to linux-credentials/libwebauthn
that referenced
this pull request
Jul 14, 2025
Updates the `solo` clone to include AlfioEmanueleFresta/solo@c12e6c7. Fixes an occasional build error building `solo`: ``` make failed: Output { status: ExitStatus(unix_wait_status(512)), stdout: "cc -O2 -fdata-sections -ffunction-sections -fcommon -g -I../ -I./fido2/ -I./pc -I../pc -I./tinycbor/src -DAES256=1 -DSOLO_EXPERIMENTAL=1 -DDEBUG_LEVEL=1 -c -o pc/device.o pc/device.c\n", stderr: "pc/device.c: In function ‘device_init’:\npc/device.c:256:5: error: too many arguments to function ‘ctap_init’; expected 0, have 1\n 256 | ctap_init(1);\n | ^~~~~~~~~ ~\nIn file included from ./fido2/storage.h:10,\n from ./fido2/device.h:10,\n from pc/device.c:20:\n./fido2/ctap.h:389:6: note: declared here\n 389 | void ctap_init();\n | ^~~~~~~~~\nmake: *** [<builtin>: pc/device.o] Error 1\n" } ``` The root cause is commit [e8d0ad5e7cf2f8bd5a57aae8e5e8b69d3816474c](AlfioEmanueleFresta/solo@e8d0ad5), part of solokeys/solo1#121, which removes an extra argument from `ctap_init` but didn't update `pc/device.c`. Note upstreaming PR has been blocked for a while - solokeys/solo1#577. IMO we should eventually migrate to Solo2, with FIDO2 support, rather than spend more time on solo1.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the tinycbor Makefile contained code which prevented it to be built in environments where file descriptor 9 was unavailable. I've encountered this error whilst trying to build solo as a Cargo crate, as a dependency of my own project (logs).
I've opened PR for tinycbor, fixing the issue with their Makefile, which was merged - intel/tinycbor#210
This PR updates the tinycbor submodule version, to include the fix above.