fix: Cbor build on simulator

Crypto lib base32 encode fix return value
Cmake move cbor inclusion to sub cmakes

Author: prashantrahul141

CMakeLists.txt

@@ -45,9 +45,6 @@ list(APPEND PROTO_SRCS "vendor/nanopb/pb_common.c" "vendor/nanopb/pb_decode.c" "
 list (APPEND MINI_GMP_SRCS "vendor/mini-gmp/mini-gmp-helpers.c" "vendor/mini-gmp/mini-gmp.c")
 list (APPEND POSEIDON_SRCS "vendor/poseidon/sources/f251.c" "vendor/poseidon/sources/poseidon.c" "vendor/poseidon/sources/poseidon_rc.c")
 
-# libcbor
-add_subdirectory(vendor/libcbor EXCLUDE_FROM_ALL)
-
 OPTION(DEV_SWITCH "Additional features/logs to aid developers" OFF)
 OPTION(UNIT_TESTS_SWITCH "Compile build for main firmware or unit tests" OFF)
 

common/libraries/crypto/base32.c

@@ -50,7 +50,7 @@ char *base32_encode(const uint8_t *in, size_t inlen, char *out, size_t outlen,
     int ret = base32_encode_character(out[i], alphabet);
 
     if (ret == -1) {
-      return false;
+      return NULL;
     } else {
       out[i] = ret;
     }

utilities/cmake/firmware/firmware.cmake

@@ -210,6 +210,9 @@ target_compile_options(${EXECUTABLE} PRIVATE
         $<$<CONFIG:Release>:-Werror>
         )
 
+# libcbor
+add_subdirectory(vendor/libcbor EXCLUDE_FROM_ALL)
+
 target_link_libraries(${EXECUTABLE} PRIVATE cbor)
 
 target_link_options(${EXECUTABLE} PRIVATE

utilities/cmake/simulator/simulator.cmake

@@ -183,6 +183,10 @@ IF(UNIT_TESTS_SWITCH)
         target_compile_options(${EXECUTABLE} PRIVATE --coverage -g -O0)
         target_link_libraries(${EXECUTABLE} PRIVATE -lgcov )
 ENDIF(UNIT_TESTS_SWITCH)
+
+# libcbor
+add_subdirectory(vendor/libcbor EXCLUDE_FROM_ALL)
+
 target_link_libraries(${EXECUTABLE} PRIVATE ${SDL2_LIBRARIES} -lm cbor)
 target_link_options(${EXECUTABLE} PRIVATE ${inherited})
 add_custom_target (run COMMAND ${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE})