wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-06 14:50:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10567 from douzzer/20260601-fixes

Browse Source 
20260601-fixes
This commit is contained in:
David Garske
2026-06-01 14:26:23 -07:00
committed by GitHub
parent aec2756a1b d037bd1eed
commit 151e0d9ccc
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/api/test_pkcs12.c
+4
View File
@@ -648,10 +648,12 @@ int test_wc_PKCS12_PBKDF(void)
ExpectIntEQ(XMEMCMP(derived, verify2, 24), 0);
/* iterations <= 0 must be rejected */
#if !defined(HAVE_FIPS) || FIPS_VERSION3_GE(7,0,0)
ExpectIntEQ(wc_PKCS12_PBKDF(derived, passwd, (int)sizeof(passwd),
salt, (int)sizeof(salt), 0, 24, WC_SHA256, 1), BAD_FUNC_ARG);
ExpectIntEQ(wc_PKCS12_PBKDF(derived, passwd, (int)sizeof(passwd),
salt, (int)sizeof(salt), -1, 24, WC_SHA256, 1), BAD_FUNC_ARG);
#endif /* !HAVE_FIPS || FIPS_VERSION3_GE(7,0,0) */
#endif
return EXPECT_RESULT();
}
@@ -717,12 +719,14 @@ int test_wc_PKCS12_PBKDF_ex(void)
salt, (int)sizeof(salt), 1, 24, WC_SHA256, 3, NULL), 0);
/* iterations <= 0 must be rejected */
#if !defined(HAVE_FIPS) || FIPS_VERSION3_GE(7,0,0)
ExpectIntEQ(wc_PKCS12_PBKDF_ex(derived, passwd, (int)sizeof(passwd),
salt, (int)sizeof(salt), 0, 24, WC_SHA256, 1, NULL),
BAD_FUNC_ARG);
ExpectIntEQ(wc_PKCS12_PBKDF_ex(derived, passwd, (int)sizeof(passwd),
salt, (int)sizeof(salt), -1, 24, WC_SHA256, 1, NULL),
BAD_FUNC_ARG);
#endif /* !HAVE_FIPS || FIPS_VERSION3_GE(7,0,0) */
#endif
return EXPECT_RESULT();
}
tests/api/test_pwdbased.c
+2 -1
View File
@@ -29,7 +29,8 @@ int test_wc_PBKDF1_ex_iterations(void)
{
EXPECT_DECLS;
#if defined(HAVE_PBKDF1) && !defined(NO_PWDBASED) && !defined(NO_SHA) && \
!defined(HAVE_SELFTEST)
!defined(HAVE_SELFTEST) && (!defined(HAVE_FIPS) || FIPS_VERSION3_GE(7,0,0))
static const byte passwd[] = { 'p', 'a', 's', 's' };
static const byte salt[] = { 0x78, 0x57, 0x8E, 0x5a,
0x5d, 0x63, 0xcb, 0x06 };
wolfcrypt/src/evp_pk.c
+1 -1
View File
@@ -1893,7 +1893,7 @@ WOLFSSL_PKCS8_PRIV_KEY_INFO* wolfSSL_d2i_PKCS8_PKEY(
rawDer.buffer = pkcs8Der->buffer + inOutIdx;
rawDer.length = (word32)ret;
}
if (ret >= 0) {
if (ret > 0) {
ret = 0; /* good DER */
}
}