Merge pull request #12667 from boomer41/fix-devicekey

Add check for return code in DeviceKey to avoid injecting invalid ROT
2020-03-23 19:59:10 +01:00 · 2020-03-23 19:59:10 +01:00 · ae0ec86d59
parent 539cf3fa63 c6e8ae56db
commit ae0ec86d59
1 changed files with 4 additions and 1 deletions
--- a/features/device_key/source/DeviceKey.cpp
+++ b/features/device_key/source/DeviceKey.cpp
@ -269,7 +269,10 @@ int DeviceKey::generate_root_of_trust()

    mbedtls_entropy_free(entropy);
    delete entropy;
-    ret = device_inject_root_of_trust(key_buff, actual_size);
+
+    if (ret == DEVICEKEY_SUCCESS) {
+        ret = device_inject_root_of_trust(key_buff, actual_size);
+    }
 #endif

    return ret;