Skip to content

Commit 7e14e22

Browse files
FrauschiFrauschi
committed
Add ML-DSA support
1 parent d7bd35c commit 7e14e22

16 files changed

Lines changed: 1886 additions & 12 deletions

‎.github/workflows/build-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
working-directory: ./wolfssl
3636
run: |
3737
./configure --enable-cryptocb --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-md5 \
38-
C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
38+
--enable-mldsa C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
3939
- name: wolfssl make install
4040
working-directory: ./wolfssl
4141
run: make

‎.github/workflows/clang-tidy.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,21 @@ on:
2929
jobs:
3030
clang-tidy:
3131
runs-on: ubuntu-latest
32-
32+
3333
strategy:
3434
fail-fast: false
3535
matrix:
3636
config:
3737
- name: "Standard Build"
3838
configure_flags: ""
39-
- name: "NSS Build"
39+
- name: "NSS Build"
4040
configure_flags: "--enable-nss"
4141
- name: "TPM Build"
4242
configure_flags: "--enable-tpm"
4343
- name: "NSS+TPM Build"
4444
configure_flags: "--enable-nss --enable-tpm"
45+
- name: "PKCS#11 V3.2 PQC Build"
46+
configure_flags: "--enable-pkcs11v32 --enable-mldsa"
4547

4648
steps:
4749
# Checkout wolfPKCS11
@@ -70,7 +72,7 @@ jobs:
7072
cd wolfssl
7173
./autogen.sh
7274
./configure --enable-cryptocb --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-md5 \
73-
C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
75+
--enable-mldsa C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
7476
make -j$(nproc)
7577
sudo make install
7678
sudo ldconfig

‎.github/workflows/cmake.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ jobs:
6161
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWOLFPKCS11_INSTALL:BOOL=yes -DWOLFPKCS11_DEBUG:BOOL=yes \
6262
-DWOLFPKCS11_AESKEYWRAP:BOOL=yes -DWOLFPKCS11_AESCTR:BOOL=yes -DWOLFPKCS11_AESCCM:BOOL=yes \
6363
-DWOLFPKCS11_AESECB:BOOL=yes -DWOLFPKCS11_AESCTS:BOOL=yes -DWOLFPKCS11_AESCMAC:BOOL=yes \
64-
-DWOLFPKCS11_PBKDF2:BOOL=yes -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/${CMAKE_INSTALL_LIBDIR}" \
64+
-DWOLFPKCS11_PBKDF2:BOOL=yes -DWOLFPKCS11_MLDSA:BOOL=yes \
65+
-DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/${CMAKE_INSTALL_LIBDIR}" \
6566
..
6667
cmake --build .
6768
ctest -j $(nproc)

‎.github/workflows/sanitizer-tests.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ jobs:
1919
config:
2020
- name: "Standard Build"
2121
configure_flags: ""
22-
- name: "NSS Build"
22+
- name: "NSS Build"
2323
configure_flags: "--enable-nss"
2424
- name: "TPM Build"
2525
configure_flags: "--enable-tpm"
2626
- name: "NSS+TPM Build"
2727
configure_flags: "--enable-nss --enable-tpm"
28+
- name: "PKCS#11 V3.2 PQC Build"
29+
configure_flags: "--enable-pkcs11v32 --enable-mldsa"
2830

2931
steps:
3032
#pull wolfPKCS11
@@ -73,7 +75,7 @@ jobs:
7375
;;
7476
esac
7577
./configure --enable-cryptocb --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-md5 --enable-debug \
76-
C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
78+
--enable-mldsa C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
7779
- name: wolfssl make
7880
working-directory: ./wolfssl
7981
run: |

‎.github/workflows/scan-build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ jobs:
4444
configure_flags: "--enable-tpm"
4545
- name: "NSS+TPM Build"
4646
configure_flags: "--enable-nss --enable-tpm"
47+
- name: "PKCS#11 V3.2 PQC Build"
48+
configure_flags: "--enable-pkcs11v32 --enable-mldsa"
4749

4850
steps:
4951
# Checkout wolfPKCS11
@@ -72,7 +74,7 @@ jobs:
7274
cd wolfssl
7375
./autogen.sh
7476
./configure --enable-cryptocb --enable-aescfb --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt --enable-md5 \
75-
C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
77+
--enable-mldsa C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT -DHAVE_AES_ECB -DHAVE_AES_KEYWRAP"
7678
make -j$(nproc)
7779
sudo make install
7880
sudo ldconfig

‎.github/workflows/unit-test.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ jobs:
102102
uses: ./.github/workflows/build-workflow.yml
103103
with:
104104
config: --enable-pkcs11v32 --disable-shared
105+
mldsa:
106+
uses: ./.github/workflows/build-workflow.yml
107+
with:
108+
config: --enable-mldsa
105109
debug:
106110
uses: ./.github/workflows/build-workflow.yml
107111
with:

‎CMakeLists.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,15 @@ if(WOLFPKCS11_SHA3)
409409
list(APPEND WOLFPKCS11_DEFINITIONS "-DWOLFSSL_SHA3")
410410
endif()
411411

412+
# ML-DSA
413+
add_option("WOLFPKCS11_MLDSA"
414+
"Enable wolfPKCS11 ML-DSA support (default: disabled)"
415+
"no" "yes;no"
416+
)
417+
418+
if(WOLFPKCS11_MLDSA)
419+
list(APPEND WOLFPKCS11_DEFINITIONS "-DWOLFPKCS11_MLDSA")
420+
endif()
412421

413422
# WolfTPM
414423
add_option("WOLFPKCS11_TPM"

‎cmake/options.h.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ extern "C" {
9292
#cmakedefine WOLFSSL_SHA512
9393
#undef WOLFSSL_SHA3
9494
#cmakedefine WOLFSSL_SHA3
95+
#undef WOLFPKCS11_MLDSA
96+
#cmakedefine WOLFPKCS11_MLDSA
9597
#undef WOLFPKCS11_TPM
9698
#cmakedefine WOLFPKCS11_TPM
9799
#undef WOLFPKCS11_NSS

‎configure.ac‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,6 +516,26 @@ then
516516
AM_CFLAGS="$AM_CFLAGS -DWOLFPKCS11_PKCS11_V3_2"
517517
fi
518518

519+
AC_ARG_ENABLE([mldsa],
520+
[AS_HELP_STRING([--enable-mldsa],[Enable ML-DSA (default: disabled)])],
521+
[ ENABLED_MLDSA=$enableval ],
522+
[ ENABLED_MLDSA=no ]
523+
)
524+
525+
if test "$ENABLED_SHA3" = "no"
526+
then
527+
ENABLED_MLDSA=no
528+
fi
529+
530+
if test "$ENABLED_MLDSA" = "yes"
531+
then
532+
if test "$ENABLED_PKCS11V3_2" = "no"; then
533+
ENABLED_PKCS11V3_2=yes
534+
AM_CFLAGS="$AM_CFLAGS -DWOLFPKCS11_PKCS11_V3_2"
535+
fi
536+
AM_CFLAGS="$AM_CFLAGS -DWOLFPKCS11_MLDSA"
537+
fi
538+
519539

520540
AM_CONDITIONAL([BUILD_STATIC],[test "x$enable_shared" = "xno"])
521541

@@ -703,6 +723,7 @@ echo " * RSA-PSS: $ENABLED_RSAPSS"
703723
echo " * DH: $ENABLED_DH"
704724
echo " * ECC: $ENABLED_ECC"
705725
echo " * HKDF: $ENABLED_HKDF"
726+
echo " * ML-DSA: $ENABLED_MLDSA"
706727
echo " * NSS modifications: $ENABLED_NSS"
707728
echo " * Default token path: $WOLFPKCS11_DEFAULT_TOKEN_PATH"
708729
echo " * PKCS#11 Version 3.0: $ENABLED_PKCS11V3_0"

0 commit comments

Comments
 (0)