Merge pull request #8434 from RonEld/change_platform_error

0xc0170 · web-flow · commit 8faf40e3b051 · 2018-10-16T07:17:33.000-07:00
Change Mbed TLS platform error code and value
diff --git a/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_platform.c b/features/cryptocell/FEATURE_CRYPTOCELL310/TARGET_MCU_NRF52840/crypto_platform.c
@@ -30,7 +30,7 @@ int crypto_platform_setup( crypto_platform_ctx *ctx )
     NRF_CRYPTOCELL->ENABLE = 1;
 
     if( SaSi_LibInit( &ctx->rndState, &rndWorkBuff ) != 0 )
-          return ( MBEDTLS_ERR_PLATFORM_HW_FAILED );
+          return ( MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED );
 
     return ( 0 );
 }
diff --git a/features/mbedtls/platform/inc/platform_mbed.h b/features/mbedtls/platform/inc/platform_mbed.h
@@ -25,4 +25,9 @@
 #include "mbedtls_device.h"
 #endif
 
+/*
+ * MBEDTLS_ERR_PLATFORM_HW_FAILED is deprecated and should not be used.
+ */
 #define MBEDTLS_ERR_PLATFORM_HW_FAILED       -0x0080
+
+#define MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED -0x0070

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ int crypto_platform_setup( crypto_platform_ctx *ctx )`
`30`	`30`	`NRF_CRYPTOCELL->ENABLE = 1;`
`31`	`31`
`32`	`32`	`if( SaSi_LibInit( &ctx->rndState, &rndWorkBuff ) != 0 )`
`33`		`- return ( MBEDTLS_ERR_PLATFORM_HW_FAILED );`
	`33`	`+ return ( MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED );`
`34`	`34`
`35`	`35`	`return ( 0 );`
`36`	`36`	`}`