Dilithum, Kyber: Update to final specification

FIPS 203 and FIPS 204 final specification changes.
wolfSSL · Aug 21, 2024 · c7fcca2 · c7fcca2
1 parent 8b57e3e
commit c7fcca2
Show file tree

Hide file tree

Showing 16 changed files with 17,781 additions and 11,139 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1240,8 +1240,8 @@ do
  1024)
  ENABLED_KYBER1024=yes
  ;;
- ml-kem)
- ENABLED_ML_KEM=yes
+ original)
+ ENABLED_ORIGINAL=yes
  ;;
  *)
  AC_MSG_ERROR([Invalid choice for KYBER []: $ENABLED_KYBER.])
@@ -1251,7 +1251,6 @@ done
 
 if test "$ENABLED_KYBER" != "no"
 then
- AS_IF([ test "$ENABLED_EXPERIMENTAL" != "yes" ],[ AC_MSG_ERROR([KYBER requires --enable-experimental.]) ])
  AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_HAVE_KYBER"
  # Use liboqs if specified.
  if test "$ENABLED_LIBOQS" = "no"; then
@@ -1269,8 +1268,8 @@ then
  if test "$ENABLED_KYBER1024" = ""; then
  AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_NO_KYBER1024"
  fi
- if test "$ENABLED_ML_KEM" = "yes"; then
- AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_ML_KEM"
+ if test "$ENABLED_ORIGINAL" = "yes"; then
+ AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KYBER_ORIGINAL"
  fi
 
  if test "$ENABLED_WC_KYBER" = "yes"
@@ -1346,7 +1345,6 @@ done
 
 if test "$ENABLED_DILITHIUM" != "no"
 then
- AS_IF([ test "$ENABLED_EXPERIMENTAL" != "yes" ],[ AC_MSG_ERROR([DILITHIUM requires --enable-experimental.]) ])
  AM_CFLAGS="$AM_CFLAGS -DHAVE_DILITHIUM"
 
  if test "$ENABLED_MLDSA44" = ""; then

diff --git a/tests/api.c b/tests/api.c
diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c
@@ -685,6 +685,11 @@
 #define BENCH_KYBER1024 0x00000080
 #define BENCH_KYBER (BENCH_KYBER512 | BENCH_KYBER768 | \
  BENCH_KYBER1024)
+#define BENCH_ML_KEM_512 0x00000020
+#define BENCH_ML_KEM_768 0x00000040
+#define BENCH_ML_KEM_1024 0x00000080
+#define BENCH_ML_KEM (BENCH_ML_KEM_512 | BENCH_ML_KEM_768 | \
+ BENCH_ML_KEM_1024)
 #define BENCH_FALCON_LEVEL1_SIGN 0x00000001
 #define BENCH_FALCON_LEVEL5_SIGN 0x00000002
 #define BENCH_DILITHIUM_LEVEL2_SIGN 0x04000000
@@ -1087,6 +1092,10 @@ static const bench_pq_alg bench_pq_asym_opt[] = {
  { "-kyber512", BENCH_KYBER512 },
  { "-kyber768", BENCH_KYBER768 },
  { "-kyber1024", BENCH_KYBER1024 },
+ { "-ml-kem", BENCH_ML_KEM },
+ { "-ml-kem-512", BENCH_ML_KEM_512 },
+ { "-ml-kem-768", BENCH_ML_KEM_768 },
+ { "-ml-kem-1024", BENCH_ML_KEM_1024 },
 #endif
 #if defined(HAVE_FALCON)
  { "-falcon_level1", BENCH_FALCON_LEVEL1_SIGN },

diff --git a/wolfcrypt/src/aes_gcm_asm.asm b/wolfcrypt/src/aes_gcm_asm.asm
@@ -1,6 +1,6 @@
 ; /* aes_gcm_asm.asm */
 ; /*
-; * Copyright (C) 2006-2024 wolfSSL Inc.
+;  * Copyright (C) 2006-2024 wolfSSL Inc.
 ; *
 ; * This file is part of wolfSSL.
 ; *

diff --git a/wolfcrypt/src/aes_xts_asm.asm b/wolfcrypt/src/aes_xts_asm.asm
@@ -1,6 +1,6 @@
 ; /* aes_xts_asm.asm */
 ; /*
-; * Copyright (C) 2006-2024 wolfSSL Inc.
+;  * Copyright (C) 2006-2024 wolfSSL Inc.
 ; *
 ; * This file is part of wolfSSL.
 ; *

diff --git a/wolfcrypt/src/chacha_asm.asm b/wolfcrypt/src/chacha_asm.asm
@@ -1,6 +1,6 @@
 ; /* chacha_asm.asm */
 ; /*
-; * Copyright (C) 2006-2024 wolfSSL Inc.
+;  * Copyright (C) 2006-2024 wolfSSL Inc.
 ; *
 ; * This file is part of wolfSSL.
 ; *