Fix compile error for SHA-256 alternative on some condition

Also include non-issue refinement for SHA-1/SHA-256 alternatives.

Author: ccli8

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.c

@@ -66,11 +66,13 @@ void mbedtls_sha1_clone(mbedtls_sha1_context *dst,
         {
             unsigned char output[20];
             crypto_sha_getinternstate(output, sizeof (output));
-            dst->sw_ctx.state[0] = nu_get32_be(output);
-            dst->sw_ctx.state[1] = nu_get32_be(output + 4);
-            dst->sw_ctx.state[2] = nu_get32_be(output + 8);
-            dst->sw_ctx.state[3] = nu_get32_be(output + 12);
-            dst->sw_ctx.state[4] = nu_get32_be(output + 16);
+            unsigned char *output_pos = output;
+            unsigned char *output_end = output + (sizeof (output) / sizeof (output[0]));
+            uint32_t *state_pos = (uint32_t *) &(dst->sw_ctx.state[0]);
+            while (output_pos != output_end) {
+                *state_pos ++ = nu_get32_be(output_pos);
+                output_pos += 4;
+            }
         }
         memcpy(dst->sw_ctx.buffer, src->hw_ctx.buffer, src->hw_ctx.buffer_left);
         if (src->hw_ctx.buffer_left == src->hw_ctx.blocksize) {

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt.h

@@ -25,7 +25,6 @@
 #if defined(MBEDTLS_SHA1_C)
 #if defined(MBEDTLS_SHA1_ALT)
 
-#include "sha1.h"
 #include "sha_alt_hw.h"
 #include "sha1_alt_sw.h"
 

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha1_alt_sw.c

@@ -36,6 +36,14 @@
 #include "mbedtls/sha1.h"
 
 #include <string.h>
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#define mbedtls_printf printf
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
 
 /* Implementation that should never be optimized out by the compiler */
 static void mbedtls_zeroize( void *v, size_t n ) {

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.c

@@ -66,14 +66,13 @@ void mbedtls_sha256_clone(mbedtls_sha256_context *dst,
         {
             unsigned char output[32];
             crypto_sha_getinternstate(output, sizeof (output));
-            dst->sw_ctx.state[0] = nu_get32_be(output);
-            dst->sw_ctx.state[1] = nu_get32_be(output + 4);
-            dst->sw_ctx.state[2] = nu_get32_be(output + 8);
-            dst->sw_ctx.state[3] = nu_get32_be(output + 12);
-            dst->sw_ctx.state[4] = nu_get32_be(output + 16);
-            dst->sw_ctx.state[5] = nu_get32_be(output + 20);
-            dst->sw_ctx.state[6] = nu_get32_be(output + 24);
-            dst->sw_ctx.state[7] = nu_get32_be(output + 28);
+            unsigned char *output_pos = output;
+            unsigned char *output_end = output + (sizeof (output) / sizeof (output[0]));
+            uint32_t *state_pos = (uint32_t *) &(dst->sw_ctx.state[0]);
+            while (output_pos != output_end) {
+                *state_pos ++ = nu_get32_be(output_pos);
+                output_pos += 4;
+            }
         }
         memcpy(dst->sw_ctx.buffer, src->hw_ctx.buffer, src->hw_ctx.buffer_left);
         dst->sw_ctx.is224 = src->hw_ctx.is224;

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt.h

@@ -22,10 +22,9 @@
 #include MBEDTLS_CONFIG_FILE
 #endif
 
-#if defined(MBEDTLS_SHA1_C)
+#if defined(MBEDTLS_SHA256_C)
 #if defined(MBEDTLS_SHA256_ALT)
 
-#include "sha256.h"
 #include "sha_alt_hw.h"
 #include "sha256_alt_sw.h"
 
@@ -103,6 +102,6 @@ void mbedtls_sha256_process( mbedtls_sha256_context *ctx, const unsigned char da
 #endif
 
 #endif /* MBEDTLS_SHA256_ALT */
-#endif /* MBEDTLS_SHA1_C */
+#endif /* MBEDTLS_SHA256_C */
 
 #endif /* sha256_alt.h */

targets/TARGET_NUVOTON/TARGET_NUC472/crypto/sha/sha256_alt_sw.c

@@ -36,6 +36,17 @@
 #include "mbedtls/sha256.h"
 
 #include <string.h>
+#if defined(MBEDTLS_SELF_TEST)
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#include <stdio.h>
+#include <stdlib.h>
+#define mbedtls_printf printf
+#define mbedtls_calloc    calloc
+#define mbedtls_free       free
+#endif /* MBEDTLS_PLATFORM_C */
+#endif /* MBEDTLS_SELF_TEST */
 
 /* Implementation that should never be optimized out by the compiler */
 static void mbedtls_zeroize( void *v, size_t n ) {
@@ -303,6 +314,6 @@ void mbedtls_sha256_sw_finish( mbedtls_sha256_sw_context *ctx, unsigned char out
         PUT_UINT32_BE( ctx->state[7], output, 28 );
 }
 
-#endif /* MBEDTLS_SHA1_ALT */
+#endif /* MBEDTLS_SHA256_ALT */
 
 #endif /* MBEDTLS_SHA256_C */