Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for hybrid authentication (two ciphers) #510

Merged
merged 9 commits into from
Oct 30, 2024

Conversation

danielinux
Copy link
Member

No description provided.

@danielinux danielinux self-assigned this Oct 25, 2024
@danielinux danielinux force-pushed the hybrid-auth branch 5 times, most recently from eaaac1b to 31fd115 Compare October 29, 2024 11:04
@danielinux
Copy link
Member Author

Benchmark

Name Configuration Bootloader size Stack size Image header size Boot time
ML_DSA-65 hybrid with ECDSA384 SIGN=ML_DSA ML_DSA_LEVEL=3 IMAGE_SIGNATURE_SIZE=3309 IMAGE_HEADER_SIZE=8192 SIGN_SECONDARY=ECC384 WOLFBOOT_UNIVERSAL_KEYSTORE=1 34372 19544 8192 2.904
ML_DSA-87 hybrid with ECDSA521 SIGN=ML_DSA ML_DSA_LEVEL=5 IMAGE_SIGNATURE_SIZE=4627 IMAGE_HEADER_SIZE=12288 SIGN_SECONDARY=ECC521 WOLFBOOT_UNIVERSAL_KEYSTORE=1 39284 19544 12288 4.159

@danielinux danielinux marked this pull request as ready for review October 29, 2024 11:54
Copy link
Contributor

@philljj philljj left a comment

Choose a reason for hiding this comment

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

This is really cool!

Still looking and testing, but things I noticed so far:

include/loader.h Show resolved Hide resolved
test-app/app_sim.c Outdated Show resolved Hide resolved
tools/keytools/sign.c Show resolved Hide resolved
arch.mk Outdated
@@ -1030,9 +1034,12 @@ ifeq ($(TARGET),sim)
LD_END_GROUP=
BOOT_IMG=test-app/image.elf
CFLAGS+=-DARCH_SIM
CFLAGS+=-DWOLFBOOT_USE_STDLIBC
LDFLAGS +=-Wl,-gc-sections -Wl,-Map=wolfboot.map
Copy link
Contributor

Choose a reason for hiding this comment

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

Adding these LDFLAGS breaks my ability to build and run the simulator on the Mac. Could you gate around USE_GCC perhaps?

Copy link
Member Author

Choose a reason for hiding this comment

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

I guess you are referring to the -DWOLFBOOT_USE_STDLIBC. I've gated that behind USE_GCC as suggested.

Copy link
Contributor

Choose a reason for hiding this comment

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

It was LDFLAGS +=-Wl,-gc-sections -Wl,-Map=wolfboot.map causing issue with MacOS.

Key buffer size: 144
Secondary ECC key, size: 96
image header size overridden by config value (8192 bytes)
Creating hybrid signature
Copy link
Contributor

Choose a reason for hiding this comment

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

I tried re-building key tools 'make keytools. I am using the cp config/examples/sim-ml-dsa-ecc-hybrid.config .config `.

wolfBoot KeyTools (Compiled C version)
wolfBoot version 2020000
Parsing arguments in hybrid mode
Secondary private key: wolfboot_signing_second_private_key.der
Secondary cipher: ECC384
Version: 1
Update type:          Firmware
Input image:          test-app/image.elf
Selected cipher:      ML-DSA
Selected hash  :      SHA256
Private key:           wolfboot_signing_private_key.der
Secondary cipher:     ECC384
Secondary private key: wolfboot_signing_second_private_key.der
Output  image:        test-app/image_v1_signed.bin
Target partition id : 1 
info: using ML-DSA parameters: 3
error: unrecognized ml-dsa key size: 144
Key decode error -1
        [MERGE] internal_flash.dd
4096+0 records in
4096+0 records out
4096 bytes transferred in 0.015564 secs (263171 bytes/sec)
make assemble_internal_flash.dd
unable to stat test-app/image_v1_signed.bin: No such file or directory

Copy link
Member Author

Choose a reason for hiding this comment

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

It looks like the signing failed because the primary key is invalid (stale? created with keygen --ecc384 -g?). I cannot reproduce, it would be helpful to see what goes wrong in keys creation from make distclean make keysclean make V=1

@dgarske dgarske removed their assignment Oct 29, 2024
@philljj philljj self-requested a review October 30, 2024 11:41
@dgarske dgarske merged commit b333317 into wolfSSL:master Oct 30, 2024
99 checks passed
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.

3 participants