When reading ROT from KVStore the return ROT key size was ignored

Yossi Levy · Yossi Levy · commit 7bbb08226675 · 2019-04-30T17:36:44.000+03:00
diff --git a/features/device_key/source/DeviceKey.cpp b/features/device_key/source/DeviceKey.cpp
@@ -87,6 +87,7 @@ int DeviceKey::generate_derived_key(const unsigned char *salt, size_t isalt_size
 {
     uint32_t key_buff[DEVICE_KEY_32BYTE / sizeof(uint32_t)];
     size_t actual_size = DEVICE_KEY_32BYTE;
+    memset(key_buff, 0, DEVICE_KEY_32BYTE);
 
     if (DEVICE_KEY_16BYTE != ikey_type && DEVICE_KEY_32BYTE != ikey_type) {
         return DEVICEKEY_INVALID_KEY_TYPE;
diff --git a/targets/targets.json b/targets/targets.json
@@ -2414,6 +2414,7 @@
                 "macro_name": "CLOCK_SOURCE"
             }
         },
+        "components_add": ["FLASHIAP"],
         "detect_code": ["0745"],
         "device_has_add": [
             "ANALOGOUT",

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ int DeviceKey::generate_derived_key(const unsigned char *salt, size_t isalt_size`
`87`	`87`	`{`
`88`	`88`	`uint32_t key_buff[DEVICE_KEY_32BYTE / sizeof(uint32_t)];`
`89`	`89`	`size_t actual_size = DEVICE_KEY_32BYTE;`
	`90`	`+ memset(key_buff, 0, DEVICE_KEY_32BYTE);`
`90`	`91`
`91`	`92`	`if (DEVICE_KEY_16BYTE != ikey_type && DEVICE_KEY_32BYTE != ikey_type) {`
`92`	`93`	`return DEVICEKEY_INVALID_KEY_TYPE;`