remove cancellation API

Author: bigbrett

src/wh_client.c

@@ -76,10 +76,6 @@ int wh_Client_Init(whClientContext* c, const whClientConfig* config)
     }
 
     memset(c, 0, sizeof(*c));
-#ifdef WOLFHSM_CFG_CANCEL_API
-    /* register the cancel callback */
-    c->cancelCb = config->cancelCb;
-#endif
 
     rc = wh_CommClient_Init(c->comm, config->comm);
 
@@ -472,73 +468,6 @@ int wh_Client_CommClose(whClientContext* c)
     return rc;
 }
 
-#ifdef WOLFHSM_CFG_CANCEL_API
-int wh_Client_EnableCancel(whClientContext* c)
-{
-    if (c == NULL)
-        return WH_ERROR_BADARGS;
-    c->cancelable = 1;
-    return 0;
-}
-
-int wh_Client_DisableCancel(whClientContext* c)
-{
-    if (c == NULL)
-        return WH_ERROR_BADARGS;
-    c->cancelable = 0;
-    return 0;
-}
-
-int wh_Client_CancelRequest(whClientContext* c)
-{
-    if (c == NULL) {
-        return WH_ERROR_BADARGS;
-    }
-
-    if (c->cancelCb == NULL) {
-        return WH_ERROR_ABORTED;
-    }
-
-    /* Since we aren't sending this request through the standard transport, we
-     * need to update the client context's last sent "kind" to prevent the Comm
-     * Client receive function from discarding the next response as an
-     * out-of-order/corrupted message. No need to update the sequence number/ID
-     * as it will not have been incremented by the cancel operation, as it is
-     * out-of-band */
-    c->last_req_kind = WH_MESSAGE_KIND(WH_MESSAGE_GROUP_CANCEL, 0);
-
-    return c->cancelCb(c->comm->seq);
-}
-
-int wh_Client_CancelResponse(whClientContext* c)
-{
-    int ret = 0;
-    uint16_t group;
-    uint16_t action;
-    uint16_t size;
-    uint8_t* buf;
-    if (c == NULL)
-        return WH_ERROR_BADARGS;
-    /* check if the request was canceled */
-    buf = wh_CommClient_GetDataPtr(c->comm);
-    ret = wh_Client_RecvResponse(c, &group, &action, &size, buf);
-    if (ret == 0 && group != WH_MESSAGE_GROUP_CANCEL)
-        return WH_ERROR_CANCEL_LATE;
-    return ret;
-}
-
-int wh_Client_Cancel(whClientContext* c)
-{
-    int ret;
-    ret = wh_Client_CancelRequest(c);
-    if (ret == 0) {
-        do {
-            ret = wh_Client_CancelResponse(c);
-        } while (ret == WH_ERROR_NOTREADY);
-    }
-    return ret;
-}
-#endif /* WOLFHSM_CFG_CANCEL_API */
 
 int wh_Client_EchoRequest(whClientContext* c, uint16_t size, const void* data)
 {

src/wh_client_crypto.c

@@ -3678,13 +3678,6 @@ int wh_Client_Cmac(whClientContext* ctx, Cmac* cmac, CmacType type,
             cmac->aes.keylen = keyLen;
         }
 
-#ifdef WOLFHSM_CFG_CANCEL_API
-        /* if the client marked they may want to cancel, handle the
-         * response in a separate call */
-        if (ctx->cancelable) {
-            return ret;
-        }
-#endif
 
         uint16_t res_len = 0;
         do {
@@ -3719,63 +3712,6 @@ int wh_Client_Cmac(whClientContext* ctx, Cmac* cmac, CmacType type,
 
 #endif /* !NO_AES */
 
-#ifdef WOLFHSM_CFG_CANCEL_API
-int wh_Client_CmacCancelableResponse(whClientContext* c, Cmac* cmac,
-                                     uint8_t* out, uint16_t* outSz)
-{
-    whMessageCrypto_CmacResponse* res     = NULL;
-    uint8_t*                      dataPtr = NULL;
-    int                           ret;
-    uint16_t                      group;
-    uint16_t                      action;
-    uint16_t                      dataSz;
-
-    if (c == NULL || cmac == NULL) {
-        return WH_ERROR_BADARGS;
-    }
-
-    /* Get data pointer */
-    dataPtr = (uint8_t*)wh_CommClient_GetDataPtr(c->comm);
-    if (dataPtr == NULL) {
-        return WH_ERROR_BADARGS;
-    }
-
-    do {
-        ret = wh_Client_RecvResponse(c, &group, &action, &dataSz,
-                                     (uint8_t*)dataPtr);
-    } while (ret == WH_ERROR_NOTREADY);
-
-    /* check for out of sequence action */
-    if (ret == 0 &&
-        (group != WH_MESSAGE_GROUP_CRYPTO || action != WC_ALGO_TYPE_CMAC)) {
-        ret = WH_ERROR_ABORTED;
-    }
-    if (ret == 0) {
-        /* Setup generic header and get pointer to response data */
-        ret = _getCryptoResponse(dataPtr, WC_ALGO_TYPE_CMAC, (uint8_t**)&res);
-        /* wolfCrypt allows positive error codes on success in some scenarios */
-        if (ret >= 0) {
-            /* Restore non-sensitive state from server response */
-            memcpy(cmac->buffer, res->resumeState.buffer, AES_BLOCK_SIZE);
-            memcpy(cmac->digest, res->resumeState.digest, AES_BLOCK_SIZE);
-            cmac->bufferSz = res->resumeState.bufferSz;
-            cmac->totalSz  = res->resumeState.totalSz;
-
-            if (out != NULL && outSz != NULL) {
-                if (res->outSz > *outSz) {
-                    ret = WH_ERROR_BUFFER_SIZE;
-                }
-                else {
-                    uint8_t* packOut = (uint8_t*)(res + 1);
-                    memcpy(out, packOut, res->outSz);
-                    *outSz = res->outSz;
-                }
-            }
-        }
-    }
-    return ret;
-}
-#endif /* WOLFHSM_CFG_CANCEL_API */
 
 #ifdef WOLFHSM_CFG_DMA
 int wh_Client_CmacDma(whClientContext* ctx, Cmac* cmac, CmacType type,

src/wh_server.c

@@ -170,25 +170,6 @@ int wh_Server_GetConnected(whServerContext *server,
     return WH_ERROR_OK;
 }
 
-#ifdef WOLFHSM_CFG_CANCEL_API
-int wh_Server_GetCanceledSequence(whServerContext* server, uint16_t* outSeq)
-{
-    if (server == NULL || outSeq == NULL)
-        return WH_ERROR_BADARGS;
-    *outSeq = server->cancelSeq;
-    server->cancelSeq = 0;
-    return 0;
-}
-
-int wh_Server_SetCanceledSequence(whServerContext* server, uint16_t cancelSeq)
-{
-    if (server == NULL) {
-        return WH_ERROR_BADARGS;
-    }
-    server->cancelSeq = cancelSeq;
-    return WH_ERROR_OK;
-}
-#endif /* WOLFHSM_CFG_CANCEL_API */
 
 static int _wh_Server_HandleCommRequest(whServerContext* server,
         uint16_t magic, uint16_t action, uint16_t seq,
@@ -418,16 +399,6 @@ int wh_Server_HandleRequestMessage(whServerContext* server)
          * contains the error code for the client in the resp.rc field. */
         handlerRc = rc;
 
-        /* Handle cancellation by modifying response kind */
-#ifdef WOLFHSM_CFG_CANCEL_API
-        if (handlerRc == WH_ERROR_CANCEL) {
-            /* notify the client that their request was canceled */
-            kind = WH_MESSAGE_KIND(WH_MESSAGE_GROUP_CANCEL, 0);
-            size = 0;
-            data = NULL;
-        }
-#endif
-
         /* Always send the response to the client, regardless of handler error.
          * The response packet contains the operational error code for the
          * client in the resp.rc field. */