Merge pull request #15289 from OpenNuvoton/nuvoton_m487_des_ecp

M487: Fix crypto h/w port
ARMmbed · May 30, 2022 · b6fadd3 · b6fadd3
2 parents 1ab98de + b402c97
commit b6fadd3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/des/des_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/des/des_alt.c
@@ -375,7 +375,7 @@ static int mbedtls_des_docrypt(uint16_t keyopt, uint8_t key[3][MBEDTLS_DES_KEY_S
      * 1. BE for byte sequence in word
      * 2. BE for word sequence in double-word
      */
-    TDES_Open(CRPT
+    TDES_Open(CRPT,
             0,                                                // Channel number (0~4) 
             enc,                                                // 0: decode, 1: encode
             (tdes_opmode & CRPT_TDES_CTL_TMODE_Msk) ? 1 : 0,    // 0: DES, 1: TDES 

diff --git a/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c
@@ -502,6 +502,11 @@ NU_STATIC int internal_run_eccop(const mbedtls_ecp_group *grp,
         return MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED;
     }
 
+    /* NOTE: Engine doesn't support P + Q when P and Q are the same. Workaround by 2*P */
+    if (mbedtls_ecp_point_cmp(P, Q) == 0) {
+        return internal_run_eccop(grp, R, NULL, P, NULL, NULL, ECCOP_POINT_DOUBLE);
+    }
+
     int ret;
     bool ecc_done;