Fix #5079. Add the support of call to mbedtls_xxx_finish even if mbedtls_xxx_udate

was not called since mbedtls_xxx_start

Author: adustm

features/mbedtls/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/mbedtls_device.h

@@ -22,12 +22,10 @@
 
 #define MBEDTLS_AES_ALT
 
-/* FIXME: Don't enable SHA1, SHA256 and MD5 hardware acceleration until issue
- * #5079 is fixed. (https://github.com/ARMmbed/mbed-os/issues/5079) */
-/* #define MBEDTLS_SHA256_ALT */
+#define MBEDTLS_SHA256_ALT
 
-/* #define MBEDTLS_SHA1_ALT */
+#define MBEDTLS_SHA1_ALT
 
-/* #define MBEDTLS_MD5_ALT */
+#define MBEDTLS_MD5_ALT
 
 #endif /* MBEDTLS_DEVICE_H */

features/mbedtls/targets/TARGET_STM/md5_alt.c

@@ -175,6 +175,12 @@ void mbedtls_md5_finish( mbedtls_md5_context *ctx, unsigned char output[16] )
             return; // Return error code here
         }
     }
+    /* The following test can happen when the input is empty, and mbedtls_md5_update has never been called */
+    if(ctx->hhash_md5.Phase == HAL_HASH_PHASE_READY) {
+        /* Select the MD5 mode and reset the HASH processor core, so that the HASH will be ready to compute
+            the message digest of a new message */
+        HASH->CR |= HASH_ALGOSELECTION_MD5 | HASH_CR_INIT;
+    }
     mbedtls_zeroize( ctx->sbuf, ST_MD5_BLOCK_SIZE);
     ctx->sbuf_len = 0;
     __HAL_HASH_START_DIGEST();

features/mbedtls/targets/TARGET_STM/sha1_alt.c

@@ -174,6 +174,12 @@ void mbedtls_sha1_finish( mbedtls_sha1_context *ctx, unsigned char output[20] )
             return; // Return error code here
         }
     }
+    /* The following test can happen when the input is empty, and mbedtls_sha1_update has never been called */
+    if(ctx->hhash_sha1.Phase == HAL_HASH_PHASE_READY) {
+        /* Select the SHA1 mode and reset the HASH processor core, so that the HASH will be ready to compute
+           the message digest of a new message */
+        HASH->CR |= HASH_ALGOSELECTION_SHA1 | HASH_CR_INIT;
+    }
     mbedtls_zeroize(ctx->sbuf, ST_SHA1_BLOCK_SIZE);
     ctx->sbuf_len = 0;
     __HAL_HASH_START_DIGEST();

features/mbedtls/targets/TARGET_STM/sha256_alt.c

@@ -198,6 +198,18 @@ void mbedtls_sha256_finish( mbedtls_sha256_context *ctx, unsigned char output[32
             }
         }
     }
+    /* The following test can happen when the input is empty, and mbedtls_sha256_update has never been called */
+    if(ctx->hhash_sha256.Phase == HAL_HASH_PHASE_READY) {
+        if (ctx->is224 == 0) {
+            /* Select the SHA256 mode and reset the HASH processor core, so that the HASH will be ready to compute
+           the message digest of a new message */
+            HASH->CR |= HASH_ALGOSELECTION_SHA256 | HASH_CR_INIT;
+        } else {
+            /* Select the SHA224 mode and reset the HASH processor core, so that the HASH will be ready to compute
+           the message digest of a new message */
+            HASH->CR |= HASH_ALGOSELECTION_SHA224 | HASH_CR_INIT;
+        }
+    }
     mbedtls_zeroize(ctx->sbuf, ST_SHA256_BLOCK_SIZE);
     ctx->sbuf_len = 0;
     __HAL_HASH_START_DIGEST();