wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2619 from dgarske/async_mem

Browse Source 
Fix for Intel QuickAssist asynchronous build
This commit is contained in:
toddouska
2019-11-26 15:29:04 -08:00
committed by GitHub
parent 0d69950d07 be88bce36d
commit 57df5c10c9
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ssl.c
View File

@@ -32050,20 +32050,18 @@ int wolfSSL_EC_POINT_is_at_infinity(const WOLFSSL_EC_GROUP *group,
size_t wolfSSL_EC_get_builtin_curves(WOLFSSL_EC_builtin_curve *r, size_t nitems) size_t wolfSSL_EC_get_builtin_curves(WOLFSSL_EC_builtin_curve *r, size_t nitems)
{ {
static size_t ecc_sets_count = 0; size_t ecc_sets_count;
size_t i, min; size_t i, min_nitems;
if (ecc_sets_count == 0) { for (i = 0; ecc_sets[i].size != 0 && ecc_sets[i].name != NULL; i++);
for (i = 0; ecc_sets[i].size != 0; i++); ecc_sets_count = i;
ecc_sets_count = i;
}
if (r == NULL || nitems == 0) if (r == NULL || nitems == 0)
return ecc_sets_count; return ecc_sets_count;
min = nitems < ecc_sets_count ? nitems : ecc_sets_count; min_nitems = nitems < ecc_sets_count ? nitems : ecc_sets_count;
for (i = 0; i < min; i++) { for (i = 0; i < min_nitems; i++) {
r[i].nid = ecc_sets[i].id; r[i].nid = ecc_sets[i].id;
r[i].comment = ecc_sets[i].name; r[i].comment = ecc_sets[i].name;
} }
@@ -37057,7 +37055,7 @@ err:
WOLFSSL_ENTER("wolfSSL_OBJ_nid2sn"); WOLFSSL_ENTER("wolfSSL_OBJ_nid2sn");
/* find based on NID and return name */ /* find based on NID and return name */
for (i = 0; i < ecc_sets[i].size; i++) { for (i = 0; ecc_sets[i].size != 0; i++) {
if (n == ecc_sets[i].id) { if (n == ecc_sets[i].id) {
return ecc_sets[i].name; return ecc_sets[i].name;
} }

2
wolfcrypt/src/asn.c
View File

@@ -4811,7 +4811,7 @@ WOLFSSL_LOCAL int wc_OBJ_sn2nid(const char *sn)
if (XSTRNCMP(sn, "secp384r1", 10) == 0) if (XSTRNCMP(sn, "secp384r1", 10) == 0)
sn = "SECP384R1"; sn = "SECP384R1";
/* find based on name and return NID */ /* find based on name and return NID */
for (i = 0; i < ecc_sets[i].size; i++) { for (i = 0; ecc_sets[i].size != 0 && ecc_sets[i].name != NULL; i++) {
if (XSTRNCMP(sn, ecc_sets[i].name, ECC_MAXNAME) == 0) { if (XSTRNCMP(sn, ecc_sets[i].name, ECC_MAXNAME) == 0) {
return ecc_sets[i].id; return ecc_sets[i].id;
} }

4
wolfcrypt/test/test.c
View File

@@ -3263,7 +3263,7 @@ int hash_test(void)
if (ret != BAD_FUNC_ARG) if (ret != BAD_FUNC_ARG)
return -3094; return -3094;
#ifndef NO_ASN #ifndef NO_CERTS
#if defined(WOLFSSL_MD2) && !defined(HAVE_SELFTEST) #if defined(WOLFSSL_MD2) && !defined(HAVE_SELFTEST)
ret = wc_GetCTC_HashOID(MD2); ret = wc_GetCTC_HashOID(MD2);
if (ret == 0) if (ret == 0)
@@ -11508,7 +11508,7 @@ static int rsa_keygen_test(WC_RNG* rng)
#if !defined(HAVE_FAST_RSA) && !defined(HAVE_USER_RSA) && \ #if !defined(HAVE_FAST_RSA) && !defined(HAVE_USER_RSA) && \
(!defined(HAVE_FIPS) || \ (!defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2))) && \ (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2))) && \
!defined(HAVE_SELFTEST) !defined(HAVE_SELFTEST) && !defined(HAVE_INTEL_QA)
ret = wc_CheckRsaKey(&genKey); ret = wc_CheckRsaKey(&genKey);
if (ret != 0) { if (ret != 0) {
ERROR_OUT(-8228, exit_rsa); ERROR_OUT(-8228, exit_rsa);

2
wolfssl/wolfcrypt/types.h
View File

@@ -240,7 +240,7 @@
#elif (defined(WOLFSSL_ASYNC_CRYPT) && defined(HAVE_INTEL_QA)) || \ #elif (defined(WOLFSSL_ASYNC_CRYPT) && defined(HAVE_INTEL_QA)) || \
defined(HAVE_INTEL_QA_SYNC) defined(HAVE_INTEL_QA_SYNC)
#ifndef HAVE_INTEL_QA_SYNC #ifndef HAVE_INTEL_QA_SYNC
#include <wolfssl/wolfcrypt/port/intel/quickassist.h> #include <wolfssl/wolfcrypt/port/intel/quickassist_mem.h>
#undef USE_WOLFSSL_MEMORY #undef USE_WOLFSSL_MEMORY
#ifdef WOLFSSL_DEBUG_MEMORY #ifdef WOLFSSL_DEBUG_MEMORY
#define XMALLOC(s, h, t) IntelQaMalloc((s), (h), (t), __func__, __LINE__) #define XMALLOC(s, h, t) IntelQaMalloc((s), (h), (t), __func__, __LINE__)