Resolve compiler and linker issues in MD APIs

The features/mbedtls/targets/TARGET_STM/* files include constant needed
for the error codes returned from the MD functions.

The features/mbedtls/targets/hash_wrappers.c provides thin redirection
layer for the hardware accelerated MD implementations that rely on the
old API.

The TESTS/mbedtls/multi/main.cpp has been changed to use the new API
as its build environment does not rely on the translation unit
containing the necessary wrappers.

Author: Krzysztof Stachowiak

TESTS/mbedtls/multi/main.cpp

@@ -23,7 +23,6 @@
 
 #include "mbedtls/sha256.h"
 
-
 using namespace utest::v1;
 
 #if defined(MBEDTLS_SHA256_C)
@@ -42,18 +41,18 @@ void test_case_sha256_split() {
   mbedtls_sha256_context ctx;
   printf("test sha256\n");
   mbedtls_sha256_init( &ctx );
-  mbedtls_sha256_starts( &ctx, 0);
+  mbedtls_sha256_starts_ret( &ctx, 0);
   #if 0
     printf("test not splitted\n");
     mbedtls_sha256_update( &ctx, test_buf, 168 );
   #else
     printf("test splitted into 3 pieces\n");
-    mbedtls_sha256_update( &ctx, test_buf, 2 );
-    mbedtls_sha256_update( &ctx, test_buf+2, 66 );
-    mbedtls_sha256_update( &ctx, test_buf+68, 100 );
+    mbedtls_sha256_update_ret( &ctx, test_buf, 2 );
+    mbedtls_sha256_update_ret( &ctx, test_buf+2, 66 );
+    mbedtls_sha256_update_ret( &ctx, test_buf+68, 100 );
   #endif
 
-    mbedtls_sha256_finish( &ctx, outsum );
+    mbedtls_sha256_finish_ret( &ctx, outsum );
     mbedtls_sha256_free( &ctx );
 
     printf("\nreceived result : ");
@@ -99,29 +98,29 @@ void test_case_sha256_multi() {
     mbedtls_sha256_init( &ctx2);
     mbedtls_sha256_init( &ctx3);
     //Start both contexts
-    mbedtls_sha256_starts( &ctx1, 0);
-    mbedtls_sha256_starts( &ctx2, 0);
+    mbedtls_sha256_starts_ret( &ctx1, 0);
+    mbedtls_sha256_starts_ret( &ctx2, 0);
 
     printf("upd ctx1\n");
-    mbedtls_sha256_update( &ctx1, test_buf, 56 );
+    mbedtls_sha256_update_ret( &ctx1, test_buf, 56 );
     printf("upd ctx2\n");
-    mbedtls_sha256_update( &ctx2, test_buf, 66 );
+    mbedtls_sha256_update_ret( &ctx2, test_buf, 66 );
     printf("finish ctx1\n");
-    mbedtls_sha256_finish( &ctx1, outsum1 );
+    mbedtls_sha256_finish_ret( &ctx1, outsum1 );
     printf("upd ctx2\n");
-    mbedtls_sha256_update( &ctx2, test_buf+66, 46 );
+    mbedtls_sha256_update_ret( &ctx2, test_buf+66, 46 );
     printf("clone ctx2 in ctx3\n");
     mbedtls_sha256_clone(&ctx3, (const mbedtls_sha256_context *)&ctx2);
     printf("free ctx1\n");
     mbedtls_sha256_free( &ctx1 );
     printf("upd ctx2\n");
-    mbedtls_sha256_update( &ctx2, test_buf+112, 56 );
+    mbedtls_sha256_update_ret( &ctx2, test_buf+112, 56 );
     printf("upd ctx3 with different values than ctx2\n");
-    mbedtls_sha256_update( &ctx3, test_buf2, 56 );
+    mbedtls_sha256_update_ret( &ctx3, test_buf2, 56 );
     printf("finish ctx2\n");
-    mbedtls_sha256_finish( &ctx2, outsum2 );
+    mbedtls_sha256_finish_ret( &ctx2, outsum2 );
     printf("finish ctx3\n");
-    mbedtls_sha256_finish( &ctx3, outsum3 );
+    mbedtls_sha256_finish_ret( &ctx3, outsum3 );
     printf("free ctx2\n");
     mbedtls_sha256_free( &ctx2 );
     printf("free ctx3\n");

features/mbedtls/targets/TARGET_STM/md5_alt.h

@@ -27,6 +27,19 @@
 #include "cmsis.h"
 #include <string.h>
 
+/**
+ * \name SECTION: Temporary compatibility code
+ *
+ * This section contains code to be added up stream in Mbed TLS. Once that
+ * has been provided, this section should be removed as the code will be
+ * provided elsewhere.
+ * \{
+ */
+
+#define MBEDTLS_ERR_MD5_HW_ACCEL_FAILED -0x002F /**< MD5 hardware accelerator failed */
+
+/* \} name SECTION:  Temporary compatibility code */
+
 #ifdef __cplusplus
 extern "C" {
 #endif

features/mbedtls/targets/TARGET_STM/sha1_alt.h

@@ -24,6 +24,18 @@
 
 #if defined (MBEDTLS_SHA1_ALT)
 
+/**
+ * \name SECTION: Temporary compatibility code
+ *
+ * This section contains code to be added up stream in Mbed TLS. Once that
+ * has been provided, this section should be removed as the code will be
+ * provided elsewhere.
+ * \{
+ */
+
+#define MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED -0x0035 /**< SHA-1 hardware accelerator failed */
+
+/* \} name SECTION:  Temporary compatibility code */
 
 #include "cmsis.h"
 #include <string.h>

features/mbedtls/targets/TARGET_STM/sha256_alt.h

@@ -27,6 +27,19 @@
 #include "cmsis.h"
 #include <string.h>
 
+/**
+ * \name SECTION: Temporary compatibility code
+ *
+ * This section contains code to be added up stream in Mbed TLS. Once that
+ * has been provided, this section should be removed as the code will be
+ * provided elsewhere.
+ * \{
+ */
+
+#define MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED -0x0037 /**< SHA-256 hardware accelerator failed */
+
+/* \} name SECTION:  Temporary compatibility code */
+
 #ifdef __cplusplus
 extern "C" {
 #endif