mock: Move wrap function to mocks from fakes

Author: NickeZ

test/hardware-fakes/include/fake_memory.h

@@ -28,6 +28,7 @@ void memory_read_chunk_fake(uint32_t chunk_num, uint8_t* chunk_out);
 // Size: `FLASH_SHARED_DATA_LEN`.
 void memory_read_shared_bootdata_fake(uint8_t* chunk_out);
 void fake_memory_set_salt_root(const uint8_t* salt_root);
+const uint8_t* fake_memory_get_salt_root(void);
 void memory_bootloader_hash_fake(uint8_t* hash_out);
 void memory_set_bootloader_hash_fake(const uint8_t* fake_hash);
 #endif

test/hardware-fakes/src/fake_memory.c

@@ -225,14 +225,14 @@ static uint8_t _salt_root[32] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11,
     0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33,
 };
+
 void fake_memory_set_salt_root(const uint8_t* salt_root)
 {
     memcpy(_salt_root, salt_root, 32);
 }
-bool __wrap_memory_get_salt_root(uint8_t* salt_root_out)
+const uint8_t* fake_memory_get_salt_root(void)
 {
-    memcpy(salt_root_out, _salt_root, 32);
-    return true;
+    return _salt_root;
 }
 
 // Arbitrary value.

test/unit-test/framework/src/mock_memory.c

@@ -18,6 +18,7 @@
 #include <stddef.h>
 #include <cmocka.h>
 
+#include <fake_memory.h>
 #include <flags.h>
 #include <memory/memory.h>
 #include <stdio.h>
@@ -67,3 +68,9 @@ bool __wrap_memory_set_mnemonic_passphrase_enabled(bool enabled)
     check_expected(enabled);
     return mock();
 }
+
+bool __wrap_memory_get_salt_root(uint8_t* salt_root_out)
+{
+    memcpy(salt_root_out, fake_memory_get_salt_root(), 32);
+    return true;
+}