Update mbedTLS sha256 usage to avoid deprecation

utzig · utzig · commit 9871cebf2ab6 · 2019-06-28T08:47:43.000-03:00
mbedTLS made sha256 functions that do not return errors deprecated. This
updates to use the new functions avoiding the extra functions calls, and
breakage when the deprecated calls are effectively removed.

Signed-off-by: Fabio Utzig &lt;utzig@apache.org&gt;
diff --git a/boot/bootutil/include/bootutil/sha256.h b/boot/bootutil/include/bootutil/sha256.h
@@ -61,20 +61,20 @@ typedef mbedtls_sha256_context bootutil_sha256_context;
 static inline void bootutil_sha256_init(bootutil_sha256_context *ctx)
 {
     mbedtls_sha256_init(ctx);
-    mbedtls_sha256_starts(ctx, 0);
+    (void)mbedtls_sha256_starts_ret(ctx, 0);
 }
 
 static inline void bootutil_sha256_update(bootutil_sha256_context *ctx,
                                           const void *data,
                                           uint32_t data_len)
 {
-    mbedtls_sha256_update(ctx, data, data_len);
+    (void)mbedtls_sha256_update_ret(ctx, data, data_len);
 }
 
 static inline void bootutil_sha256_finish(bootutil_sha256_context *ctx,
                                           uint8_t *output)
 {
-    mbedtls_sha256_finish(ctx, output);
+    (void)mbedtls_sha256_finish_ret(ctx, output);
 }
 #endif /* MCUBOOT_USE_MBED_TLS */
 

Original file line number	Diff line number	Diff line change
`@@ -61,20 +61,20 @@ typedef mbedtls_sha256_context bootutil_sha256_context;`
`61`	`61`	`static inline void bootutil_sha256_init(bootutil_sha256_context *ctx)`
`62`	`62`	`{`
`63`	`63`	`mbedtls_sha256_init(ctx);`
`64`		`- mbedtls_sha256_starts(ctx, 0);`
	`64`	`+ (void)mbedtls_sha256_starts_ret(ctx, 0);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`static inline void bootutil_sha256_update(bootutil_sha256_context *ctx,`
`68`	`68`	`const void *data,`
`69`	`69`	`uint32_t data_len)`
`70`	`70`	`{`
`71`		`- mbedtls_sha256_update(ctx, data, data_len);`
	`71`	`+ (void)mbedtls_sha256_update_ret(ctx, data, data_len);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`static inline void bootutil_sha256_finish(bootutil_sha256_context *ctx,`
`75`	`75`	`uint8_t *output)`
`76`	`76`	`{`
`77`		`- mbedtls_sha256_finish(ctx, output);`
	`77`	`+ (void)mbedtls_sha256_finish_ret(ctx, output);`
`78`	`78`	`}`
`79`	`79`	`#endif /* MCUBOOT_USE_MBED_TLS */`
`80`	`80`