Skip to content

Fixes for async scan-build warnings and ECC Koblitz curves #44

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
SparkiDev merged 2 commits into from
Apr 27, 2022
Merged

Fixes for async scan-build warnings and ECC Koblitz curves #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f92ef8
Fixes for scan-build warnings.
dgarske Apr 26, 2022
aa6903d
Fix for handling the Koblitz curve param "a", which is all zeros.
dgarske Apr 27, 2022
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
41 changes: 28 additions & 13 deletions wolfcrypt/src/port/intel/quickassist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
#include <wolfcrypt/src/misc.c>
#endif

#include <pthread.h>

/* Async enables (1=non-block, 0=block) */
#ifndef QAT_RSA_ASYNC
#define QAT_RSA_ASYNC 1
Expand Down Expand Up @@ -802,6 +804,7 @@ static int IntelQaPollBlockRet(WC_ASYNC_DEV* dev, int ret_wait)

do {
ret = IntelQaPoll(dev);
(void)ret; /* not used */

if (dev->qat.ret != ret_wait) {
break;
Expand Down Expand Up @@ -1996,9 +1999,10 @@ static int IntelQaSymOpen(WC_ASYNC_DEV* dev, CpaCySymSessionSetupData* setup,
/* Determine size of session context to allocate - use max size */
status = cpaCySymSessionCtxGetSize(dev->qat.handle, setup, &sessionCtxSize);

if (ctx->symCtxSize > 0 && ctx->symCtxSize > sessionCtxSize) {
printf("Symmetric context size error! Buf %d, Exp %d\n",
ctx->symCtxSize, sessionCtxSize);
if (status != CPA_STATUS_SUCCESS || (ctx->symCtxSize > 0 &&
ctx->symCtxSize > sessionCtxSize)) {
printf("Symmetric context size error %d! Buf %d, Exp %d\n",
status, ctx->symCtxSize, sessionCtxSize);
return ASYNC_OP_E;
}

Expand Down Expand Up @@ -3500,7 +3504,14 @@ int IntelQaEccPointMul(WC_ASYNC_DEV* dev, WC_BIGINT* k,
ret = IntelQaBigIntToFlatBuffer(k, &opData->k);
ret += IntelQaBigIntToFlatBuffer(xG, &opData->xg);
ret += IntelQaBigIntToFlatBuffer(yG, &opData->yg);
ret += IntelQaBigIntToFlatBuffer(a, &opData->a);
if (a != NULL && a->buf == NULL) {
/* The Koblitz curves can have a zero param "a" */
ret += IntelQaAllocFlatBuffer(&opData->a, k->len, dev->heap);
XMEMSET(opData->a.pData, 0, k->len);
}
else {
ret += IntelQaBigIntToFlatBuffer(a, &opData->a);
}
ret += IntelQaBigIntToFlatBuffer(b, &opData->b);
ret += IntelQaBigIntToFlatBuffer(q, &opData->q);
if (ret != 0) {
Expand Down Expand Up @@ -3682,7 +3693,14 @@ int IntelQaEcdh(WC_ASYNC_DEV* dev, WC_BIGINT* k, WC_BIGINT* xG,
ret = IntelQaBigIntToFlatBuffer(k, &opData->k);
ret += IntelQaBigIntToFlatBuffer(xG, &opData->xg);
ret += IntelQaBigIntToFlatBuffer(yG, &opData->yg);
ret += IntelQaBigIntToFlatBuffer(a, &opData->a);
if (a != NULL && a->buf == NULL) {
/* The Koblitz curves can have a zero param "a" */
ret += IntelQaAllocFlatBuffer(&opData->a, k->len, dev->heap);
XMEMSET(opData->a.pData, 0, k->len);
}
else {
ret += IntelQaBigIntToFlatBuffer(a, &opData->a);
}
ret += IntelQaBigIntToFlatBuffer(b, &opData->b);
ret += IntelQaBigIntToFlatBuffer(q, &opData->q);
if (ret != 0) {
Expand Down Expand Up @@ -3797,14 +3815,11 @@ static void IntelQaEcdsaSignCallback(void *pCallbackTag,
ret = ECC_CURVE_OID_E;
}
else {
/* mark event result */
ret = 0; /* success */
}

/* populate result */
ret = IntelQaFlatBufferToBigInt(pR, dev->qat.op.ecc_sign.pR);
if (ret == 0) {
ret = IntelQaFlatBufferToBigInt(pS, dev->qat.op.ecc_sign.pS);
/* success - populate result */
ret = IntelQaFlatBufferToBigInt(pR, dev->qat.op.ecc_sign.pR);
if (ret == 0) {
ret = IntelQaFlatBufferToBigInt(pS, dev->qat.op.ecc_sign.pS);
}
}
}
(void)opData;
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 @@ -36,8 +36,8 @@
#include <string.h>

/* use thread local for QAE variables (removing mutex requirement) */
#include <pthread.h> /* for threadId tracking */
#ifdef USE_QAE_THREAD_LS
#include <pthread.h> /* for threadId tracking */
#define QAE_THREAD_LS THREAD_LS_T
#else
#define QAE_THREAD_LS
Expand Down