From 28918159655547b39099e9fbb36e4daad89b5e37 Mon Sep 17 00:00:00 2001 From: Koji Takeda Date: Thu, 31 Jul 2025 14:31:19 +0900 Subject: [PATCH] Fix errors on #9000 --- tests/api/test_mldsa.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/tests/api/test_mldsa.c b/tests/api/test_mldsa.c index 445412cff..1c2286a0b 100644 --- a/tests/api/test_mldsa.c +++ b/tests/api/test_mldsa.c @@ -16859,7 +16859,6 @@ int test_mldsa_pkcs8_import_OpenSSL_form(void) size_t pemMaxSz = ML_DSA_LEVEL5_BOTH_KEY_PEM_SIZE; size_t pemSz = 0; #endif /* WOLFSSL_DER_TO_PEM */ - int expect = 0; ExpectNotNull(der = (byte*) XMALLOC(derMaxSz, NULL, DYNAMIC_TYPE_TMP_BUFFER)); @@ -16880,20 +16879,31 @@ int test_mldsa_pkcs8_import_OpenSSL_form(void) ExpectIntEQ(XFCLOSE(fp), 0); /* DER */ - expect = ossl_form[i].p8_nolv ? WOLFSSL_SUCCESS : WOLFSSL_BAD_FILE; - ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, der, derSz, - WOLFSSL_FILETYPE_ASN1), expect); + if (ossl_form[i].p8_nolv) { + ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, der, derSz, + WOLFSSL_FILETYPE_ASN1), WOLFSSL_SUCCESS); + } + else { + ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, der, derSz, + WOLFSSL_FILETYPE_ASN1), WOLFSSL_BAD_FILE); + } #ifdef WOLFSSL_DER_TO_PEM /* PEM */ ExpectIntGT(pemSz = wc_DerToPem(der, (word32)derSz, pem, (word32)pemMaxSz, PKCS8_PRIVATEKEY_TYPE), 0); - expect = ossl_form[i].p8_nolv ? WOLFSSL_SUCCESS : ASN_PARSE_E; - ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, pem, pemSz, - WOLFSSL_FILETYPE_PEM), expect); + if (ossl_form[i].p8_nolv) { + ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, pem, pemSz, + WOLFSSL_FILETYPE_PEM), WOLFSSL_SUCCESS); + } + else { + ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, pem, pemSz, + WOLFSSL_FILETYPE_PEM), ASN_PARSE_E); + } #endif /* WOLFSSL_DER_TO_PEM */ } + wolfSSL_CTX_free(ctx); XFREE(der, NULL, DYNAMIC_TYPE_TMP_BUFFER); #ifdef WOLFSSL_DER_TO_PEM XFREE(pem, NULL, DYNAMIC_TYPE_TMP_BUFFER);