Add wolfcrypt ML-DSA (dilithium) support. #507
+606
−13
Conversation
This file contains 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
dgarske
requested changes
Sep 23, 2024
src/image.c
Outdated
| if (ret != 0) { | ||
| wolfBoot_printf("error: wc_MlDsaKey_SetParams(%d)" \ | ||
| " returned %d\n", ML_DSA_LEVEL, ret); | ||
| return; |
There was a problem hiding this comment.
Prefer a single return flow to make sure wc_MlDsaKey_Free(&ml_dsa); gets called. Refactor function with if (ret == 0) logic and only have a single return at bottom.
tools/keytools/Makefile
Outdated
| ifeq ($(SIGN),ML_DSA) | ||
| OBJS_REAL+=$(WOLFDIR)/wolfcrypt/src/dilithium.o | ||
|
|
||
| CFLAGS += -D"WOLFSSL_DILITHIUM_FIPS204_DRAFT" \ |
There was a problem hiding this comment.
I would prefer these build options reside in tools/keytools/user_settings.h. Please move this and others if possible.
There was a problem hiding this comment.
I'll move these, agree will be tidier
dgarske
requested changes
Sep 25, 2024
|
|
||
| if (ret == 0) { | ||
| /* Now import pub key. */ | ||
| ret = wc_MlDsaKey_ImportPubRaw(&ml_dsa, pubkey, pub_len); |
There was a problem hiding this comment.
davidgarske@Davids-MacBook-Pro-2 wolfBoot-alt % make
[CC-sim] src/string.o
[CC-sim] src/image.o
src/image.c:542:15: error: use of undeclared identifier 'out'
542 | ret = wc_MlDsaKey_ImportPubRaw(&ml_dsa, pubkey, pub_len);
| ^
lib/wolfssl/wolfssl/wolfcrypt/dilithium.h:753:32: note: expanded from macro 'wc_MlDsaKey_ImportPubRaw'
753 | wc_dilithium_import_public(out, outLen, key)
| ^
src/image.c:542:15: error: use of undeclared identifier 'outLen'
lib/wolfssl/wolfssl/wolfcrypt/dilithium.h:753:37: note: expanded from macro 'wc_MlDsaKey_ImportPubRaw'
753 | wc_dilithium_import_public(out, outLen, key)
| ^
2 errors generated.
make: *** [src/image.o] Error 1
There was a problem hiding this comment.
cp config/examples/sim-ml-dsa.config .config
make distclean
make
There was a problem hiding this comment.
Have to build with this branch:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Adds wolfcrypt ML-DSA (wolfcrypt/src/dilithium.c) support to wolfBoot.
Builds with
WOLFSSL_DILITHIUM_FIPS204_DRAFT.Config
Added sim ML-DSA example:
Docs
Updated
docs/PQ.mdto describe ML-DSA and all three NIST approved PQ sig algs we have implemented.Testing
Tested with sim and renode so far.
Todo: add github workflow. Add test instructions.
Prereqs
Requires this PR to build:
Requires this PR to conform to FIPS 204: