Fix for WOLFSSL_SP_MATH_ALL typo. Plus a few other minor ones.

This commit is contained in:
David Garske
2021-03-26 15:55:14 -07:00
parent fd94d05b0a
commit eb37953061
4 changed files with 6 additions and 6 deletions

View File

@@ -666,7 +666,7 @@ TEST_CASE("wolfssl sha crypt-test", "[wolfssl]")
ESP_LOGI(TAG, "sha256_test()"); ESP_LOGI(TAG, "sha256_test()");
TEST_ASSERT_EQUAL(0, sha256_test()); TEST_ASSERT_EQUAL(0, sha256_test());
#endif #endif
#ifdef WOLSSL_SHA384 #ifdef WOLFSSL_SHA384
ESP_LOGI(TAG, "sha384_test()"); ESP_LOGI(TAG, "sha384_test()");
TEST_ASSERT_EQUAL(0, sha384_test()); TEST_ASSERT_EQUAL(0, sha384_test());
#endif #endif

View File

@@ -5040,7 +5040,7 @@ static void TLSX_SessionTicket_ValidateRequest(WOLFSSL* ssl)
} }
} }
} }
#endif /* WLFSSL_TLS13 || !NO_WOLFSSL_CLIENT */ #endif /* WOLFSSL_TLS13 || !NO_WOLFSSL_CLIENT */
static word16 TLSX_SessionTicket_GetSize(SessionTicket* ticket, int isRequest) static word16 TLSX_SessionTicket_GetSize(SessionTicket* ticket, int isRequest)

View File

@@ -2360,7 +2360,7 @@ void sp_forcezero(sp_int* a)
} }
#endif /* !WOLFSSL_RSA_VERIFY_ONLY || !NO_DH || HAVE_ECC */ #endif /* !WOLFSSL_RSA_VERIFY_ONLY || !NO_DH || HAVE_ECC */
#if defined(WOLSSL_SP_MATH_ALL) || !defined(NO_DH) || defined(HAVE_ECC) || \ #if defined(WOLFSSL_SP_MATH_ALL) || !defined(NO_DH) || defined(HAVE_ECC) || \
!defined(NO_RSA) || defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY) !defined(NO_RSA) || defined(WOLFSSL_KEY_GEN) || defined(HAVE_COMP_KEY)
/* Copy value of multi-precision number a into r. /* Copy value of multi-precision number a into r.
* *
@@ -2390,7 +2390,7 @@ int sp_copy(const sp_int* a, sp_int* r)
} }
#endif #endif
#if defined(WOLSSL_SP_MATH_ALL) || (defined(HAVE_ECC) && defined(FP_ECC)) #if defined(WOLFSSL_SP_MATH_ALL) || (defined(HAVE_ECC) && defined(FP_ECC))
/* Initializes r and copies in value from a. /* Initializes r and copies in value from a.
* *
* @param [out] r SP integer - destination. * @param [out] r SP integer - destination.
@@ -2409,7 +2409,7 @@ int sp_init_copy(sp_int* r, sp_int* a)
} }
return err; return err;
} }
#endif /* WOLSSL_SP_MATH_ALL || (HAVE_ECC && FP_ECC) */ #endif /* WOLFSSL_SP_MATH_ALL || (HAVE_ECC && FP_ECC) */
#if (defined(WOLFSSL_SP_MATH_ALL) && !defined(WOLFSSL_RSA_VERIFY_ONLY)) || \ #if (defined(WOLFSSL_SP_MATH_ALL) && !defined(WOLFSSL_RSA_VERIFY_ONLY)) || \
!defined(NO_DH) || !defined(NO_DSA) !defined(NO_DH) || !defined(NO_DSA)

View File

@@ -35554,7 +35554,7 @@ WOLFSSL_TEST_SUBROUTINE int mp_test(void)
if (ret != 0) if (ret != 0)
return -13300; return -13300;
#ifdef WOLSSL_SP_MATH_ALL #ifdef WOLFSSL_SP_MATH_ALL
mp_init_copy(&p, &a); mp_init_copy(&p, &a);
#else #else
ret = mp_init(&p); ret = mp_init(&p);