Merge pull request #10516 from yossi2le/yossi_fix_device_key_when_no_trng

0xc0170 · web-flow · commit d30d7720479d · 2019-05-02T09:29:25.000+01:00
32 Byte key derivation may fail with a 16 Byte ROT key
diff --git a/features/device_key/source/DeviceKey.cpp b/features/device_key/source/DeviceKey.cpp
@@ -169,7 +169,7 @@ int DeviceKey::read_key_from_kvstore(uint32_t *output, size_t &size)
         return DEVICEKEY_NOT_FOUND;
     }
 
-    int kvStatus = ((TDBStore *)inner_store)->reserved_data_get(output, size);
+    int kvStatus = ((TDBStore *)inner_store)->reserved_data_get(output, size, &size);
     if (MBED_ERROR_ITEM_NOT_FOUND == kvStatus) {
         return DEVICEKEY_NOT_FOUND;
     }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ int DeviceKey::read_key_from_kvstore(uint32_t *output, size_t &size)`
`169`	`169`	`return DEVICEKEY_NOT_FOUND;`
`170`	`170`	`}`
`171`	`171`
`172`		`- int kvStatus = ((TDBStore *)inner_store)->reserved_data_get(output, size);`
	`172`	`+ int kvStatus = ((TDBStore *)inner_store)->reserved_data_get(output, size, &size);`
`173`	`173`	`if (MBED_ERROR_ITEM_NOT_FOUND == kvStatus) {`
`174`	`174`	`return DEVICEKEY_NOT_FOUND;`
`175`	`175`	`}`