Merge pull request #3442 from SparkiDev/config_fix_2

Configuration fixes
This commit is contained in:
toddouska
2020-11-03 14:48:49 -08:00
committed by GitHub
5 changed files with 11 additions and 5 deletions

View File

@ -22059,7 +22059,7 @@ static int test_wc_Ed448PrivateKeyToDer (void)
static int test_wc_SetSubjectBuffer (void)
{
int ret = 0;
#if defined(WOLFSSL_CERT_GEN)
#if defined(WOLFSSL_CERT_GEN) && !defined(NO_RSA)
Cert cert;
FILE* file;
byte* der;

View File

@ -80,6 +80,11 @@ char* myoptarg = NULL;
#ifdef HAVE_STACK_SIZE
static void *echoclient_test_wrapper(void* args) {
echoclient_test(args);
#if defined(HAVE_ECC) && defined(FP_ECC) && defined(HAVE_THREAD_LS)
wc_ecc_fp_free(); /* free per thread cache */
#endif
return (void *)0;
}
#endif

View File

@ -29,7 +29,8 @@
#include <wolfssl/wolfcrypt/cpuid.h>
#if (defined(WOLFSSL_X86_64_BUILD) || defined(USE_INTEL_SPEEDUP) || \
defined(WOLFSSL_AESNI)) && !defined(WOLFSSL_NO_ASM)
defined(WOLFSSL_AESNI) || defined(WOLFSSL_SP_ASM)) && \
!defined(WOLFSSL_NO_ASM)
/* Each platform needs to query info type 1 from cpuid to see if aesni is
* supported. Also, let's setup a macro for proper linkage w/o ABI conflicts
*/

View File

@ -13810,11 +13810,11 @@ static int rsa_test(void)
#endif
#else
#ifdef USE_CERT_BUFFERS_2048
ret = mp_read_unsigned_bin(key.n, &tmp[12], 256);
ret = mp_read_unsigned_bin(&key->n, &tmp[12], 256);
if (ret != 0) {
ERROR_OUT(-7705, exit_rsa);
}
ret = mp_set_int(key.e, WC_RSA_EXPONENT);
ret = mp_set_int(&key->e, WC_RSA_EXPONENT);
if (ret != 0) {
ERROR_OUT(-7706, exit_rsa);
}

View File

@ -33,7 +33,7 @@
#endif
#if defined(WOLFSSL_X86_64_BUILD) || defined(USE_INTEL_SPEEDUP) || \
defined(WOLFSSL_AESNI)
defined(WOLFSSL_AESNI) || defined(WOLFSSL_SP_ASM)
#define CPUID_AVX1 0x0001
#define CPUID_AVX2 0x0002
#define CPUID_RDRAND 0x0004