Add more unit test for core_pkcs11_mbedtls.c (#196)

* Increase line coverage for core_pkcs11_mbedtls.c to 100% * Update CI line coverage threshold to 100% and branch coverage threshold to 92% * Fix compiler warning in unit test
FreeRTOS · May 17, 2024 · e32020b · e32020b
1 parent a0170b8
commit e32020b
Show file tree

Hide file tree

Showing 5 changed files with 265 additions and 54 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -85,7 +85,8 @@ jobs:
           echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
 
           sudo apt-get install -y lcov
-          CFLAGS="--coverage -Wall -Wextra -DNDEBUG"
+          # target_enable_gcov is added in each unit test already, --coverage option is not required
+          CFLAGS="-Wall -Wextra -DNDEBUG"
           cmake -S test -B build/ \
           -G "Unix Makefiles" \
           -DCMAKE_BUILD_TYPE=Debug \
@@ -128,8 +129,8 @@ jobs:
         if: steps.build-unit-tests.outcome == 'success'
         with:
           coverage-file: ./build/coverage.info
-          line-coverage-min: 99
-          branch-coverage-min: 90
+          line-coverage-min: 100
+          branch-coverage-min: 92
 
       - name: Archive Test Results
         if: steps.build-unit-tests.outcome == 'success'

diff --git a/docs/doxygen/include/size_table.md b/docs/doxygen/include/size_table.md
@@ -20,11 +20,11 @@
     <tr>
         <td>core_pkcs11_mbedtls.c</td>
         <td><center>9.0K</center></td>
-        <td><center>7.5K</center></td>
+        <td><center>7.4K</center></td>
     </tr>
     <tr>
         <td><b>Total estimates</b></td>
         <td><b><center>10.3K</center></b></td>
-        <td><b><center>8.5K</center></b></td>
+        <td><b><center>8.4K</center></b></td>
     </tr>
 </table>
diff --git a/source/portable/mbedtls/core_pkcs11_mbedtls.c b/source/portable/mbedtls/core_pkcs11_mbedtls.c
@@ -762,15 +762,9 @@ static CK_RV prvRsaContextParse( const CK_ATTRIBUTE * pxAttribute,
             lMbedTLSResult = mbedtls_mpi_read_binary( &pxRsaContext->DQ, pxAttribute->pValue, pxAttribute->ulValueLen );
             break;
 
-        case ( CKA_COEFFICIENT ):
-            lMbedTLSResult = mbedtls_mpi_read_binary( &pxRsaContext->QP, pxAttribute->pValue, pxAttribute->ulValueLen );
-            break;
-
         default:
-
-            /* This should never be reached, as the above types are what gets this function called.
-             * Nevertheless this is an error case, and MISRA requires a default statement. */
-            xResult = CKR_ATTRIBUTE_TYPE_INVALID;
+            /* This is the CKA_COEFFICIENT case. The type is checked in prvRsaKeyAttParse. */
+            lMbedTLSResult = mbedtls_mpi_read_binary( &pxRsaContext->QP, pxAttribute->pValue, pxAttribute->ulValueLen );
             break;
     }
 
@@ -3449,7 +3443,7 @@ CK_DECLARE_FUNCTION( CK_RV, C_FindObjectsInit )( CK_SESSION_HANDLE hSession,
         xResult = CKR_ARGUMENTS_BAD;
     }
 
-    if( ( ulCount != 1UL ) && ( ulCount != 2UL ) )
+    if( ( ulCount < 1UL ) || ( ulCount > 2UL ) )
     {
         xResult = CKR_ARGUMENTS_BAD;
         LogError( ( "Failed to initialize find object operation. Find objects "