Merge pull request #3842 from danielinux/imx-rt1060-fixes

Fixed regressions in sha modules when compiling with WOLFSSL_IMXRT_DCP

wolfcrypt/src/sha.c

@@ -791,10 +791,13 @@ int wc_ShaTransform(wc_Sha* sha, const unsigned char* data)
 #endif /* USE_SHA_SOFTWARE_IMPL */
 
 
+
+#if !defined(WOLFSSL_IMXRT_DCP)
 int wc_InitSha(wc_Sha* sha)
 {
     return wc_InitSha_ex(sha, NULL, INVALID_DEVID);
 }
+#endif /* !defined(WOLFSSL_IMXRT_DCP) */
 
 void wc_ShaFree(wc_Sha* sha)
 {
@@ -823,7 +826,8 @@ void wc_ShaFree(wc_Sha* sha)
 #endif /* !WOLFSSL_TI_HASH */
 #endif /* HAVE_FIPS */
 
-#ifndef WOLFSSL_TI_HASH
+#if !defined(WOLFSSL_TI_HASH) && !defined(WOLFSSL_IMXRT_DCP)
+
 #if !defined(WOLFSSL_RENESAS_TSIP_CRYPT) || \
     defined(NO_WOLFSSL_RENESAS_TSIP_CRYPT_HASH)
 int wc_ShaGetHash(wc_Sha* sha, byte* hash)
@@ -888,7 +892,7 @@ int wc_ShaCopy(wc_Sha* src, wc_Sha* dst)
     return ret;
 }
 #endif /* defined(WOLFSSL_RENESAS_TSIP_CRYPT) ... */
-#endif /* !WOLFSSL_TI_HASH */
+#endif /* !WOLFSSL_TI_HASH && !WOLFSSL_IMXRT_DCP */
 
 
 #if defined(WOLFSSL_HASH_FLAGS) || defined(WOLF_CRYPTO_CB)

wolfcrypt/src/sha256.c

@@ -130,8 +130,6 @@ where 0 <= L < 2^64.
 #elif defined(WOLFSSL_CRYPTOCELL)
     /* wc_port.c includes wolfcrypt/src/port/arm/cryptoCellHash.c */
 
-#elif defined(WOLFSSL_IMXRT_DCP)
-
 #elif defined(WOLFSSL_PSOC6_CRYPTO)