review: DMA block-size validation, SHA512 init dispatch, and ioSz cleanup

Author: bigbrett

src/wh_client_crypto.c

@@ -4726,6 +4726,7 @@ int wh_Client_Sha256DmaUpdateResponse(whClientContext* ctx, wc_Sha256* sha)
             ctx, ctx->dma.asyncCtx.sha.clientAddr, (void**)&ioAddr,
             ctx->dma.asyncCtx.sha.ioSz, WH_DMA_OPER_CLIENT_READ_POST,
             (whDmaFlags){0});
+        ctx->dma.asyncCtx.sha.ioSz = 0;
     }
     return ret;
 }
@@ -5257,6 +5258,7 @@ int wh_Client_Sha224DmaUpdateResponse(whClientContext* ctx, wc_Sha224* sha)
             ctx, ctx->dma.asyncCtx.sha.clientAddr, (void**)&ioAddr,
             ctx->dma.asyncCtx.sha.ioSz, WH_DMA_OPER_CLIENT_READ_POST,
             (whDmaFlags){0});
+        ctx->dma.asyncCtx.sha.ioSz = 0;
     }
     return ret;
 }
@@ -5787,6 +5789,7 @@ int wh_Client_Sha384DmaUpdateResponse(whClientContext* ctx, wc_Sha384* sha)
             ctx, ctx->dma.asyncCtx.sha.clientAddr, (void**)&ioAddr,
             ctx->dma.asyncCtx.sha.ioSz, WH_DMA_OPER_CLIENT_READ_POST,
             (whDmaFlags){0});
+        ctx->dma.asyncCtx.sha.ioSz = 0;
     }
     return ret;
 }
@@ -6334,6 +6337,7 @@ int wh_Client_Sha512DmaUpdateResponse(whClientContext* ctx, wc_Sha512* sha)
             ctx, ctx->dma.asyncCtx.sha.clientAddr, (void**)&ioAddr,
             ctx->dma.asyncCtx.sha.ioSz, WH_DMA_OPER_CLIENT_READ_POST,
             (whDmaFlags){0});
+        ctx->dma.asyncCtx.sha.ioSz = 0;
     }
     return ret;
 }

src/wh_server_crypto.c

@@ -4842,6 +4842,16 @@ static int _HandleSha256Dma(whServerContext* ctx, uint16_t magic, int devId,
         (uint32_t)(inSize - sizeof(whMessageCrypto_Sha256DmaRequest))) {
         return WH_ERROR_BADARGS;
     }
+    /* Non-final: inline and DMA input must be multiples of block size */
+    if (!req.isLastBlock && ((req.inSz % WC_SHA256_BLOCK_SIZE) != 0 ||
+                             (req.input.sz % WC_SHA256_BLOCK_SIZE) != 0)) {
+        return WH_ERROR_BADARGS;
+    }
+    /* Final: inline data must be less than one block, no DMA input */
+    if (req.isLastBlock &&
+        (req.inSz >= WC_SHA256_BLOCK_SIZE || req.input.sz != 0)) {
+        return WH_ERROR_BADARGS;
+    }
 
     inlineData =
         (const uint8_t*)cryptoDataIn + sizeof(whMessageCrypto_Sha256DmaRequest);
@@ -4932,6 +4942,16 @@ static int _HandleSha224Dma(whServerContext* ctx, uint16_t magic, int devId,
         (uint32_t)(inSize - sizeof(whMessageCrypto_Sha256DmaRequest))) {
         return WH_ERROR_BADARGS;
     }
+    /* Non-final: inline and DMA input must be multiples of block size */
+    if (!req.isLastBlock && ((req.inSz % WC_SHA224_BLOCK_SIZE) != 0 ||
+                             (req.input.sz % WC_SHA224_BLOCK_SIZE) != 0)) {
+        return WH_ERROR_BADARGS;
+    }
+    /* Final: inline data must be less than one block, no DMA input */
+    if (req.isLastBlock &&
+        (req.inSz >= WC_SHA224_BLOCK_SIZE || req.input.sz != 0)) {
+        return WH_ERROR_BADARGS;
+    }
 
     inlineData =
         (const uint8_t*)cryptoDataIn + sizeof(whMessageCrypto_Sha256DmaRequest);
@@ -5020,6 +5040,16 @@ static int _HandleSha384Dma(whServerContext* ctx, uint16_t magic, int devId,
         (uint32_t)(inSize - sizeof(whMessageCrypto_Sha512DmaRequest))) {
         return WH_ERROR_BADARGS;
     }
+    /* Non-final: inline and DMA input must be multiples of block size */
+    if (!req.isLastBlock && ((req.inSz % WC_SHA384_BLOCK_SIZE) != 0 ||
+                             (req.input.sz % WC_SHA384_BLOCK_SIZE) != 0)) {
+        return WH_ERROR_BADARGS;
+    }
+    /* Final: inline data must be less than one block, no DMA input */
+    if (req.isLastBlock &&
+        (req.inSz >= WC_SHA384_BLOCK_SIZE || req.input.sz != 0)) {
+        return WH_ERROR_BADARGS;
+    }
 
     inlineData =
         (const uint8_t*)cryptoDataIn + sizeof(whMessageCrypto_Sha512DmaRequest);
@@ -5109,12 +5139,36 @@ static int _HandleSha512Dma(whServerContext* ctx, uint16_t magic, int devId,
         (uint32_t)(inSize - sizeof(whMessageCrypto_Sha512DmaRequest))) {
         return WH_ERROR_BADARGS;
     }
+    /* Non-final: inline and DMA input must be multiples of block size */
+    if (!req.isLastBlock && ((req.inSz % WC_SHA512_BLOCK_SIZE) != 0 ||
+                             (req.input.sz % WC_SHA512_BLOCK_SIZE) != 0)) {
+        return WH_ERROR_BADARGS;
+    }
+    /* Final: inline data must be less than one block, no DMA input */
+    if (req.isLastBlock &&
+        (req.inSz >= WC_SHA512_BLOCK_SIZE || req.input.sz != 0)) {
+        return WH_ERROR_BADARGS;
+    }
 
     inlineData =
         (const uint8_t*)cryptoDataIn + sizeof(whMessageCrypto_Sha512DmaRequest);
     hashType = req.resumeState.hashType;
 
-    ret = wc_InitSha512_ex(sha512, NULL, devId);
+    switch (hashType) {
+#ifndef WOLFSSL_NOSHA512_224
+        case WC_HASH_TYPE_SHA512_224:
+            ret = wc_InitSha512_224_ex(sha512, NULL, devId);
+            break;
+#endif
+#ifndef WOLFSSL_NOSHA512_256
+        case WC_HASH_TYPE_SHA512_256:
+            ret = wc_InitSha512_256_ex(sha512, NULL, devId);
+            break;
+#endif
+        default:
+            ret = wc_InitSha512_ex(sha512, NULL, devId);
+            break;
+    }
     if (ret != 0) {
         return ret;
     }