Fix for ML-DSA with WOLFSSL_DILITHIUM_NO_SIGN. ZD 19948.

This commit is contained in:
David Garske
2025-05-22 12:24:03 -07:00
parent 9fdb40caa4
commit d0085834cd
2 changed files with 4 additions and 3 deletions

View File

@@ -16663,7 +16663,8 @@ int test_mldsa_pkcs8(void)
EXPECT_DECLS; EXPECT_DECLS;
#if !defined(NO_ASN) && defined(HAVE_PKCS8) && \ #if !defined(NO_ASN) && defined(HAVE_PKCS8) && \
defined(HAVE_DILITHIUM) && !defined(NO_TLS) && \ defined(HAVE_DILITHIUM) && !defined(NO_TLS) && \
(!defined(NO_WOLFSSL_CLIENT) || !defined(NO_WOLFSSL_SERVER)) (!defined(NO_WOLFSSL_CLIENT) || !defined(NO_WOLFSSL_SERVER)) && \
!defined(WOLFSSL_DILITHIUM_NO_MAKE_KEY)
WOLFSSL_CTX* ctx = NULL; WOLFSSL_CTX* ctx = NULL;
size_t i; size_t i;

View File

@@ -31513,7 +31513,7 @@ static int MakeSignature(CertSignCtx* certSignCtx, const byte* buf, word32 sz,
ret = outSz; ret = outSz;
} }
#endif /* HAVE_FALCON */ #endif /* HAVE_FALCON */
#if defined(HAVE_DILITHIUM) #if defined(HAVE_DILITHIUM) && !defined(WOLFSSL_DILITHIUM_NO_SIGN)
if (!rsaKey && !eccKey && !ed25519Key && !ed448Key && !falconKey && if (!rsaKey && !eccKey && !ed25519Key && !ed448Key && !falconKey &&
dilithiumKey) { dilithiumKey) {
word32 outSz = sigSz; word32 outSz = sigSz;
@@ -31535,7 +31535,7 @@ static int MakeSignature(CertSignCtx* certSignCtx, const byte* buf, word32 sz,
ret = outSz; ret = outSz;
} }
} }
#endif /* HAVE_DILITHIUM */ #endif /* HAVE_DILITHIUM && !WOLFSSL_DILITHIUM_NO_SIGN */
#if defined(HAVE_SPHINCS) #if defined(HAVE_SPHINCS)
if (!rsaKey && !eccKey && !ed25519Key && !ed448Key && !falconKey && if (!rsaKey && !eccKey && !ed25519Key && !ed448Key && !falconKey &&
!dilithiumKey && sphincsKey) { !dilithiumKey && sphincsKey) {