feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #3672 from embhorn/zd11547

Browse Source 
Fix FIPS compile errors
This commit is contained in:
David Garske
2021-01-21 16:08:53 -08:00
committed by GitHub
parent 1acd6dfab2 fd8527c15e
commit aa64a8e835
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ssl.c
View File

@ -36067,7 +36067,6 @@ WOLFSSL_BIGNUM *wolfSSL_EC_POINT_point2bn(const WOLFSSL_EC_GROUP *group,
return ret; return ret;
} }
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
#ifdef USE_ECC_B_PARAM #ifdef USE_ECC_B_PARAM
int wolfSSL_EC_POINT_is_on_curve(const WOLFSSL_EC_GROUP *group, int wolfSSL_EC_POINT_is_on_curve(const WOLFSSL_EC_GROUP *group,
@ -36091,6 +36090,7 @@ int wolfSSL_EC_POINT_is_on_curve(const WOLFSSL_EC_GROUP *group,
== MP_OKAY ? WOLFSSL_SUCCESS : WOLFSSL_FAILURE; == MP_OKAY ? WOLFSSL_SUCCESS : WOLFSSL_FAILURE;
} }
#endif /* USE_ECC_B_PARAM */ #endif /* USE_ECC_B_PARAM */
#endif /* !HAVE_FIPS || HAVE_FIPS_VERSION > 2 */
WOLFSSL_EC_POINT *wolfSSL_EC_POINT_new(const WOLFSSL_EC_GROUP *group) WOLFSSL_EC_POINT *wolfSSL_EC_POINT_new(const WOLFSSL_EC_GROUP *group)
{ {

6
wolfcrypt/test/test.c
View File

@ -21044,11 +21044,14 @@ static int ecc_point_test(void)
goto done; goto done;
} }
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2))
ret = wc_ecc_import_point_der_ex(derComp0, sizeof(derComp0), curve_idx, point4, 0); ret = wc_ecc_import_point_der_ex(derComp0, sizeof(derComp0), curve_idx, point4, 0);
if (ret != 0) { if (ret != 0) {
ret = -10027; ret = -10027;
goto done; goto done;
} }
#endif
ret = wc_ecc_cmp_point(point3, point4); ret = wc_ecc_cmp_point(point3, point4);
if (ret != MP_EQ) { if (ret != MP_EQ) {
@ -21062,11 +21065,14 @@ static int ecc_point_test(void)
goto done; goto done;
} }
#if !defined(HAVE_FIPS) && !defined(HAVE_SELFTEST) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION > 2))
ret = wc_ecc_import_point_der_ex(derComp1, sizeof(derComp1), curve_idx, point4, 0); ret = wc_ecc_import_point_der_ex(derComp1, sizeof(derComp1), curve_idx, point4, 0);
if (ret != 0) { if (ret != 0) {
ret = -10030; ret = -10030;
goto done; goto done;
} }
#endif
ret = wc_ecc_cmp_point(point3, point4); ret = wc_ecc_cmp_point(point3, point4);
if (ret != MP_EQ) { if (ret != MP_EQ) {