@@ -16859,7 +16859,6 @@ int test_mldsa_pkcs8_import_OpenSSL_form(void)
1685916859 size_t pemMaxSz = ML_DSA_LEVEL5_BOTH_KEY_PEM_SIZE;
1686016860 size_t pemSz = 0;
1686116861#endif /* WOLFSSL_DER_TO_PEM */
16862- int expect = 0;
1686316862
1686416863 ExpectNotNull(der = (byte*) XMALLOC(derMaxSz, NULL,
1686516864 DYNAMIC_TYPE_TMP_BUFFER));
@@ -16880,20 +16879,31 @@ int test_mldsa_pkcs8_import_OpenSSL_form(void)
1688016879 ExpectIntEQ(XFCLOSE(fp), 0);
1688116880
1688216881 /* DER */
16883- expect = ossl_form[i].p8_nolv ? WOLFSSL_SUCCESS : WOLFSSL_BAD_FILE;
16884- ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, der, derSz,
16885- WOLFSSL_FILETYPE_ASN1), expect);
16882+ if (ossl_form[i].p8_nolv) {
16883+ ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, der, derSz,
16884+ WOLFSSL_FILETYPE_ASN1), WOLFSSL_SUCCESS);
16885+ }
16886+ else {
16887+ ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, der, derSz,
16888+ WOLFSSL_FILETYPE_ASN1), WOLFSSL_BAD_FILE);
16889+ }
1688616890
1688716891#ifdef WOLFSSL_DER_TO_PEM
1688816892 /* PEM */
1688916893 ExpectIntGT(pemSz = wc_DerToPem(der, (word32)derSz, pem,
1689016894 (word32)pemMaxSz, PKCS8_PRIVATEKEY_TYPE), 0);
16891- expect = ossl_form[i].p8_nolv ? WOLFSSL_SUCCESS : ASN_PARSE_E;
16892- ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, pem, pemSz,
16893- WOLFSSL_FILETYPE_PEM), expect);
16895+ if (ossl_form[i].p8_nolv) {
16896+ ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, pem, pemSz,
16897+ WOLFSSL_FILETYPE_PEM), WOLFSSL_SUCCESS);
16898+ }
16899+ else {
16900+ ExpectIntEQ(wolfSSL_CTX_use_PrivateKey_buffer(ctx, pem, pemSz,
16901+ WOLFSSL_FILETYPE_PEM), ASN_PARSE_E);
16902+ }
1689416903#endif /* WOLFSSL_DER_TO_PEM */
1689516904 }
1689616905
16906+ wolfSSL_CTX_free(ctx);
1689716907 XFREE(der, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1689816908#ifdef WOLFSSL_DER_TO_PEM
1689916909 XFREE(pem, NULL, DYNAMIC_TYPE_TMP_BUFFER);
0 commit comments