Skip to content

Various async fixes for release prep v3.15.5 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
toddouska merged 4 commits into from
Nov 9, 2018
Merged

Various async fixes for release prep v3.15.5 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34b3013
Fix for conflict for `stat` variable name.
dgarske Aug 21, 2018
308893a
Fix for possible double free case where ctx->symCtx is not trapped. I…
dgarske Sep 21, 2018
2b83953
Fix for QAT RNG to allow zero length. Resolves PSS test case where `w…
dgarske Nov 2, 2018
c072725
Rename README.md for easier addition of these sources into wolfssl fo…
dgarske Nov 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 README.md → README-async.md
View file
Open in desktop
File renamed without changes.
18 changes: 12 additions & 6 deletions wolfcrypt/src/port/intel/quickassist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ int IntelQaHardwareStart(const char* process_name, int limitDevAccess)
Cpa32U coreAffinity = 0;
CpaCySymCapabilitiesInfo capabilities;
int j;
XMEMSET(&capabilities, 0, sizeof(capabilities));

status = cpaCyInstanceGetInfo2(g_cyInstances[i],
&g_cyInstanceInfo[i]);
Expand Down Expand Up @@ -1416,11 +1417,11 @@ static int IntelQaSymClose(WC_ASYNC_DEV* dev, int doFree)
#endif

#ifdef QAT_DEBUG
printf("IntelQaSymClose: dev %p, symCtx %p (src %p), symCtxSize %d, isCopy %d, isOpen %d, doFree %d\n",
dev, ctx->symCtx, ctx->symCtxSrc, ctx->symCtxSize, ctx->isCopy, ctx->isOpen, doFree);
printf("IntelQaSymClose: dev %p, ctx %p, symCtx %p (src %p), symCtxSize %d, isCopy %d, isOpen %d, doFree %d\n",
dev, ctx, ctx->symCtx, ctx->symCtxSrc, ctx->symCtxSize, ctx->isCopy, ctx->isOpen, doFree);
#endif

if (ctx->symCtx == ctx->symCtxSrc) {
if (ctx->symCtx == ctx->symCtxSrc && ctx->symCtx != NULL) {
if (ctx->isOpen) {
ctx->isOpen = 0;
#ifdef QAT_DEBUG
Expand Down Expand Up @@ -2842,7 +2843,7 @@ int IntelQaEcdsaVerify(WC_ASYNC_DEV* dev, WC_BIGINT* m,
WC_BIGINT* r, WC_BIGINT* s,
WC_BIGINT* a, WC_BIGINT* b,
WC_BIGINT* q, WC_BIGINT* n,
WC_BIGINT* xg, WC_BIGINT* yg, int* stat)
WC_BIGINT* xg, WC_BIGINT* yg, int* pVerifyStatus)
{
int ret, retryCount = 0;
CpaStatus status = CPA_STATUS_SUCCESS;
Expand Down Expand Up @@ -2878,7 +2879,7 @@ int IntelQaEcdsaVerify(WC_ASYNC_DEV* dev, WC_BIGINT* m,
}

/* store info needed for output */
dev->qat.op.ecc_verify.stat = stat;
dev->qat.op.ecc_verify.stat = pVerifyStatus;
IntelQaOpInit(dev, IntelQaEcdsaVerifyFree);

/* Perform ECDSA verify */
Expand Down Expand Up @@ -3342,10 +3343,15 @@ int IntelQaDrbg(WC_ASYNC_DEV* dev, byte* rngBuf, word32 rngSz)
CpaFlatBuffer* pOut = NULL;
word32 idx = 0, gen = 0;

if (dev == NULL || rngBuf == NULL || rngSz == 0) {
if (dev == NULL || rngBuf == NULL) {
return BAD_FUNC_ARG;
}

/* This function can be called with rngSz == 0 */
if (rngSz == 0) {
return 0; /* no data to get */
}

#ifdef QAT_DEBUG
printf("IntelQaDrbg: dev %p, buf %p, sz %d\n", dev, rngBuf, rngSz);
#endif
Expand Down
2 changes: 1 addition & 1 deletion wolfcrypt/src/port/intel/quickassist_mem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ static void* _qaeMemAlloc(size_t size, void* heap, int type

#ifdef WOLFSSL_DEBUG_MEMORY
#ifdef WOLFSSL_DEBUG_MEMORY_PRINT
printf("Malloc: %p (%u) at %s:%d, heap %p, type %d\n",
printf("Alloc: %p (%u) at %s:%d, heap %p, type %d\n",
ptr, (unsigned int)size, func, line, heap, type);
#else
(void)func;
Expand Down