diff --git a/wolfssl/internal.h b/wolfssl/internal.h index 3389b6096..e973a124a 100644 --- a/wolfssl/internal.h +++ b/wolfssl/internal.h @@ -1839,18 +1839,20 @@ enum Misc { PQC_SA_MAJOR = 0xFE,/* Most significant byte used with PQC sig algs */ - /* These values for falcon and dilithium match what OQS has defined. */ + /* These values for falcon match what OQS has defined. */ FALCON_LEVEL1_SA_MAJOR = 0xFE, FALCON_LEVEL1_SA_MINOR = 0xAE, FALCON_LEVEL5_SA_MAJOR = 0xFE, FALCON_LEVEL5_SA_MINOR = 0xB1, - DILITHIUM_LEVEL2_SA_MAJOR = 0xFE, - DILITHIUM_LEVEL2_SA_MINOR = 0xD0, - DILITHIUM_LEVEL3_SA_MAJOR = 0xFE, - DILITHIUM_LEVEL3_SA_MINOR = 0xD1, - DILITHIUM_LEVEL5_SA_MAJOR = 0xFE, - DILITHIUM_LEVEL5_SA_MINOR = 0xD2, + /* these values for MLDSA (Dilithium) correspond to what is proposed in the + * IETF. */ + DILITHIUM_LEVEL2_SA_MAJOR = 0x09, + DILITHIUM_LEVEL2_SA_MINOR = 0x04, + DILITHIUM_LEVEL3_SA_MAJOR = 0x09, + DILITHIUM_LEVEL3_SA_MINOR = 0x05, + DILITHIUM_LEVEL5_SA_MAJOR = 0x09, + DILITHIUM_LEVEL5_SA_MINOR = 0x06, MIN_RSA_SHA512_PSS_BITS = 512 * 2 + 8 * 8, /* Min key size */ MIN_RSA_SHA384_PSS_BITS = 384 * 2 + 8 * 8, /* Min key size */ diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index a2679635f..d9622b9bc 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -4602,22 +4602,22 @@ enum { #endif #ifndef WOLFSSL_NO_ML_KEM #ifndef WOLFSSL_KYBER_ORIGINAL - WOLFSSL_PQC_MIN = 583, - WOLFSSL_PQC_SIMPLE_MIN = 583, + WOLFSSL_PQC_MIN = 512, + WOLFSSL_PQC_SIMPLE_MIN = 512, #endif - WOLFSSL_ML_KEM_512 = 583, /* ML-KEM 512 */ - WOLFSSL_ML_KEM_768 = 584, /* ML-KEM 768 */ - WOLFSSL_ML_KEM_1024 = 585, /* ML-KEM 1024 */ - WOLFSSL_PQC_SIMPLE_MAX = 585, + WOLFSSL_ML_KEM_512 = 512, /* ML-KEM 512 */ + WOLFSSL_ML_KEM_768 = 513, /* ML-KEM 768 */ + WOLFSSL_ML_KEM_1024 = 514, /* ML-KEM 1024 */ + WOLFSSL_PQC_SIMPLE_MAX = 514, #ifndef WOLFSSL_KYBER_ORIGINAL - WOLFSSL_PQC_HYBRID_MIN = 12103, + WOLFSSL_PQC_HYBRID_MIN = 12107, #endif - WOLFSSL_P256_ML_KEM_512 = 12103, - WOLFSSL_P384_ML_KEM_768 = 12104, - WOLFSSL_P521_ML_KEM_1024 = 12105, - WOLFSSL_PQC_HYBRID_MAX = 12105, - WOLFSSL_PQC_MAX = 12105, + WOLFSSL_P256_ML_KEM_512 = 12107, + WOLFSSL_P384_ML_KEM_768 = 12108, + WOLFSSL_P521_ML_KEM_1024 = 12109, + WOLFSSL_PQC_HYBRID_MAX = 12109, + WOLFSSL_PQC_MAX = 12109, #endif /* !WOLFSSL_NO_ML_KEM */ #endif /* HAVE_PQC */ WOLF_ENUM_DUMMY_LAST_ELEMENT(SSL_H)