Merge pull request #9745 from moranpeker/psa_security_lifecycle

Cruz Monrreal · web-flow · commit 813c844fb44c · 2019-02-20T12:12:56.000-06:00
Fix incorrect return value in psa_security_lifecycle_state (emul)
diff --git a/components/TARGET_PSA/services/platform/COMPONENT_PSA_SRV_EMUL/platform_emul.c b/components/TARGET_PSA/services/platform/COMPONENT_PSA_SRV_EMUL/platform_emul.c
@@ -21,7 +21,12 @@
 uint32_t psa_security_lifecycle_state(void)
 {
     uint32_t lc_state = 0;
-    return psa_platfrom_lifecycle_get_impl(&lc_state);
+    psa_status_t status = PSA_LIFECYCLE_SUCCESS;
+    status = psa_platfrom_lifecycle_get_impl(&lc_state);
+    if (status != PSA_LIFECYCLE_SUCCESS) {
+        lc_state = PSA_LIFECYCLE_UNKNOWN;
+    }
+    return lc_state;
 }
 
 psa_status_t mbed_psa_reboot_and_request_new_security_state(uint32_t new_state)

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,12 @@`
`21`	`21`	`uint32_t psa_security_lifecycle_state(void)`
`22`	`22`	`{`
`23`	`23`	`uint32_t lc_state = 0;`
`24`		`- return psa_platfrom_lifecycle_get_impl(&lc_state);`
	`24`	`+ psa_status_t status = PSA_LIFECYCLE_SUCCESS;`
	`25`	`+ status = psa_platfrom_lifecycle_get_impl(&lc_state);`
	`26`	`+ if (status != PSA_LIFECYCLE_SUCCESS) {`
	`27`	`+ lc_state = PSA_LIFECYCLE_UNKNOWN;`
	`28`	`+ }`
	`29`	`+ return lc_state;`
`25`	`30`	`}`
`26`	`31`
`27`	`32`	`psa_status_t mbed_psa_reboot_and_request_new_security_state(uint32_t new_state)`