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

Merge pull request #5744 from SparkiDev/regression_fixes_4

Browse Source 
Regresssion testing fixes
This commit is contained in:
JacobBarthelmeh
2022-10-27 11:49:52 -06:00
committed by GitHub
parent 1c09a67f6a fd7544ca19
commit 7366a9edbd
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure.ac
View File

@@ -7434,13 +7434,6 @@ esac
# Update ENABLE_* variables # # Update ENABLE_* variables #
################################################################################ ################################################################################
if test "x$ENABLED_LEANPSK" = "xyes" || test "x$ENABLED_CERTS" = "xno" || \
test "x$ENABLED_ASN" = "xno"
then
ENABLED_CERTS=no
ENABLED_ASN=no
fi
if test "x$ENABLED_SYS_CA_CERTS" = "xyes" if test "x$ENABLED_SYS_CA_CERTS" = "xyes"
then then
if test "x$ENABLED_FILESYSTEM" = "xno" if test "x$ENABLED_FILESYSTEM" = "xno"
@@ -7555,6 +7548,11 @@ then
ENABLED_CERTS=yes ENABLED_CERTS=yes
fi fi
if test "$ENABLED_ED25519" != "no" || test "$ENABLED_ED448" != "no"
then
ENABLED_CERTS=yes
fi
if test "$ENABLED_MD5" = "yes" if test "$ENABLED_MD5" = "yes"
then then
# turn off MD5 if leanpsk or leantls on # turn off MD5 if leanpsk or leantls on
@@ -7564,6 +7562,13 @@ then
fi fi
fi fi
if test "x$ENABLED_LEANPSK" = "xyes" || test "x$ENABLED_CERTS" = "xno" || \
test "x$ENABLED_ASN" = "xno"
then
ENABLED_CERTS=no
ENABLED_ASN=no
fi
################################################################################ ################################################################################
# Check for build-type conflicts # # Check for build-type conflicts #
################################################################################ ################################################################################

3
tests/api.c
View File

@@ -1350,7 +1350,8 @@ static int test_wolfSSL_CTX_load_system_CA_certs(void)
{ {
int ret = 0; int ret = 0;
#if defined(WOLFSSL_SYS_CA_CERTS) && !defined(NO_WOLFSSL_CLIENT) #if defined(WOLFSSL_SYS_CA_CERTS) && !defined(NO_WOLFSSL_CLIENT) && \
(!defined(NO_RSA) || defined(HAVE_ECC))
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
byte dirValid = 0; byte dirValid = 0;

3
wolfcrypt/benchmark/benchmark.c
View File

@@ -8326,8 +8326,9 @@ static void print_alg(const char* str, int* line)
/* Display the usage options of the benchmark program. */ /* Display the usage options of the benchmark program. */
static void Usage(void) static void Usage(void)
{ {
int e = 0;
#ifndef WOLFSSL_BENCHMARK_ALL #ifndef WOLFSSL_BENCHMARK_ALL
int i, e = 0; int i;
int line; int line;
#endif #endif

4
wolfcrypt/src/asn.c
View File

@@ -214,6 +214,8 @@ extern int wc_InitRsaHw(RsaKey* key);
/* Calculates the minimum number of bytes required to encode the value. /* Calculates the minimum number of bytes required to encode the value.
*
* Only support up to 2^24-1.
* *
* @param [in] value Value to be encoded. * @param [in] value Value to be encoded.
* @return Number of bytes to encode value. * @return Number of bytes to encode value.
@@ -221,7 +223,7 @@ extern int wc_InitRsaHw(RsaKey* key);
static word32 BytePrecision(word32 value) static word32 BytePrecision(word32 value)
{ {
word32 i; word32 i;
for (i = (word32)sizeof(value); i; --i) for (i = (word32)sizeof(value) - 1; i; --i)
if (value >> ((i - 1) * WOLFSSL_BIT_SIZE)) if (value >> ((i - 1) * WOLFSSL_BIT_SIZE))
break; break;